2631 files changed, 161770 insertions, 0 deletions

diff --git a/tags/java/sca/1.5.1/itest/atom/pom.xml b/tags/java/sca/1.5.1/itest/atom/pom.xml
new file mode 100644
index 0000000000..0b65205d77
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/atom/pom.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-atom</artifactId>
+    <name>Apache Tuscany SCA iTest Atom Binding</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl-xml</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom-abdera</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+                
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>${artifactId}</finalName>
+		<plugins>						
+			<!-- Using WS-Import -->
+            <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.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsimport</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>test.abdera</packageName>
+                            <wsdlDirectory>${basedir}/src/test/resources/news</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>news.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                </executions>
+
+            </plugin>			
+		</plugins>        
+    </build>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java b/tags/java/sca/1.5.1/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java
new file mode 100644
index 0000000000..09789b4bb5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java
@@ -0,0 +1,63 @@
+package test.abdera.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.osoa.sca.annotations.Init;
+
+import test.abdera.Entry;
+import test.abdera.Item;
+import test.abdera.NewsService;
+import test.abdera.NotFoundException_Exception;
+
+public class NewsServiceImpl implements NewsService {
+	private static Map<String, Entry> collection = new HashMap<String, Entry>();
+	
+	@Init
+	public void init() {
+		Item item = new Item();
+		item.setName("Item Name 01");
+		item.setTitle("Item title 01");
+		
+		Entry entry = new Entry();
+		entry.setKey("1");
+		entry.setData(item);
+		
+		collection.put((String)entry.getKey(), entry);
+	}
+	
+	public List<Entry> getAll() {
+		List<Entry> entries = new ArrayList<Entry>();
+		for(Entry entry : collection.values()) {
+			entries.add(entry);
+		}
+        return entries;
+	}
+
+	public Item get(String arg0) throws NotFoundException_Exception {
+		return (Item) collection.get(arg0).getData();
+	}
+
+	public String post(String arg0, Item arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void put(String arg0, Item arg1) throws NotFoundException_Exception {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void delete(String arg0) throws NotFoundException_Exception {
+		// TODO Auto-generated method stub
+
+	}
+	
+	public List<Entry> query(String arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java b/tags/java/sca/1.5.1/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java
new file mode 100644
index 0000000000..b9f2b4e2fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.abdera;
+
+import java.net.Socket;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class NewsServiceTestCase {
+	   private static SCADomain domain;
+	    private static NewsService newsService;
+
+	    @BeforeClass
+	    public static void init() throws Exception {
+	        domain = SCADomain.newInstance("news/news.composite");
+	        Assert.assertNotNull(domain);
+	        newsService = domain.getService(NewsService.class, "NewsServiceComponent");
+	        Assert.assertNotNull(newsService);
+	    }
+
+	    @AfterClass
+	    public static void destroy() throws Exception {
+	        if(domain != null) {
+	            domain.close();
+	        }
+	    }
+	    
+	    @Test
+	    public void testPing() throws Exception {
+	        new Socket("127.0.0.1", 8085);
+	        //System.in.read();
+	    }
+	    
+	    @Test
+	    public void testNewsServicesGet() throws Exception {    	
+	        Item item = newsService.get("1");
+	        
+	        Assert.assertNotNull(item);
+	        System.out.println(">>> Entry - " + item.getTitle());
+	    }	    
+}
diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.composite b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.composite
new file mode 100644
index 0000000000..f3a3b165cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tns="http://abdera.test/"
+	targetNamespace="http://abdera.test/"
+    name="news">
+    
+	<component name="NewsServiceComponent">
+	      <implementation.java class="test.abdera.impl.NewsServiceImpl"/>
+	      <service name="NewsService">
+	        <interface.wsdl interface="http://abdera.test/#wsdl.interface(NewsService)"/>
+	        <tuscany:binding.atom uri="http://localhost:8085/NewsService"/>
+	      </service>
+	</component> 
+    
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.wsdl b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.wsdl
new file mode 100644
index 0000000000..62d46e66c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.wsdl
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.1 in JDK 6. -->
+<definitions targetNamespace="http://abdera.test/" name="NewsServiceImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://abdera.test/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <types>
+    <xsd:schema>
+      <xsd:import namespace="http://abdera.test/" schemaLocation="news.xsd"/>
+    </xsd:schema>
+  </types>
+  <message name="getAll">
+    <part name="parameters" element="tns:getAll"/>
+  </message>
+  <message name="getAllResponse">
+    <part name="parameters" element="tns:getAllResponse"/>
+  </message>
+  <message name="get">
+    <part name="parameters" element="tns:get"/>
+  </message>
+  <message name="getResponse">
+    <part name="parameters" element="tns:getResponse"/>
+  </message>
+  <message name="NotFoundException">
+    <part name="fault" element="tns:NotFoundException"/>
+  </message>
+  <message name="post">
+    <part name="parameters" element="tns:post"/>
+  </message>
+  <message name="postResponse">
+    <part name="parameters" element="tns:postResponse"/>
+  </message>
+  <message name="put">
+    <part name="parameters" element="tns:put"/>
+  </message>
+  <message name="putResponse">
+    <part name="parameters" element="tns:putResponse"/>
+  </message>
+  <message name="delete">
+    <part name="parameters" element="tns:delete"/>
+  </message>
+  <message name="deleteResponse">
+    <part name="parameters" element="tns:deleteResponse"/>
+  </message>
+  <message name="query">
+    <part name="parameters" element="tns:query"/>
+  </message>
+  <message name="queryResponse">
+    <part name="parameters" element="tns:queryResponse"/>
+  </message>
+  <portType name="NewsService">
+    <operation name="getAll">
+      <input message="tns:getAll"/>
+      <output message="tns:getAllResponse"/>
+    </operation>
+    <operation name="get">
+      <input message="tns:get"/>
+      <output message="tns:getResponse"/>
+      <fault message="tns:NotFoundException" name="NotFoundException"/>
+    </operation>
+    <operation name="post">
+      <input message="tns:post"/>
+      <output message="tns:postResponse"/>
+    </operation>
+    <operation name="put">
+      <input message="tns:put"/>
+      <output message="tns:putResponse"/>
+      <fault message="tns:NotFoundException" name="NotFoundException"/>
+    </operation>
+    <operation name="delete">
+      <input message="tns:delete"/>
+      <output message="tns:deleteResponse"/>
+      <fault message="tns:NotFoundException" name="NotFoundException"/>
+    </operation>
+    <operation name="query">
+      <input message="tns:query"/>
+      <output message="tns:queryResponse"/>
+    </operation>
+  </portType>
+  <binding name="NewsServiceImplPortBinding" type="tns:NewsService">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getAll">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="get">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="NotFoundException">
+        <soap:fault name="NotFoundException" use="literal"/>
+      </fault>
+    </operation>
+    <operation name="post">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="put">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="NotFoundException">
+        <soap:fault name="NotFoundException" use="literal"/>
+      </fault>
+    </operation>
+    <operation name="delete">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="NotFoundException">
+        <soap:fault name="NotFoundException" use="literal"/>
+      </fault>
+    </operation>
+    <operation name="query">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="NewsService">
+    <port name="NewsServicePort" binding="tns:NewsServiceImplPortBinding">
+      <soap:address location="http://localhost:8085/NewsService"/>
+    </port>
+  </service>
+</definitions> 
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.xsd b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.xsd
new file mode 100644
index 0000000000..0a59f9311e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.xsd
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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 version="1.0" targetNamespace="http://abdera.test/" xmlns:tns="http://abdera.test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="NotFoundException" type="tns:NotFoundException"/>
+
+  <xs:element name="delete" type="tns:delete"/>
+
+  <xs:element name="deleteResponse" type="tns:deleteResponse"/>
+
+  <xs:element name="get" type="tns:get"/>
+
+  <xs:element name="getAll" type="tns:getAll"/>
+
+  <xs:element name="getAllResponse" type="tns:getAllResponse"/>
+
+  <xs:element name="getResponse" type="tns:getResponse"/>
+
+  <xs:element name="post" type="tns:post"/>
+
+  <xs:element name="postResponse" type="tns:postResponse"/>
+
+  <xs:element name="put" type="tns:put"/>
+
+  <xs:element name="putResponse" type="tns:putResponse"/>
+
+  <xs:element name="query" type="tns:query"/>
+
+  <xs:element name="queryResponse" type="tns:queryResponse"/>
+
+  <xs:complexType name="post">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+      <xs:element name="arg1" type="tns:Item" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="Item">
+    <xs:sequence>
+      <xs:element name="name" type="xs:string" minOccurs="0"/>
+      <xs:element name="title" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="postResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="get">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:Item" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="NotFoundException">
+    <xs:sequence>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="query">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="queryResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:entry" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="entry">
+    <xs:sequence>
+      <xs:element name="data" type="xs:anyType" minOccurs="0"/>
+      <xs:element name="dummy" type="tns:Item" minOccurs="0"/>
+      <xs:element name="key" type="xs:anyType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="delete">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="deleteResponse">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getAll">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getAllResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:entry" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="put">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+      <xs:element name="arg1" type="tns:Item" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="putResponse">
+    <xs:sequence/>
+  </xs:complexType>
+</xs:schema>
+
diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/pom.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/pom.xml
new file mode 100644
index 0000000000..41aca24eb0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-binidng-sca-jms</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-binding-sca-jms-client</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-jms</artifactId>
+            <version>1.5.1</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>
+    </build>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
new file mode 100644
index 0000000000..d1b4ecbd15
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

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

+

+public class MyClientImpl implements MyService {

+

+    @Reference public MyService delegate;

+    

+    public String sayHello(String s) {

+        return "Hi " + delegate.sayHello(s);

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
new file mode 100644
index 0000000000..e5123f087c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

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

+

+@Remotable

+public interface MyService {

+

+    String sayHello(String s);

+}

diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8c311553c3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
new file mode 100644
index 0000000000..81aa3ed98d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"

+           name="MyService">

+

+    <component name="MyClientComponent">

+        <implementation.java class="itest.MyClientImpl" />

+        <reference name="delegate" target="MyServiceComponent" />

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
new file mode 100644
index 0000000000..d28d4a51b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
@@ -0,0 +1,57 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package itest;

+

+

+

+import junit.framework.Assert;

+

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

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.Test;

+

+/**

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

+ * implementation of the distributed domain

+ */

+public class MyClientTestCase {

+

+    @Test

+    public void testCalculator() throws Exception {       

+        

+        SCANode serviceNode = SCANodeFactory.newInstance().createSCANode("MyService.composite", new SCAContribution("bla2", "../service/target/itest-binding-sca-jms-service.jar"));

+        

+        SCANode clientNode = SCANodeFactory.newInstance().createSCANodeFromClassLoader("MyClient.composite", null);

+        try {

+

+            serviceNode.start();

+            clientNode.start();

+

+            MyService service = ((SCAClient)clientNode).getService(MyService.class, "MyClientComponent");

+

+            Assert.assertEquals("Hi Hello petra", service.sayHello("petra"));

+

+        } finally {

+            clientNode.stop();

+            serviceNode.stop();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml
new file mode 100644
index 0000000000..4bac4fd856
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-binidng-sca-jms</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA JMS SCA Binding Integration Tests</name>
+
+    <modules>
+       <module>service</module>
+       <module>client</module>
+    </modules>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/pom.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/pom.xml
new file mode 100644
index 0000000000..5c5e5b8db5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-binidng-sca-jms</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-binding-sca-jms-service</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-jms</artifactId>
+            <version>1.5.1</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>
+    </build>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
new file mode 100644
index 0000000000..e5123f087c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

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

+

+@Remotable

+public interface MyService {

+

+    String sayHello(String s);

+}

diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
new file mode 100644
index 0000000000..d0f8dcc393
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+public class MyServiceImpl implements MyService {

+

+    public String sayHello(String s) {

+        return "Hello " + s;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8c311553c3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/MyService.composite
new file mode 100644
index 0000000000..03ac786809
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/MyService.composite
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"

+           name="MyService">

+

+    <component name="MyServiceComponent">

+        <implementation.java class="itest.MyServiceImpl" />

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
new file mode 100644
index 0000000000..3ec979065d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
@@ -0,0 +1,52 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package itest;

+

+

+

+import junit.framework.Assert;

+

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.Test;

+

+/**

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

+ * implementation of the distributed domain

+ */

+public class MyServiceTestCase {

+

+    @Test

+    public void testCalculator() throws Exception {       

+        

+        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("MyService.composite", null);

+        try {

+

+            node.start();

+

+            MyService service = ((SCAClient)node).getService(MyService.class, "MyServiceComponent");

+

+            Assert.assertEquals("Hello petra", service.sayHello("petra"));

+

+        } finally {

+            node.stop();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/pom.xml b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/pom.xml
new file mode 100644
index 0000000000..1b41897611
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/pom.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-bpel-helloworld-reference</artifactId>
+    <name>Apache Tuscany SCA iTest HelloWorld Reference BPEL</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel-ode</artifactId>
+            <version>1.5.1</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.1</version>
+        </dependency>
+
+		<dependency>
+		    <groupId>xerces</groupId>
+		    <artifactId>xercesImpl</artifactId>
+		    <version>2.8.0</version>
+		</dependency>	
+		        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>${artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-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.1</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.5.1</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.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
new file mode 100644
index 0000000000..532b84bd22
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
new file mode 100644
index 0000000000..86d7f245e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
new file mode 100644
index 0000000000..8dea2715bf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..672dbdc0b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..d7ebd5cbb8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
new file mode 100644
index 0000000000..bdfedee2f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
new file mode 100644
index 0000000000..dfec43e8e1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
new file mode 100644
index 0000000000..e768707ccd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
new file mode 100644
index 0000000000..5ec2cc9f2e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
@@ -0,0 +1,84 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
new file mode 100644
index 0000000000..504e2ccc5d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
new file mode 100644
index 0000000000..0f51b96b27
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
new file mode 100644
index 0000000000..4e13380e0b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
@@ -0,0 +1,36 @@
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT 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.5.1/itest/bpel/helloworld-ws/pom.xml b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/pom.xml
new file mode 100644
index 0000000000..480b90fac4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/pom.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-bpel-helloworld-ws</artifactId>
+    <name>Apache Tuscany SCA iTest HelloWorld BPEL Over Web Services</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel-ode</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</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.5.1</version>
+            <scope>runtime</scope>
+        </dependency>   
+				        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>${artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-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.1</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.5.1</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.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
new file mode 100644
index 0000000000..ffdbc50a22
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
new file mode 100644
index 0000000000..6971151a77
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
new file mode 100644
index 0000000000..8cf91adc2c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
new file mode 100644
index 0000000000..f864f45613
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
new file mode 100644
index 0000000000..610bda3cc4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
new file mode 100644
index 0000000000..37f66e4189
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
@@ -0,0 +1,36 @@
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT 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.5.1/itest/bpel/helloworld/pom.xml b/tags/java/sca/1.5.1/itest/bpel/helloworld/pom.xml
new file mode 100644
index 0000000000..3c080a44b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld/pom.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-bpel-helloworld</artifactId>
+    <name>Apache Tuscany SCA iTest HelloWorld BPEL</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel-ode</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+		<dependency>
+		    <groupId>xerces</groupId>
+		    <artifactId>xercesImpl</artifactId>
+		    <version>2.8.1</version>
+		</dependency>	
+		        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>${artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-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.1</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.5.1</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.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
new file mode 100644
index 0000000000..ffdbc50a22
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
new file mode 100644
index 0000000000..76fcd35c2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
new file mode 100644
index 0000000000..8cf91adc2c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
new file mode 100644
index 0000000000..f6b12fb14b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
new file mode 100644
index 0000000000..610bda3cc4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/bpel/helloworld/src/test/resources/log4j.properties b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/log4j.properties
new file mode 100644
index 0000000000..37f66e4189
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/log4j.properties
@@ -0,0 +1,36 @@
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT 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.5.1/itest/bpel/pom.xml b/tags/java/sca/1.5.1/itest/bpel/pom.xml
new file mode 100644
index 0000000000..65750b6860
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/bpel/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1/itest/build-was-integration.xml b/tags/java/sca/1.5.1/itest/build-was-integration.xml
new file mode 100644
index 0000000000..03de4c050f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/build-was-integration.xml
@@ -0,0 +1,68 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/builder/pom.xml b/tags/java/sca/1.5.1/itest/builder/pom.xml
new file mode 100644
index 0000000000..bdcdf844f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-builder</artifactId>
+    <name>Apache Tuscany SCA iTest Builder</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-workspace-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-xml</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-xml</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.8.1</version>
+            <scope>test</scope>
+        </dependency>
+              
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
new file mode 100644
index 0000000000..932ae3987a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
@@ -0,0 +1,45 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

+import java.util.List;

+

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

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

+

+/**

+ * Implementation class for ComponentD.

+ * 

+ * @version $Rev$ $Date$

+ */

+@Service(interfaces={Service3.class, Service3a.class})

+public class ComponentDImpl implements Service3, Service3a {

+

+    @Reference

+    protected Service3a reference3;

+

+    public String getGreetings(String name) {

+        return "Hello, " + name + "!";

+    }

+

+    public String getGreetings2(String name) {

+        return "Goodbye, " + name + "!";

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
new file mode 100644
index 0000000000..f9ef0a1b4f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
@@ -0,0 +1,48 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

+import java.util.List;

+

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

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

+

+/**

+ * Implementation class for ComponentD.

+ * 

+ * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $

+ */

+@Service(interfaces={Service3.class, Service3a.class})

+public class ComponentDReferenceMultiplicityImpl implements Service3, Service3a {

+

+    @Reference

+    protected Service3a reference3;

+    

+    @Reference

+    protected List<Service3> reference3a;

+

+    public String getGreetings(String name) {

+        return "Hello, " + name + "!";

+    }

+

+    public String getGreetings2(String name) {

+        return "Goodbye, " + name + "!";

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
new file mode 100644
index 0000000000..c041a76b47
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
@@ -0,0 +1,36 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

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

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

+

+/**

+ * Implementation class for ComponentD.

+ * 

+ * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $

+ */

+@Service(interfaces={Service3.class})

+public class ComponentEImpl implements Service3 {

+

+

+    public String getGreetings(String name) {

+        return "Hello, " + name + " from ComponentE";

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
new file mode 100644
index 0000000000..ccfeff0997
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
@@ -0,0 +1,36 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

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

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

+

+/**

+ * Implementation class for ComponentD.

+ * 

+ * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $

+ */

+@Service(interfaces={Service3.class})

+public class ComponentFImpl implements Service3 {

+

+

+    public String getGreetings(String name) {

+        return "Hello, " + name + " from ComponentF";

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
new file mode 100644
index 0000000000..9a775feec9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

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

+

+/**

+ * Interface for Service3 in ComponentD.

+ * 

+ * @version $Rev$ $Date$

+ */

+@Remotable

+public interface Service3 {

+

+    String getGreetings(String name);

+

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
new file mode 100644
index 0000000000..98a1741fb6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

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

+

+/**

+ * Interface for Service3a in ComponentD.

+ * 

+ * @version $Rev$ $Date$

+ */

+@Remotable

+public interface Service3a {

+

+    String getGreetings2(String name);

+

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..256d01be58
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario1"

+              xmlns:ns1="http://scenario1">

+    <deployable composite="ns1:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1.composite
new file mode 100644
index 0000000000..5c2a98ab40
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario1"

+        xmlns:tns="http://scenario1"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <binding.ws />

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite
new file mode 100644
index 0000000000..21b5897aa1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario1"

+        xmlns:tns="http://scenario1"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..083079ba42
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario10"

+              xmlns:ns10="http://scenario10">

+   <deployable composite="ns10:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10.composite
new file mode 100644
index 0000000000..c24b7f0046
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10.composite
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario10"

+        xmlns:tns="http://scenario10"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference1a" promote="ComponentB/reference2a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws uri="http://foo.com/bar" />

+        </service>

+        <reference name="reference2" target="ComponentB/Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws />

+        </reference>

+        <reference name="reference2a" target="ComponentF">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />

+            <binding.ws />

+        </reference>        

+    </component>

+    

+    <component name="ComponentF">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>            

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite
new file mode 100644
index 0000000000..27a73d5c41
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario10"

+        xmlns:tns="http://scenario10"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference2a" promote="ComponentD/reference3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3" target="ComponentD/Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+        <reference name="reference3a" target="ComponentE">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>        

+    </component>

+    

+    <component name="ComponentE">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/service3.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/service3.wsdl
new file mode 100644
index 0000000000..14edcc00e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/service3.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Service3Service"

+                  targetNamespace="http://scenarios"

+                  xmlns:tns="http://scenarios"

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

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

+

+  <wsdl:types>

+    <xs:schema attributeFormDefault="qualified"

+               elementFormDefault="unqualified"

+               targetNamespace="http://scenarios"

+               xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      <xs:element name="getGreetings">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="getGreetingsResponse">

+        <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="getGreetings">

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

+  </wsdl:message>

+

+  <wsdl:message name="getGreetingsResponse">

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

+  </wsdl:message>

+

+  <wsdl:portType name="Service3">

+    <wsdl:operation name="getGreetings">

+      <wsdl:input message="tns:getGreetings" />

+      <wsdl:output message="tns:getGreetingsResponse" />

+    </wsdl:operation>

+  </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..a6e4b65970
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario11"

+              xmlns:ns11="http://scenario11">

+   <deployable composite="ns11:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11.composite
new file mode 100644
index 0000000000..3a94152e6a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11.composite
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario11"

+        xmlns:tns="http://scenario11"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference1a" promote="ComponentB/reference2a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws uri="http://foo.com/bar" />

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+        <reference name="reference2a" target="ComponentF">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>        

+    </component>

+    

+    <component name="ComponentF">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>            

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite
new file mode 100644
index 0000000000..6130c68651
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario11"

+        xmlns:tns="http://scenario11"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <binding.ws />

+    </reference>

+    <reference name="reference2a" promote="ComponentD/reference3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />

+        <binding.ws />

+    </reference>    

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3" target="ComponentD/Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+        <reference name="reference3a" target="ComponentE">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>        

+    </component>

+    

+    <component name="ComponentE">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/service3.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/service3.wsdl
new file mode 100644
index 0000000000..14edcc00e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/service3.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Service3Service"

+                  targetNamespace="http://scenarios"

+                  xmlns:tns="http://scenarios"

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

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

+

+  <wsdl:types>

+    <xs:schema attributeFormDefault="qualified"

+               elementFormDefault="unqualified"

+               targetNamespace="http://scenarios"

+               xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      <xs:element name="getGreetings">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="getGreetingsResponse">

+        <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="getGreetings">

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

+  </wsdl:message>

+

+  <wsdl:message name="getGreetingsResponse">

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

+  </wsdl:message>

+

+  <wsdl:portType name="Service3">

+    <wsdl:operation name="getGreetings">

+      <wsdl:input message="tns:getGreetings" />

+      <wsdl:output message="tns:getGreetingsResponse" />

+    </wsdl:operation>

+  </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..125bdc5e53
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario12"

+              xmlns:ns12="http://scenario12">

+   <deployable composite="ns12:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12.composite
new file mode 100644
index 0000000000..aabd445e23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12.composite
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario12"

+        xmlns:tns="http://scenario12"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference1a" promote="ComponentB/reference2a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+        <reference name="reference2a" target="ComponentF">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>        

+    </component>

+    

+    <component name="ComponentF">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>            

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite
new file mode 100644
index 0000000000..a2ccc47c28
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario12"

+        xmlns:tns="http://scenario12"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference2a" promote="ComponentD/reference3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws uri="http://foo.com/bar" />

+        </service>

+        <reference name="reference3" target="ComponentD/Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws/>

+        </reference>

+        <reference name="reference3a" target="ComponentE">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws />

+        </reference>        

+    </component>

+    

+    <component name="ComponentE">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..c906c6c5b0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario13"

+              xmlns:ns13="http://scenario13">

+   <deployable composite="ns13:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13.composite
new file mode 100644
index 0000000000..ed59cd2adf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13.composite
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario13"

+        xmlns:tns="http://scenario13"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference1a" promote="ComponentB/reference2a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+        <reference name="reference2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>        

+    </component>

+    

+    <component name="ComponentF">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>            

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite
new file mode 100644
index 0000000000..41150f78fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario13"

+        xmlns:tns="http://scenario13"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference2a" promote="ComponentD/reference3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws uri="http://foo.com/bar" />

+        </service>

+        <reference name="reference3" target="ComponentD/Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws/>

+        </reference>

+        <reference name="reference3a" target="ComponentE">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws />

+        </reference>        

+    </component>

+    

+    <component name="ComponentE">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..6fa901c4df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario2"

+              xmlns:ns2="http://scenario2">

+    <deployable composite="ns2:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2.composite
new file mode 100644
index 0000000000..66f88294ff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario2"

+        xmlns:tns="http://scenario2"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws />

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite
new file mode 100644
index 0000000000..db1af4743f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario2"

+        xmlns:tns="http://scenario2"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..f5899ab1f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario3"

+              xmlns:ns3="http://scenario3">

+    <deployable composite="ns3:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3.composite
new file mode 100644
index 0000000000..4b37c19e4e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3.composite
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario3"

+        xmlns:tns="http://scenario3"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite
new file mode 100644
index 0000000000..fedd79ff3d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario3"

+        xmlns:tns="http://scenario3"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <binding.ws />

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..642245ea7e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario4"

+              xmlns:ns4="http://scenario4">

+   <deployable composite="ns4:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4.composite
new file mode 100644
index 0000000000..1bb876b33d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4.composite
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario4"

+        xmlns:tns="http://scenario4"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite
new file mode 100644
index 0000000000..55e13700a6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario4"

+        xmlns:tns="http://scenario4"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws />

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..92da17179f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario5"

+              xmlns:ns5="http://scenario5">

+   <deployable composite="ns5:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5.composite
new file mode 100644
index 0000000000..403e19b087
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario5"

+        xmlns:tns="http://scenario5"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

+        <binding.ws uri="http://foo.com/bar" />

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite
new file mode 100644
index 0000000000..0e37ded0e4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario5"

+        xmlns:tns="http://scenario5"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Service3Service"

+                  targetNamespace="http://scenarios"

+                  xmlns:tns="http://scenarios"

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

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

+

+  <wsdl:types>

+    <xs:schema attributeFormDefault="qualified"

+               elementFormDefault="unqualified"

+               targetNamespace="http://scenarios"

+               xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      <xs:element name="getGreetings2">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="getGreetings2Response">

+        <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="getGreetings2">

+    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

+  </wsdl:message>

+

+  <wsdl:message name="getGreetings2Response">

+    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

+  </wsdl:message>

+

+  <wsdl:portType name="Service3a">

+    <wsdl:operation name="getGreetings2">

+      <wsdl:input message="tns:getGreetings2" />

+      <wsdl:output message="tns:getGreetings2Response" />

+    </wsdl:operation>

+  </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..42d45b0b98
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario6"

+              xmlns:ns6="http://scenario6">

+   <deployable composite="ns6:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6.composite
new file mode 100644
index 0000000000..1c89139905
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario6"

+        xmlns:tns="http://scenario6"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws uri="http://foo.com/bar" />

+        </service>

+        <reference name="reference2" target="ComponentB/Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

+            <binding.ws />

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite
new file mode 100644
index 0000000000..853703a353
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario6"

+        xmlns:tns="http://scenario6"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Service3Service"

+                  targetNamespace="http://scenarios"

+                  xmlns:tns="http://scenarios"

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

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

+

+  <wsdl:types>

+    <xs:schema attributeFormDefault="qualified"

+               elementFormDefault="unqualified"

+               targetNamespace="http://scenarios"

+               xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      <xs:element name="getGreetings2">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="getGreetings2Response">

+        <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="getGreetings2">

+    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

+  </wsdl:message>

+

+  <wsdl:message name="getGreetings2Response">

+    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

+  </wsdl:message>

+

+  <wsdl:portType name="Service3a">

+    <wsdl:operation name="getGreetings2">

+      <wsdl:input message="tns:getGreetings2" />

+      <wsdl:output message="tns:getGreetings2Response" />

+    </wsdl:operation>

+  </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..44c471cc65
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario7"

+              xmlns:ns7="http://scenario7">

+   <deployable composite="ns7:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7.composite
new file mode 100644
index 0000000000..6b1ac24cec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario7"

+        xmlns:tns="http://scenario7"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws uri="http://foo.com/bar" />

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite
new file mode 100644
index 0000000000..8e0cebbdd5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario7"

+        xmlns:tns="http://scenario7"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

+        <binding.ws />

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Service3Service"

+                  targetNamespace="http://scenarios"

+                  xmlns:tns="http://scenarios"

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

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

+

+  <wsdl:types>

+    <xs:schema attributeFormDefault="qualified"

+               elementFormDefault="unqualified"

+               targetNamespace="http://scenarios"

+               xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      <xs:element name="getGreetings2">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="getGreetings2Response">

+        <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="getGreetings2">

+    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

+  </wsdl:message>

+

+  <wsdl:message name="getGreetings2Response">

+    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

+  </wsdl:message>

+

+  <wsdl:portType name="Service3a">

+    <wsdl:operation name="getGreetings2">

+      <wsdl:input message="tns:getGreetings2" />

+      <wsdl:output message="tns:getGreetings2Response" />

+    </wsdl:operation>

+  </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..7cb09d0a74
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario8"

+              xmlns:ns8="http://scenario8">

+   <deployable composite="ns8:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8.composite
new file mode 100644
index 0000000000..26e5ee33fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8.composite
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario8"

+        xmlns:tns="http://scenario8"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite
new file mode 100644
index 0000000000..4fa0712199
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario8"

+        xmlns:tns="http://scenario8"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <binding.ws uri="http://foo.com/bar" />

+        </service>

+        <reference name="reference3" target="ComponentD/Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

+            <binding.ws />

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Service3Service"

+                  targetNamespace="http://scenarios"

+                  xmlns:tns="http://scenarios"

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

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

+

+  <wsdl:types>

+    <xs:schema attributeFormDefault="qualified"

+               elementFormDefault="unqualified"

+               targetNamespace="http://scenarios"

+               xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      <xs:element name="getGreetings2">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="getGreetings2Response">

+        <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="getGreetings2">

+    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

+  </wsdl:message>

+

+  <wsdl:message name="getGreetings2Response">

+    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

+  </wsdl:message>

+

+  <wsdl:portType name="Service3a">

+    <wsdl:operation name="getGreetings2">

+      <wsdl:input message="tns:getGreetings2" />

+      <wsdl:output message="tns:getGreetings2Response" />

+    </wsdl:operation>

+  </wsdl:portType>

+

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..6e0908702b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://scenario9"

+              xmlns:ns9="http://scenario9">

+   <deployable composite="ns9:CompositeA" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9.composite
new file mode 100644
index 0000000000..3fce35470e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9.composite
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario9"

+        xmlns:tns="http://scenario9"

+        name="CompositeA">

+

+    <service name="Service1" promote="ComponentB/Service2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference1" promote="ComponentB/reference2">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <binding.ws uri="http://foo.com/bar"/>

+    </reference>

+    <reference name="reference1a" promote="ComponentB/reference2a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        <binding.ws uri="http://foo.com/bar"/>

+    </reference>    

+

+    <component name="ComponentB">

+        <implementation.composite name="tns:CompositeC" />

+        <service name="Service2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference2">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+        <reference name="reference2a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>        

+    </component>

+    

+    <component name="ComponentF">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>            

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite
new file mode 100644
index 0000000000..6e86c547b3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scenario9"

+        xmlns:tns="http://scenario9"

+        name="CompositeC">

+

+    <service name="Service2" promote="ComponentD/Service3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <service name="Service2a" promote="ComponentD/Service3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </service>

+    <reference name="reference2" promote="ComponentD/reference3">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>

+    <reference name="reference2a" promote="ComponentD/reference3a">

+        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+    </reference>    

+

+    <component name="ComponentD">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

+        <service name="Service3">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <service name="Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </service>

+        <reference name="reference3" target="ComponentD/Service3a">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>

+        <reference name="reference3a" target="ComponentE">

+            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

+        </reference>        

+    </component>

+    

+    <component name="ComponentE">

+        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

+        <service name="Service3">

+            <binding.sca />

+            <binding.ws />

+        </service>

+    </component>    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
new file mode 100644
index 0000000000..1f45cb4a66
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
@@ -0,0 +1,805 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

+import javax.wsdl.Definition;

+import javax.wsdl.Port;

+import javax.xml.namespace.QName;

+import junit.framework.TestCase;

+import org.apache.tuscany.sca.assembly.Binding;

+import org.apache.tuscany.sca.assembly.Component;

+import org.apache.tuscany.sca.assembly.ComponentReference;

+import org.apache.tuscany.sca.assembly.ComponentService;

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

+import org.apache.tuscany.sca.assembly.Reference;

+import org.apache.tuscany.sca.assembly.SCABinding;

+import org.apache.tuscany.sca.assembly.Service;

+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;

+

+/**

+ * Load and build some composites and inspect the results.

+ * 

+ * @version $Rev$ $Date$

+ */

+public class BuilderTestCase extends TestCase {

+    private CustomCompositeBuilder customBuilder;

+    

+    @Override

+    protected void setUp() throws Exception {

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+    }

+

+

+    // Scenario 1: <binding.ws> on outer composite service CompositeA/Service1

+    public void testScenario1() throws Exception {

+        System.out.println("====>Running testScenario1");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario1Results(false);

+    }

+

+    public void testScenario1NonWiring() throws Exception {

+        System.out.println("====>Running testScenario1NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario1Results(true);

+    }

+

+    private void checkScenario1Results(boolean nonWiring) {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        if (!nonWiring) {

+            // Should create component service $promoted$Service1 on innermost component

+            //  ComponentD, with <binding.ws> and uri="/Service1"

+            // No other services on ComponentD should have <binding.ws>

+            WebServiceBinding wsBinding = null;

+            for (ComponentService service : componentD.getServices()) {

+                WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

+                if ("$promoted$Service1".equals(service.getName())) {

+                    wsBinding = wsb;

+                } else {

+                    assert wsb == null;

+                }

+            }

+            assert "/Service1".equals(wsBinding.getURI());

+

+            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"

+            Definition def = wsBinding.getWSDLDocument();

+            javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+            Port port = svc.getPort("Service3Port");

+            assert "/Service1".equals(TestUtils.getPortAddress(port));

+        } else {

+            // Should not create component service $promoted$Service1 on innermost component ComponentD

+            // No component services on ComponentD should have <binding.ws>

+            for (ComponentService service : componentD.getServices()) {

+                assert !"$promoted$Service1".equals(service.getName());

+                assert service.getBinding(WebServiceBinding.class) == null;

+            }

+        }

+

+        // No services on ComponentB should have <binding.ws>

+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

+        for (ComponentService service : componentB.getServices()) {

+            assert service.getBinding(WebServiceBinding.class) == null;

+        }

+

+        // No services on CompositeC should have <binding.ws>

+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario1", "CompositeC"));

+        for (Service service : compositeC.getServices()) {

+            assert service.getBinding(WebServiceBinding.class) == null;

+        }

+

+        if (nonWiring) {

+            // Should not add a WSDL document to domain composite service Service1

+            WebServiceBinding wsBinding = null;

+            for (Service service : domainComposite.getServices()) {

+                if ("Service1".equals(service.getName())) {

+                    wsBinding = service.getBinding(WebServiceBinding.class);

+                }

+            }

+            assert wsBinding.getWSDLDocument() == null;

+        }

+    }

+

+    // Scenario 2: <binding.ws> on outer component service ComponentB/Service2

+    public void testScenario2() throws Exception {

+        System.out.println("====>Running testScenario2");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario2and3Results("http://scenario2", false);

+    }

+

+    public void testScenario2NonWiring() throws Exception {

+        System.out.println("====>Running testScenario2NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario2and3Results("http://scenario2", true);

+    }

+

+    private void checkScenario2and3Results(String namespace, boolean nonWiring) {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2"

+        // No other services on ComponentB should have <binding.ws>

+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

+        WebServiceBinding wsBinding = null;

+        for (ComponentService service : componentB.getServices()) {

+            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

+            if ("Service2".equals(service.getName())) {

+                wsBinding = wsb;

+            } else {

+                assert wsb == null;

+            }

+        }

+        Definition def = wsBinding.getWSDLDocument();

+        javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+        Port port = svc.getPort("Service3Port");

+        assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

+

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        if (!nonWiring) {

+            // Should create component service $promoted$ComponentB$slash$Service2 on innermost component

+            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"

+            wsBinding = null;

+            for (ComponentService service : componentD.getServices()) {

+                if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {

+                    wsBinding = service.getBinding(WebServiceBinding.class);

+                }

+            }

+            assert "/ComponentB/Service2".equals(wsBinding.getURI());

+

+            // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+            port = svc.getPort("Service3Port");

+            assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

+        } else {

+            // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD

+            for (ComponentService service : componentD.getServices()) {

+                assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());

+            }

+        }

+

+        // Should add <binding.ws> to outer composite service CompositeA/Service1 

+        wsBinding = null;

+        for (Service service : domainComposite.getServices()) {

+            if ("Service1".equals(service.getName())) {

+                wsBinding = service.getBinding(WebServiceBinding.class);

+            }

+        }

+        assert wsBinding != null;

+        if (nonWiring) {

+            // Should not add a WSDL document to domain composite service Service1

+            assert wsBinding.getWSDLDocument() == null;

+        }

+

+        if (!nonWiring) {

+            // Should create component service $promoted$Service1 on innermost component

+            //  ComponentD, with <binding.ws> and uri="/Service1"

+            wsBinding = null;

+            for (ComponentService service : componentD.getServices()) {

+                if ("$promoted$Service1".equals(service.getName())) {

+                    wsBinding = service.getBinding(WebServiceBinding.class);

+                }

+            }

+            assert "/Service1".equals(wsBinding.getURI());

+

+            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+            port = svc.getPort("Service3Port");

+            assert "/Service1".equals(TestUtils.getPortAddress(port));

+        } else {

+            // Should not create component service $promoted$.Service1 on innermost component ComponentD

+            for (ComponentService service : componentD.getServices()) {

+                assert !"$promoted$Service1".equals(service.getName());

+            }

+        }

+

+        // No services on ComponentD should have <binding.ws>, except for $promoted$Service1

+        // and $promoted$ComponentB$slash$Service2  

+        for (ComponentService service : componentD.getServices()) {

+            if (!"$promoted$Service1".equals(service.getName()) &&

+                !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {

+                assert service.getBinding(WebServiceBinding.class) == null;

+            }

+        }

+

+        // No services on CompositeC should have <binding.ws>, except for Service2 in Scenario 3

+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC"));

+        for (Service service : compositeC.getServices()) {

+            if ("http://scenario3".equals(namespace) && "Service2".equals(service.getName())) {

+                assert service.getBinding(WebServiceBinding.class) != null;

+            } else {

+                assert service.getBinding(WebServiceBinding.class) == null;

+            }

+        }

+    }

+

+    // Scenario 3: <binding.ws> on inner composite service CompositeC/Service2

+    public void testScenario3() throws Exception {

+        System.out.println("====>Running testScenario3");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario2and3Results("http://scenario3", false);

+    }

+

+    public void testScenario3NonWiring() throws Exception {

+        System.out.println("====>Running testScenario3NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario2and3Results("http://scenario3", true);

+    }

+

+    // Scenario 4: <binding.ws> on inner component service ComponentD/Service3

+    public void testScenario4() throws Exception {

+        System.out.println("====>Running testScenario4");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario4Results(false);

+    }

+

+    public void testScenario4NonWiring() throws Exception {

+        System.out.println("====>Running testScenario4NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario4Results(true);

+    }

+

+    private void checkScenario4Results(boolean nonWiring) {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        // Should create WSDL document for ComponentD/Service3 with endpoint uri="/ComponentD/Service3"

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        WebServiceBinding wsBinding = null;

+        for (ComponentService service : componentD.getServices()) {

+            if ("Service3".equals(service.getName())) {

+                wsBinding = service.getBinding(WebServiceBinding.class);

+            }

+        }

+        Definition def = wsBinding.getWSDLDocument();

+        javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+        Port port = svc.getPort("Service3Port");

+        assert "/ComponentB/ComponentD/Service3".equals(TestUtils.getPortAddress(port));

+

+        // Should add <binding.ws> to inner composite service CompositeC/Service2 

+        // No other services on CompositeC should have <binding.ws>

+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario4", "CompositeC"));

+        wsBinding = null;

+        for (Service service : compositeC.getServices()) {

+            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

+            if ("Service2".equals(service.getName())) {

+                wsBinding = wsb;

+            } else {

+                assert wsb == null;

+            }

+        }

+        assert "/ComponentB/Service2".equals(wsBinding.getURI());

+

+        // Should add <binding.ws> to outer component service ComponentB/Service2 

+        // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2"

+        // No other services on ComponentB should have <binding.ws>

+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

+        wsBinding = null;

+        for (ComponentService service : componentB.getServices()) {

+            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

+            if ("Service2".equals(service.getName())) {

+                wsBinding = wsb;

+            } else {

+                assert wsb == null;

+            }

+        }

+        assert "/ComponentB/Service2".equals(wsBinding.getURI());

+        def = wsBinding.getWSDLDocument();

+        svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+        port = svc.getPort("Service3Port");

+        assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

+

+        if (!nonWiring) {

+            // Should create component service $promoted$ComponentB$slash$Service2 on innermost component

+            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"

+            wsBinding = null;

+            for (ComponentService service : componentD.getServices()) {

+                if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {

+                    wsBinding = service.getBinding(WebServiceBinding.class);

+                }

+            }

+            assert "/ComponentB/Service2".equals(wsBinding.getURI());

+

+            // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+            port = svc.getPort("Service3Port");

+            assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

+        } else {

+            // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD

+            for (ComponentService service : componentD.getServices()) {

+                assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());

+            }

+        }

+

+        // Should add <binding.ws> to outer composite service CompositeA/Service1 

+        wsBinding = null;

+        for (Service service : domainComposite.getServices()) {

+            if ("Service1".equals(service.getName())) {

+                wsBinding = service.getBinding(WebServiceBinding.class);

+            }

+        }

+        assert wsBinding != null;

+        if (nonWiring) {

+            // Should not add a WSDL document to domain composite service Service1

+            assert wsBinding.getWSDLDocument() == null;

+        }

+

+        if (!nonWiring) {

+            // Should create component service $promoted$Service1 on innermost component

+            //  ComponentD, with <binding.ws> and uri="/Service1"

+            wsBinding = null;

+            for (ComponentService service : componentD.getServices()) {

+                if ("$promoted$Service1".equals(service.getName())) {

+                    wsBinding = service.getBinding(WebServiceBinding.class);

+                }

+            }

+            assert "/Service1".equals(wsBinding.getURI());

+

+            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

+            port = svc.getPort("Service3Port");

+            assert "/Service1".equals(TestUtils.getPortAddress(port));

+        } else {

+            // Should not create component service $promoted$.Service1 on innermost component ComponentD

+            for (ComponentService service : componentD.getServices()) {

+                assert !"$promoted$Service1".equals(service.getName());

+            }

+        }

+

+        // No services on ComponentD should have <binding.ws>, except for Service3,

+        //  $promoted$.Service1 and $promoted$.ComponentB.Service2

+        for (ComponentService service : componentD.getServices()) {

+            if (!"Service3".equals(service.getName()) &&

+                !"$promoted$Service1".equals(service.getName()) &&

+                !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {

+                assert service.getBinding(WebServiceBinding.class) == null;

+            }

+        }

+    }

+

+    // Scenario 5: <binding.ws> and <interface.wsdl> on outer composite reference CompositeA/reference1

+    public void testScenario5() throws Exception {

+        System.out.println("====>Running testScenario5");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario5Results(false);

+    }

+

+    public void testScenario5NonWiring() throws Exception {

+        System.out.println("====>Running testScenario5NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario5Results(true);

+    }

+

+    private void checkScenario5Results(boolean nonWiring) {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        // Should not add <binding.ws> to any outer component references 

+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

+        for (ComponentReference reference : componentB.getReferences()) {

+            assert reference.getBinding(WebServiceBinding.class) == null;

+        }

+

+        Definition def;

+        javax.wsdl.Service svc;

+        Port port;

+        WebServiceBinding wsBinding;

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        if (!nonWiring) {

+            // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" 

+            // Should set <interface.wsdl> on inner component reference ComponentD/reference3 

+            wsBinding = null;

+            for (ComponentReference reference : componentD.getReferences()) {

+                if ("reference3".equals(reference.getName())) {

+                    wsBinding = reference.getBinding(WebServiceBinding.class);

+                    assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract;

+                }

+            }

+            assert "http://foo.com/bar".equals(wsBinding.getURI());

+

+            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); 

+            port = svc.getPort("Service3aPort");

+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

+        } else {

+            // Should not add <binding.ws> to any inner component references 

+            for (ComponentReference reference : componentD.getReferences()) {

+                assert reference.getBinding(WebServiceBinding.class) == null;

+            }

+        }

+

+        // Should not add <binding.ws> or <interface.wsdl> to inner composite reference CompositeC/reference2 

+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario5", "CompositeC"));

+        for (Reference reference : compositeC.getReferences()) {

+            assert reference.getBinding(WebServiceBinding.class) == null;

+            assert reference.getInterfaceContract() instanceof JavaInterfaceContract;

+        }

+    }

+

+    // Scenario 6: <binding.ws> and <interface.wsdl> on outer component reference ComponentB/reference2

+    public void testScenario6() throws Exception {

+        System.out.println("====>Running testScenario6");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario6and7Results("http://scenario6", false);

+    }

+

+    public void testScenario6NonWiring() throws Exception {

+        System.out.println("====>Running testScenario6NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario6and7Results("http://scenario6", true);

+    }

+

+    private void checkScenario6and7Results(String namespace, boolean nonWiring) {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        // Should remove target= on ComponentB/reference2 (for Scenario 6) or

+        //  CompositeC/reference2 (for Scenario 7), and add uri="http://foo.com/bar"

+        //  to the <binding.ws> element on ComponentB/reference2

+        // For nonWiring, ComponentB/reference2 should have target=

+        //  and no uri= should be added

+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

+        WebServiceBinding wsBinding = null;

+        for (ComponentReference reference : componentB.getReferences()) {

+            if ("reference2".equals(reference.getName())) {

+                if (!nonWiring) {

+                    assert reference.getTargets().size() == 0;

+                } else {

+                    assert reference.getTargets().size() == 1;

+                }

+                wsBinding = reference.getBinding(WebServiceBinding.class);

+            }

+        }

+        if (!nonWiring) {

+            assert "http://foo.com/bar".equals(wsBinding.getURI());

+        } else {

+            assert wsBinding.getURI() == null;

+        }

+

+        Definition def;

+        javax.wsdl.Service svc;

+        Port port;

+        if (!nonWiring) {

+            // Should create WSDL document for ComponentB/reference2 with endpoint uri="http://foo.com/bar"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); 

+            port = svc.getPort("Service3aPort");

+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

+        }

+

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        if (!nonWiring) {

+            // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" 

+            // Should set <interface.wsdl> on inner component reference ComponentD/reference3 

+            wsBinding = null;

+            for (ComponentReference reference : componentD.getReferences()) {

+                if ("reference3".equals(reference.getName())) {

+                    wsBinding = reference.getBinding(WebServiceBinding.class);

+                    assert reference.getBindings().size() == 1;

+                    assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract;

+                }

+            }

+            assert "http://foo.com/bar".equals(wsBinding.getURI());

+

+            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); 

+            port = svc.getPort("Service3aPort");

+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

+        } else {

+            // Should not add <binding.ws> to any inner component references 

+            for (ComponentReference reference : componentD.getReferences()) {

+                assert reference.getBinding(WebServiceBinding.class) == null;

+            }

+        }

+

+        // No references on CompositeC should have <binding.ws> or <interface.wsdl>, except for

+        //  reference2 in Scenario 7

+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC"));

+        for (Reference reference : compositeC.getReferences()) {

+            if ("http://scenario7".equals(namespace) && "reference2".equals(reference.getName())) {

+                assert reference.getBinding(WebServiceBinding.class)!= null;

+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

+            } else {

+                assert reference.getBinding(WebServiceBinding.class) == null;

+                assert reference.getInterfaceContract() instanceof JavaInterfaceContract;

+            }

+        }

+

+        // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 

+        wsBinding = null;

+        for (Reference reference : domainComposite.getReferences()) {

+            if ("reference1".equals(reference.getName())) {

+                wsBinding = reference.getBinding(WebServiceBinding.class);

+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

+            }

+        }

+        assert wsBinding.getURI() == null;

+

+        // Should not add a WSDL document to domain composite reference reference1

+        assert wsBinding.getWSDLDocument() == null;

+    }

+

+    // Scenario 7: <binding.ws> and <interface.wsdl> on inner composite reference CompositeC/reference2

+    public void testScenario7() throws Exception {

+        System.out.println("====>Running testScenario7");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario6and7Results("http://scenario7", false);

+    }

+

+    public void testScenario7NonWiring() throws Exception {

+        System.out.println("====>Running testScenario7NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario6and7Results("http://scenario7", true);

+    }

+

+    // Scenario 8: <binding.ws> and <interface.wsdl> on inner component reference ComponentD/reference3

+    public void testScenario8() throws Exception {

+        System.out.println("====>Running testScenario8");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario8Results(false);

+    }

+

+    public void testScenario8NonWiring() throws Exception {

+        System.out.println("====>Running testScenario8NonWiring");

+        customBuilder = new CustomCompositeBuilder(true);

+        customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario8Results(true);

+    }

+

+    private void checkScenario8Results(boolean nonWiring) {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        // Should replace target= on ComponentD/reference3 by uri="http://foo.com/bar" on <binding.ws>

+        // For nonWiring, the original target= is preserved and there is no uri=

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        WebServiceBinding wsBinding = null;

+        for (ComponentReference reference : componentD.getReferences()) {

+            if ("reference3".equals(reference.getName())) {

+                if (!nonWiring) {

+                    assert reference.getTargets().size() == 0;

+                } else {

+                    assert reference.getTargets().size() == 1;

+                }

+                wsBinding = reference.getBinding(WebServiceBinding.class);

+            }

+        }

+        if (!nonWiring) {

+            assert "http://foo.com/bar".equals(wsBinding.getURI());

+        } else {

+            assert wsBinding.getURI() == null;

+        }

+

+        Definition def;

+        javax.wsdl.Service svc;

+        Port port;

+        if (!nonWiring) {

+            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"

+            def = wsBinding.getWSDLDocument();

+            svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); 

+            port = svc.getPort("Service3aPort");

+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

+        }

+

+        // Should add <binding.ws> and <interface.wsdl> to inner composite reference CompositeC/reference2 

+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario8", "CompositeC"));

+        wsBinding = null;

+        for (Reference reference : compositeC.getReferences()) {

+            if ("reference2".equals(reference.getName())) {

+                wsBinding = reference.getBinding(WebServiceBinding.class);

+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

+            }

+        }

+        assert wsBinding.getURI() == null;

+

+        // Should add <binding.ws> and <interface.wsdl> to outer component reference ComponentB/reference2 

+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

+        wsBinding = null;

+        for (ComponentReference reference : componentB.getReferences()) {

+            if ("reference2".equals(reference.getName())) {

+                wsBinding = reference.getBinding(WebServiceBinding.class);

+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

+            }

+        }

+        assert wsBinding.getURI() == null;

+

+        // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 

+        wsBinding = null;

+        for (Reference reference : domainComposite.getReferences()) {

+            if ("reference1".equals(reference.getName())) {

+                wsBinding = reference.getBinding(WebServiceBinding.class);

+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

+            }

+        }

+        assert wsBinding.getURI() == null;

+

+        // Should not add a WSDL document to domain composite reference reference1

+        assert wsBinding.getWSDLDocument() == null;

+    }

+

+    // Scenario 9: target in reference CDR3A and binding.ws uri= at CAR1A

+    public void testScenario9() throws Exception {

+        System.out.println("====>Running testScenario9");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario9.composite", "TestContribution", "src/main/resources/scenario9/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario9Results();

+    }    

+

+    private void checkScenario9Results() {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        ComponentReference componentRef = null;

+        for (ComponentReference reference : componentD.getReferences()) {

+            if ("reference3a".equals(reference.getName())) {

+                componentRef = reference;

+                assertTrue(reference.getBindings().size() == 2);

+                assertTrue(reference.getBindings().get(0) instanceof SCABinding);

+                assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);

+            }

+        }

+        assertTrue(componentRef != null);

+    }    

+    

+    // Scenario 10: targets in references CBR2A and CDR3A and binding.ws at CBR2A

+    public void testScenario10() throws Exception {

+        System.out.println("====>Running testScenario10");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario10.composite", "TestContribution", "src/main/resources/scenario10/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario10And11Results();

+    }    

+    

+    // Scenario 11: targets in references CBR2A and CDR3A and binding.ws at CCR2A

+    public void testScenario11() throws Exception {

+        System.out.println("====>Running testScenario11");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario11.composite", "TestContribution", "src/main/resources/scenario11/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario10And11Results();

+    }

+

+    private void checkScenario10And11Results() {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        ComponentReference componentRef = null;

+        for (ComponentReference reference : componentD.getReferences()) {

+            if ("reference3a".equals(reference.getName())) {

+                componentRef = reference;

+                assertTrue(reference.getBindings().size() == 2);

+                Binding binding1 = reference.getBindings().get(0);

+                assertTrue(binding1 instanceof SCABinding);

+                assertTrue(reference.getInterfaceContract(binding1) instanceof JavaInterfaceContract);

+                Binding binding2 = reference.getBindings().get(1);

+                assertTrue(binding2 instanceof WebServiceBinding);

+                assertTrue(reference.getInterfaceContract(binding2) instanceof WSDLInterfaceContract);

+            }

+        }

+        assertTrue(componentRef != null);

+    }  

+

+    // Scenario 12: targets in references CBR2A and CDR3A and binding.ws at CDR3A

+    public void testScenario12() throws Exception {

+        System.out.println("====>Running testScenario12");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario12.composite", "TestContribution", "src/main/resources/scenario12/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario12Results();

+    }

+

+    private void checkScenario12Results() {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        ComponentReference componentRef = null;

+        for (ComponentReference reference : componentD.getReferences()) {

+            if ("reference3a".equals(reference.getName())) {

+                componentRef = reference;

+                assertTrue(reference.getBindings().size() == 2);

+                assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);

+                assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);

+            }

+        }

+        assertTrue(componentRef != null);

+    }

+

+    // Scenario 13: target in reference CDR3A

+    public void testScenario13() throws Exception {

+        System.out.println("====>Running testScenario13");

+        customBuilder = new CustomCompositeBuilder(false);

+        customBuilder.loadContribution("scenario13.composite", "TestContribution", "src/main/resources/scenario13/");

+        //TestUtils.printResults(customBuilder);

+        TestUtils.checkProblems(customBuilder);

+        checkScenario13Results();

+    }

+

+    private void checkScenario13Results() {

+        Composite domainComposite = customBuilder.getDomainComposite();

+

+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

+        ComponentReference componentRef = null;

+        for (ComponentReference reference : componentD.getReferences()) {

+            if ("reference3a".equals(reference.getName())) {

+                componentRef = reference;

+                assertTrue(reference.getBindings().size() == 1);

+                assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);

+            }

+        }

+        assertTrue(componentRef != null);

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
new file mode 100644
index 0000000000..cad09920e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import java.util.logging.Logger;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.DefaultEndpointFactory;
+import org.apache.tuscany.sca.assembly.EndpointFactory;
+import org.apache.tuscany.sca.assembly.SCABindingFactory;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
+
+/**
+ * Test version of org.apache.tuscany.sca.assembly.builder.impl.builder.CompositeBuilderImpl
+ *
+ * This class should be identical to CompositeBuilderImpl except for omitting the
+ * following builders:
+ *  componentWireBuilder
+ *  compositeReferenceWireBuilder
+ *  compositePromotedServiceBuilder
+ * It omits the component wiring step and the special processing that's performed
+ * for composite service and reference promotion.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class CompositeBuilderNonWiringImpl implements CompositeBuilder {
+    private static final Logger logger = Logger.getLogger(CompositeBuilderNonWiringImpl.class.getName());
+    private CompositeBuilder compositeIncludeBuilder;
+  //private CompositeBuilder componentReferenceWireBuilder;
+  //private CompositeBuilder componentReferencePromotionWireBuilder;
+  //private CompositeBuilder compositeReferenceWireBuilder;
+    private CompositeBuilder compositeCloneBuilder;
+    private CompositeBuilder componentConfigurationBuilder;
+    private CompositeBuilder compositeServiceConfigurationBuilder;
+    private CompositeBuilder compositeReferenceConfigurationBuilder;
+    private CompositeBuilder compositeBindingURIBuilder;
+    private CompositeBuilder componentServicePromotionBuilder;
+  //private CompositeBuilder compositeServicePromotionBuilder;
+    private CompositeBuilder compositePromotionBuilder;
+    private CompositeBuilder compositePolicyBuilder;
+    private CompositeBuilder componentServiceBindingBuilder;
+    private CompositeBuilder componentReferenceBindingBuilder;
+    
+    /**
+     * Constructs a new composite builder.
+     * 
+     * @param assemblyFactory
+     * @param scaBindingFactory
+     * @param intentAttachPointTypeFactory
+     * @param interfaceContractMapper
+     * @param monitor
+     */
+    public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory,
+                                SCABindingFactory scaBindingFactory,
+                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
+                                InterfaceContractMapper interfaceContractMapper,
+                                Monitor monitor) {
+        this(assemblyFactory, null, scaBindingFactory,  intentAttachPointTypeFactory, interfaceContractMapper, null, monitor);
+    }
+    
+    /**
+     * Constructs a new composite builder.
+     * 
+     * @param assemblyFactory
+     * @param scaBindingFactory
+     * @param endpointFactory
+     * @param intentAttachPointTypeFactory
+     * @param interfaceContractMapper
+     * @param policyDefinitions
+     * @param monitor
+     */
+    public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory,
+                                EndpointFactory endpointFactory,
+                                SCABindingFactory scaBindingFactory,
+                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
+                                InterfaceContractMapper interfaceContractMapper,
+                                SCADefinitions policyDefinitions,
+                                Monitor monitor) {
+        
+        if (endpointFactory == null){
+            endpointFactory = new DefaultEndpointFactory();
+        }       
+        
+        compositeIncludeBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl(monitor); 
+      //componentReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceWireBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
+      //componentReferencePromotionWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferencePromotionWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
+      //compositeReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
+        compositeCloneBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeCloneBuilderImpl(monitor);
+        componentConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
+        compositeServiceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServiceConfigurationBuilderImpl(assemblyFactory);
+        compositeReferenceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceConfigurationBuilderImpl(assemblyFactory);
+        compositeBindingURIBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingURIBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
+      //componentServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServicePromotionBuilderImpl(assemblyFactory);
+      //compositeServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServicePromotionBuilderImpl(assemblyFactory);
+        compositePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePromotionBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
+        compositePolicyBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePolicyBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
+        componentServiceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServiceBindingBuilderImpl(monitor);
+        componentReferenceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceBindingBuilderImpl(monitor);
+    }
+
+    public void build(Composite composite) throws CompositeBuilderException {
+
+        // Collect and fuse includes
+        compositeIncludeBuilder.build(composite);
+
+        // Expand nested composites
+        compositeCloneBuilder.build(composite);
+
+        // Configure all components
+        componentConfigurationBuilder.build(composite);
+
+        // Connect composite services/references to promoted services/references
+        compositePromotionBuilder.build(composite);
+        
+        // Compute the policies across the model hierarchy
+        compositePolicyBuilder.build(composite);
+        
+        // Configure composite services
+        compositeServiceConfigurationBuilder.build(composite);
+        
+        // Configure composite references
+        compositeReferenceConfigurationBuilder.build(composite);
+
+        // Configure binding URIs
+        compositeBindingURIBuilder.build(composite);
+
+        // Create promoted component services
+//      componentServicePromotionBuilder.build(composite);
+
+        // Create promoted composite services
+//      compositeServicePromotionBuilder.build(composite);
+
+        // Build component service binding-related information
+        componentServiceBindingBuilder.build(composite);
+        
+        // Wire the components
+//      componentReferenceWireBuilder.build(composite);
+
+        // Wire the promoted component references
+//      componentReferencePromotionWireBuilder.build(composite);
+
+        // Wire the composite references
+//      compositeReferenceWireBuilder.build(composite);
+
+        // Build component reference binding-related information
+        componentReferenceBindingBuilder.build(composite);
+        
+        // Fuse nested composites
+        //FIXME do this later
+        //cloneBuilder.fuseCompositeImplementations(composite);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
new file mode 100644
index 0000000000..d4996c7418
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
@@ -0,0 +1,210 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

+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.namespace.QName;

+import javax.xml.stream.XMLInputFactory;

+import javax.xml.stream.XMLOutputFactory;

+

+import org.apache.tuscany.sca.assembly.AssemblyFactory;

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

+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.assembly.xml.Constants;

+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.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 ExtensionPointRegistry extensionPoints;

+    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 static Workspace workspace;

+    private List<SCADefinitions> policyDefinitions;

+    private Monitor monitor;

+    private Composite domainComposite;

+    private boolean nonWiring;

+

+    public CustomCompositeBuilder(boolean nonWiring) {

+        this.nonWiring = nonWiring;

+    }

+

+    private void init() {

+        

+        // Create extension point registry 

+        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);

+        

+        // 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);

+        if (nonWiring) {

+            domainCompositeBuilder = new CompositeBuilderNonWiringImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);

+        } else {

+            domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);

+        }

+    }

+    

+    public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {

+        init();

+

+        // Create workspace model

+        workspace = workspaceFactory.createWorkspace();

+        workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints));

+

+        // Read the test contribution

+        URI artifactURI = URI.create(sourceURI);

+        URL artifactURL = new File(sourceURL).toURI().toURL();

+        URL contributionURL = new File(compositeURL).toURI().toURL();

+        Contribution testContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);                 

+        workspace.getContributions().add(testContribution);

+        

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

+        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);

+    }

+    

+    /**

+     * Returns the delegating model processor.

+     * @return the delegating model processor

+     */

+    public StAXArtifactProcessor<Object> getModelProcessor() {

+        return xmlProcessor;

+    }

+    

+    /**

+     * Returns the XML output factory.

+     * @return the XML output factory

+     */

+    public XMLOutputFactory getOutputFactory() {

+        return outputFactory;

+    }

+    

+    /**

+     * Returns the domain composite.

+     * @return the domain composite model object

+     */

+    public Composite getDomainComposite() {

+        return domainComposite;

+    }

+    

+    /**

+     * Returns the monitor.

+     * @return the monitor instance

+     */

+    public Monitor getMonitor() {

+        return monitor;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
new file mode 100644
index 0000000000..9bff4d394e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
@@ -0,0 +1,203 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.itest.builder;

+

+import java.io.ByteArrayInputStream;

+import java.io.ByteArrayOutputStream;

+import javax.wsdl.Definition;

+import javax.wsdl.Port;

+import javax.wsdl.WSDLException;

+import javax.wsdl.extensions.soap.SOAPAddress;

+import javax.wsdl.extensions.soap12.SOAP12Address;

+import javax.wsdl.factory.WSDLFactory;

+import javax.wsdl.xml.WSDLWriter;

+import javax.xml.namespace.QName;

+import javax.xml.parsers.DocumentBuilder;

+import javax.xml.parsers.DocumentBuilderFactory;

+import javax.xml.stream.XMLStreamWriter;

+import junit.framework.TestCase;

+import org.apache.tuscany.sca.assembly.Binding;

+import org.apache.tuscany.sca.assembly.Component;

+import org.apache.tuscany.sca.assembly.ComponentService;

+import org.apache.tuscany.sca.assembly.ComponentReference;

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

+import org.apache.tuscany.sca.assembly.Contract;

+import org.apache.tuscany.sca.assembly.Implementation;

+import org.apache.tuscany.sca.assembly.Reference;

+import org.apache.tuscany.sca.assembly.Service;

+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.monitor.Monitor;

+import org.apache.tuscany.sca.monitor.Problem;

+import org.apache.xml.serialize.OutputFormat;

+import org.apache.xml.serialize.XMLSerializer;

+import org.w3c.dom.Document;

+

+/**

+ * Static utility methods for use by test cases.

+ * 

+ * @version $Rev$ $Date$

+ */

+public class TestUtils {

+

+    protected static void checkProblems(CustomCompositeBuilder customBuilder) throws Exception {

+        boolean problems = false;

+        for (Problem problem : customBuilder.getMonitor().getProblems()) {

+            if (problem.getCause() != null) {

+                problem.getCause().printStackTrace();

+            }

+            problems = true;

+        }

+        assert !problems;

+    }

+

+    protected static String getPortAddress(Port port) {

+        Object ext = port.getExtensibilityElements().get(0);

+        if (ext instanceof SOAPAddress) {

+            return ((SOAPAddress)ext).getLocationURI();

+        }

+        if (ext instanceof SOAP12Address) {

+            return ((SOAP12Address)ext).getLocationURI();

+        }

+        return null;

+    }

+

+    protected static Component getComponent(Composite composite, String name) {

+        for (Component component : composite.getComponents()) {

+            if (name.equals(component.getName())) {

+                return component;

+            }

+            // process implementation composites recursively

+            Implementation impl = component.getImplementation();

+            if (impl instanceof Composite) {

+                Component comp = getComponent((Composite)impl, name);

+                if (comp != null) {

+                    return comp;

+                }

+            }

+        }

+        return null;

+    }

+

+    protected static Composite getComposite(Composite composite, QName name) {

+        if (name.equals(composite.getName())) {

+            return composite;

+        }

+        for (Component component : composite.getComponents()) {

+            // process implementation composites recursively

+            Implementation impl = component.getImplementation();

+            if (impl instanceof Composite) {

+                Composite comp = getComposite((Composite)impl, name);

+                if (comp != null) {

+                    return comp;

+                }

+            }

+        }

+        return null;

+    }

+

+    protected static void printResults(CustomCompositeBuilder customBuilder) throws Exception {

+        for (Problem problem : customBuilder.getMonitor().getProblems()) {

+            if (problem.getCause() != null) {

+                problem.getCause().printStackTrace();

+            }

+        }

+        Composite domainComposite = customBuilder.getDomainComposite();

+        printComposite(domainComposite, customBuilder);

+    }

+

+    private static void printComposite(Composite composite, CustomCompositeBuilder customBuilder) throws Exception {

+        // process implementation composites recursively

+        for (Component component : composite.getComponents()) {

+            Implementation implementation = component.getImplementation();

+            if (implementation instanceof Composite) {

+                printComposite((Composite)implementation, customBuilder);

+            }

+        }

+

+        // write out the SCDL

+        writeSCDL(composite, customBuilder);

+

+        // find all the component service and reference bindings     

+        for (Component component : composite.getComponents()) {

+            for (ComponentService componentService : component.getServices()) {

+                for (Binding binding : componentService.getBindings()) {

+                    if (binding instanceof WebServiceBinding) {

+                        writeWSDL(component, componentService, ((WebServiceBinding)binding).getWSDLDocument());

+                    }

+                }

+            }

+            for (ComponentReference componentReference : component.getReferences()) {

+                for (Binding binding : componentReference.getBindings()) {

+                    if (binding instanceof WebServiceBinding) {

+                        writeWSDL(component, componentReference, ((WebServiceBinding)binding).getWSDLDocument());

+                    }

+                }

+            }

+        }

+

+        // find all the composite service and reference bindings     

+        for (Service service : composite.getServices()) {

+            for (Binding binding : service.getBindings()) {

+                if (binding instanceof WebServiceBinding) {

+                    writeWSDL(null, service, ((WebServiceBinding)binding).getWSDLDocument());

+                }

+            }

+        }

+        for (Reference reference : composite.getReferences()) {

+            for (Binding binding : reference.getBindings()) {

+                if (binding instanceof WebServiceBinding) {

+                    writeWSDL(null, reference, ((WebServiceBinding)binding).getWSDLDocument());

+                }

+            }

+        }

+    }

+

+    private static void writeSCDL(Composite composite, CustomCompositeBuilder customBuilder) throws Exception {

+        // Print out a composite

+        ByteArrayOutputStream bos = new ByteArrayOutputStream();

+        XMLStreamWriter writer = customBuilder.getOutputFactory().createXMLStreamWriter(bos);

+        customBuilder.getModelProcessor().write(composite, writer);

+        

+        // Parse and write again to pretty format it

+        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();

+        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));

+        OutputFormat format = new OutputFormat();

+        format.setIndenting(true);

+        format.setIndent(2);

+        XMLSerializer serializer = new XMLSerializer(System.out, format);

+        System.out.println("-->Runtime SCDL model for composite " + composite.getName());

+        serializer.serialize(document);

+    }

+

+    private static void writeWSDL(Component component, Contract contract, Definition definition) {

+        if (definition == null) {

+            System.out.println("-->No generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName());

+        } else {

+            try {

+                System.out.println("-->Generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName());

+                WSDLWriter writer =  WSDLFactory.newInstance().newWSDLWriter();

+                writer.writeWSDL(definition, System.out);

+            } catch (WSDLException e) {

+                // ignore

+            }

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/pom.xml b/tags/java/sca/1.5.1/itest/callablereferences-ws/pom.xml
new file mode 100644
index 0000000000..cff55122fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callablereferences-ws</artifactId>
+    <name>Apache Tuscany SCA iTest Callable References over Web Services</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
new file mode 100644
index 0000000000..ecf1ac27e1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
new file mode 100644
index 0000000000..c46087d865
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
@@ -0,0 +1,59 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
new file mode 100644
index 0000000000..670c145cc3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
new file mode 100644
index 0000000000..eb4d647a22
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
new file mode 100644
index 0000000000..bb5e57397d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
new file mode 100644
index 0000000000..6e5f1cedf9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
new file mode 100644
index 0000000000..995e4fcf39
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
new file mode 100644
index 0000000000..be72fd779e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
new file mode 100644
index 0000000000..b73f26b573
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
new file mode 100644
index 0000000000..c3abc4c65d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
new file mode 100644
index 0000000000..3d782a0b84
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed 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.5.1/itest/callablereferences-ws/src/main/resources/example.composite b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/example.composite
new file mode 100644
index 0000000000..ea0819a32e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/example.composite
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
new file mode 100644
index 0000000000..310e31fb02
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
@@ -0,0 +1,44 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
new file mode 100644
index 0000000000..66fb2ef96c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/pom.xml b/tags/java/sca/1.5.1/itest/callablereferences/pom.xml
new file mode 100644
index 0000000000..a2fc1ec826
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callablereferences</artifactId>
+    <name>Apache Tuscany SCA iTest Callable References</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+<!-- 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>   
+-->        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>  
+        
+                      
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
new file mode 100644
index 0000000000..5934f16851
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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();
+
+    String invokeDReference();
+}
diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
new file mode 100644
index 0000000000..7c2fd092dc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 String invokeDReference() {
+        return dReference.foo(null);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
new file mode 100644
index 0000000000..ade672b0ab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
new file mode 100644
index 0000000000..518e77d3a8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
new file mode 100644
index 0000000000..fdf80cc1c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
new file mode 100644
index 0000000000..cc8ec8f000
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
new file mode 100644
index 0000000000..48b697df31
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
new file mode 100644
index 0000000000..27ad48b9fe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
new file mode 100644
index 0000000000..abcedfa6e1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
new file mode 100644
index 0000000000..f2e0ce7582
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
new file mode 100644
index 0000000000..ab21421c4d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
new file mode 100644
index 0000000000..5b5984b164
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
new file mode 100644
index 0000000000..223c467f47
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
new file mode 100644
index 0000000000..ed4e66bec3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
new file mode 100644
index 0000000000..e32051373f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
new file mode 100644
index 0000000000..adf5a1c1ce
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
new file mode 100644
index 0000000000..0bf8f7ef1e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed 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.5.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
new file mode 100644
index 0000000000..5b3add1e61
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed 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.5.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
new file mode 100644
index 0000000000..49b75f56e4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed 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.5.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
new file mode 100644
index 0000000000..9216f44191
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed 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.5.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..95021f72a4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
new file mode 100644
index 0000000000..42d739564c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed 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.5.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..2edda61601
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
new file mode 100644
index 0000000000..a9cbb5d0a1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
new file mode 100644
index 0000000000..ba9020811c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
@@ -0,0 +1,145 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+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 SCANode nodeA;

+    private static SCANode nodeB;

+   

+    private static AComponent acomponent;

+

+    @BeforeClass

+    public static void init() throws Exception {

+        

+        try {

+            

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

+                  

+            SCANodeFactory nodeFactory = SCANodeFactory.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.invokeDReference();

+        } catch (Exception e) {

+            Assert.assertTrue(true);

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
new file mode 100644
index 0000000000..f2d8fe5d64
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
new file mode 100644
index 0000000000..d785a6a397
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.invokeDReference();
+        } catch (Exception e) {
+            Assert.assertTrue(true);
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/callback-api/pom.xml b/tags/java/sca/1.5.1/itest/callback-api/pom.xml
new file mode 100644
index 0000000000..d351f7a813
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-api</artifactId>
+    <name>Apache Tuscany SCA iTest Callback API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</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.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
new file mode 100644
index 0000000000..de17ba2f0d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
new file mode 100644
index 0000000000..5fd4a71466
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
new file mode 100644
index 0000000000..274984abb3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
new file mode 100644
index 0000000000..33de1e7739
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
new file mode 100644
index 0000000000..61e2c7ee8f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite b/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite
new file mode 100644
index 0000000000..946c4862ee
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..19eb25631e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/tags/java/sca/1.5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
new file mode 100644
index 0000000000..9471049c74
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-basic/pom.xml b/tags/java/sca/1.5.1/itest/callback-basic/pom.xml
new file mode 100644
index 0000000000..13a2c16e5c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-basic</artifactId>
+    <name>Apache Tuscany SCA iTest Callback Basic</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</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.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
new file mode 100644
index 0000000000..5e9d3d6821
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
new file mode 100644
index 0000000000..9f4019f28c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
new file mode 100644
index 0000000000..e0e6d7eb8c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
new file mode 100644
index 0000000000..bd41fa7037
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
new file mode 100644
index 0000000000..4ca2dc9af9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
new file mode 100644
index 0000000000..c506956088
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..adf28214f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/tags/java/sca/1.5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
new file mode 100644
index 0000000000..32c26a348a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-complex-type/pom.xml b/tags/java/sca/1.5.1/itest/callback-complex-type/pom.xml
new file mode 100644
index 0000000000..90ab9d74a9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-complex-type</artifactId>
+    <name>Apache Tuscany SCA iTest Callback Complex Type</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
new file mode 100644
index 0000000000..9fddb850ba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
new file mode 100644
index 0000000000..739983c277
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
new file mode 100644
index 0000000000..d2b03fcde7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
new file mode 100644
index 0000000000..ffbf4f35fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
new file mode 100644
index 0000000000..dc31ed156b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
new file mode 100644
index 0000000000..3f48f16389
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
new file mode 100644
index 0000000000..ff38134df5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
@@ -0,0 +1,28 @@
+<?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.5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
new file mode 100644
index 0000000000..33d1afaecd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-composite-scope/pom.xml b/tags/java/sca/1.5.1/itest/callback-composite-scope/pom.xml
new file mode 100644
index 0000000000..bef06de1ab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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$ -->
+
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-composite-scope</artifactId>
+    <name>Apache Tuscany SCA iTest Callback COMPOSITE Scope</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</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.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
new file mode 100644
index 0000000000..a5320a6492
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Remotable
+@Callback(HelloworldCallback.class)
+public interface Helloworld {
+    
+    String sayHello(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
new file mode 100644
index 0000000000..c37c2f57a2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface HelloworldCallback {
+    
+    String whoIs(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
new file mode 100644
index 0000000000..0d56e440cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface HelloworldDelegate {
+    
+    String sayHello(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
new file mode 100644
index 0000000000..aa7217eb2a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.ComponentName;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * A HelloworldDelegate implementation. The service method invocation is delegated to a Helloworld service
+ * reference injected into this component.
+ *   
+ * @version $Rev$ $Date$
+ */
+@Scope("COMPOSITE")
+@Service(interfaces = {HelloworldDelegate.class, HelloworldCallback.class})
+public class HelloworldDelegateImpl implements HelloworldDelegate, HelloworldCallback {
+
+    @ComponentName
+    protected String componentName;
+
+    @Reference
+    public Helloworld helloworld;
+    
+    @Property
+    public String salutation;
+    
+    public String sayHello(String name) {
+        System.out.println(componentName+": HelloworldDelegateImpl("+this+").sayHello: " + name);
+        return helloworld.sayHello(name);
+    }
+    
+    public String whoIs(String name) {
+        System.out.println(componentName+": HelloworldDelegateImpl("+this+").whoIs: " + name);
+        if(!"world".equalsIgnoreCase(name)) {
+            return salutation;
+        } else {
+            return "";
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
new file mode 100644
index 0000000000..8107bcf42b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.ComponentName;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Service(Helloworld.class)
+@Scope("COMPOSITE")
+public class HelloworldImpl implements Helloworld {
+    
+    @ComponentName
+    protected String componentName;
+    
+    @Callback
+    public HelloworldCallback helloworldCallback;
+    
+    public String sayHello(String name) {
+        System.out.println(componentName+": HelloworldImpl("+this+").sayHello: " + name);
+        String msg = "Hello " + helloworldCallback.whoIs(name) + " " + name;
+        System.out.println("Msg: "+msg);
+        return msg;
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
new file mode 100644
index 0000000000..1593c1dc23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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://callback"
+           name="HelloworldDelegate">
+
+    <component name="HelloworldXComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.HelloworldImpl"/>
+    </component>
+    
+    <component name="HelloworldDelegateComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.HelloworldDelegateImpl"/>
+        <reference name="helloworld" target="HelloworldXComponent"/>
+        <property name="salutation">Monsieur</property>
+    </component>
+    
+    <component name="HelloworldDelegateComponent2">
+        <implementation.java class="org.apache.tuscany.sca.test.HelloworldDelegateImpl"/>
+        <reference name="helloworld" target="HelloworldXComponent"/>
+        <property name="salutation">Mr.</property>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..65b9ca501f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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$ -->
+
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback"
+    xmlns:t="http://callback">
+    <deployable composite="t:HelloworldDelegate" />
+</contribution>
diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
new file mode 100644
index 0000000000..bd967099dc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class CallbackTestCase {
+
+    private static SCADomain domain;
+    private HelloworldDelegate client;
+    private HelloworldDelegate client2;
+    private HelloworldCallback callback;
+    private HelloworldCallback callback2;
+
+    @Test
+    @Ignore("TUSCANY-2823")
+    public void testCallbacks() {
+        String name = "John";
+        Assert.assertEquals("Hello "+callback.whoIs(name) + " " + name, client.sayHello(name));
+        Assert.assertEquals("Hello "+callback2.whoIs(name) + " " + name, client2.sayHello(name));
+    }
+
+    @Before    
+    public void setUp() throws Exception {
+    	if( domain == null ) {
+    		domain = SCADomain.newInstance("HelloworldDelegate.composite");
+    	}
+    	
+    	client = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent/HelloworldDelegate");
+        callback = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent/HelloworldCallback");
+        client2 = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent2/HelloworldDelegate");
+        callback2 = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent2/HelloworldCallback");
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        domain.close();
+    }
+
+
+}
diff --git a/tags/java/sca/1.5.1/itest/callback-id/pom.xml b/tags/java/sca/1.5.1/itest/callback-id/pom.xml
new file mode 100644
index 0000000000..050bf35f84
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-id</artifactId>
+    <name>Apache Tuscany SCA iTest Callback ID</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
new file mode 100644
index 0000000000..b14560a8c3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
new file mode 100644
index 0000000000..a9e551f8b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
new file mode 100644
index 0000000000..59c9c3d069
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
new file mode 100644
index 0000000000..18c592a1c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
new file mode 100644
index 0000000000..8b0a4b69cf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-id/src/main/resources/CallBackIdClient.composite b/tags/java/sca/1.5.1/itest/callback-id/src/main/resources/CallBackIdClient.composite
new file mode 100644
index 0000000000..c9a6ba6258
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/src/main/resources/CallBackIdClient.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/tags/java/sca/1.5.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
new file mode 100644
index 0000000000..771fbb8ff7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-multiple-wires/pom.xml b/tags/java/sca/1.5.1/itest/callback-multiple-wires/pom.xml
new file mode 100644
index 0000000000..b2ad4a3c39
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-multiple-wires</artifactId>
+    <name>Apache Tuscany SCA iTest Callback With Mutiple Wires</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
new file mode 100644
index 0000000000..7c80d222fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
new file mode 100644
index 0000000000..df91f3d268
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
new file mode 100644
index 0000000000..a0a9564002
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
new file mode 100644
index 0000000000..cfd601f546
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
new file mode 100644
index 0000000000..f198efae51
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
new file mode 100644
index 0000000000..d19b3fe355
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
new file mode 100644
index 0000000000..3dae3ca3a8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
new file mode 100644
index 0000000000..3c83e4bedd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-separatethread/pom.xml b/tags/java/sca/1.5.1/itest/callback-separatethread/pom.xml
new file mode 100644
index 0000000000..9635fe1dd4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-separatethread</artifactId>
+    <name>Apache Tuscany SCA iTest Callback Using Separate Thread</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
new file mode 100644
index 0000000000..f812a39058
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
new file mode 100644
index 0000000000..e861f8a3d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
@@ -0,0 +1,172 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
new file mode 100644
index 0000000000..ae41f596fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
new file mode 100644
index 0000000000..c22b8cceec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
new file mode 100644
index 0000000000..4d672b3a8b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
@@ -0,0 +1,197 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
new file mode 100644
index 0000000000..e111e5074c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
new file mode 100644
index 0000000000..f7e7be2133
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/callback-set-callback/pom.xml b/tags/java/sca/1.5.1/itest/callback-set-callback/pom.xml
new file mode 100644
index 0000000000..ca7b5f2ca7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-set-callback</artifactId>
+    <name>Apache Tuscany SCA iTest Set Callback</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
new file mode 100644
index 0000000000..3b9599f53f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
new file mode 100644
index 0000000000..48752f2ea1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
new file mode 100644
index 0000000000..ad0e0603a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
new file mode 100644
index 0000000000..0a22b0e01f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
new file mode 100644
index 0000000000..94cb6aa73b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
new file mode 100644
index 0000000000..66e4d3fc05
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
@@ -0,0 +1,190 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
new file mode 100644
index 0000000000..afedcdf7f1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
new file mode 100644
index 0000000000..4a6c9dbaa6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
new file mode 100644
index 0000000000..3552ddecab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
new file mode 100644
index 0000000000..496ae0b1a5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/pom.xml b/tags/java/sca/1.5.1/itest/callback-set-conversation/pom.xml
new file mode 100644
index 0000000000..335cd6feab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-set-conversation</artifactId>
+    <name>Apache Tuscany SCA iTest Callback Set Conversation</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
new file mode 100644
index 0000000000..d97c69eaed
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
new file mode 100644
index 0000000000..a704fd0ece
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
new file mode 100644
index 0000000000..013424bf5e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
new file mode 100644
index 0000000000..5d692e7728
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
new file mode 100644
index 0000000000..75a4a3a6a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
new file mode 100644
index 0000000000..e7a3b144f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
new file mode 100644
index 0000000000..692b6dfc35
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
new file mode 100644
index 0000000000..bca94ce407
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
new file mode 100644
index 0000000000..ce73417f94
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
new file mode 100644
index 0000000000..45bdaea9ab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/component-type/pom.xml b/tags/java/sca/1.5.1/itest/component-type/pom.xml
new file mode 100644
index 0000000000..572f248894
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-component-type</artifactId>
+    <name>Apache Tuscany SCA iTest Component Type</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+</project>
+
diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddService.java
new file mode 100644
index 0000000000..188451ebac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
new file mode 100644
index 0000000000..8b6fe066a6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java
new file mode 100644
index 0000000000..08afd922b3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorService.java
new file mode 100644
index 0000000000..031fa8b912
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..1209ac128a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideService.java
new file mode 100644
index 0000000000..30d248208b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
new file mode 100644
index 0000000000..f7ac0b7287
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyService.java
new file mode 100644
index 0000000000..5290605938
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..b7dca792b2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractService.java
new file mode 100644
index 0000000000..bf0d1882b6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
new file mode 100644
index 0000000000..77b128ab8d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/component-type/src/main/resources/Calculator.composite b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/Calculator.composite
new file mode 100644
index 0000000000..b229787657
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
new file mode 100644
index 0000000000..00c48e5a35
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
@@ -0,0 +1,27 @@
+<?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.5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
new file mode 100644
index 0000000000..74bedc0a98
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
@@ -0,0 +1,43 @@
+<?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.5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
new file mode 100644
index 0000000000..289fcc3e11
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
@@ -0,0 +1,27 @@
+<?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.5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
new file mode 100644
index 0000000000..2d8a879cda
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
@@ -0,0 +1,27 @@
+<?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.5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
new file mode 100644
index 0000000000..6214955141
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
@@ -0,0 +1,27 @@
+<?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.5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
new file mode 100644
index 0000000000..08fc8e33bf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/build-jar.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/build-jar.xml
new file mode 100644
index 0000000000..299ce6864f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/build-jar.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/pom.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/pom.xml
new file mode 100644
index 0000000000..ca54eca210
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/pom.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
new file mode 100644
index 0000000000..814c38777a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..e4daf0ec02
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..e4b3bc7048
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
new file mode 100644
index 0000000000..698aa2aa5d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
new file mode 100644
index 0000000000..1e87d59af1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
new file mode 100644
index 0000000000..9e01f00a79
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
new file mode 100644
index 0000000000..2514928c10
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
new file mode 100644
index 0000000000..cdd12d589d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
new file mode 100644
index 0000000000..6f1f6b8730
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..714d1826e1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
new file mode 100644
index 0000000000..7f7dc969e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
new file mode 100644
index 0000000000..7f7dc969e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
new file mode 100644
index 0000000000..8a2bec308f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
new file mode 100644
index 0000000000..c77c4c1c7e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..210a68011f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..d118cceef9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
new file mode 100644
index 0000000000..d37b6659da
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
new file mode 100644
index 0000000000..77b28d9023
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..8ec290a831
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
new file mode 100644
index 0000000000..1398416978
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
new file mode 100644
index 0000000000..db1f0d34e7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
new file mode 100644
index 0000000000..5be79b741a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
new file mode 100644
index 0000000000..a76fae8090
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-classloader/contribution-test/pom.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/pom.xml
new file mode 100644
index 0000000000..b96b2a2482
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
new file mode 100644
index 0000000000..692f16f6f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
@@ -0,0 +1,373 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
new file mode 100644
index 0000000000..1ec7aaaa3a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
@@ -0,0 +1,231 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
new file mode 100644
index 0000000000..b123951ef6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
@@ -0,0 +1,381 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/contribution-classloader/pom.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/pom.xml
new file mode 100644
index 0000000000..928701e060
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-classloader/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/pom.xml b/tags/java/sca/1.5.1/itest/contribution-folder/pom.xml
new file mode 100644
index 0000000000..74065fb4f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-folder</artifactId>
+    <name>Apache Tuscany SCA iTest Folder and ZIP Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
new file mode 100644
index 0000000000..9f9c15c14d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
@@ -0,0 +1,53 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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 junit.framework.TestCase;

+

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

+

+import calculator.CalculatorService;

+

+

+

+/**

+ * Test SCADomain.newInstance and invocation of a service.

+ * 

+ * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008) $

+ */

+public class ContributionFolderTestCase extends TestCase {

+

+    private SCADomain domain;

+    

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance("myDomain", "src/test/resources/repository2/folderWithJars", null );

+    }

+

+    public void testInvoke() throws Exception {

+        CalculatorService service = domain.getService(CalculatorService.class, "CalculatorServiceComponent");

+        assertEquals(3.0, service.add(1, 2));

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
new file mode 100644
index 0000000000..98bbe3935a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
@@ -0,0 +1,53 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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 junit.framework.TestCase;

+

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

+

+import calculator.CalculatorService;

+

+

+

+/**

+ * Test SCADomain.newInstance and invocation of a service.

+ * 

+ * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008) $

+ */

+public class ContributionZIPTestCase extends TestCase {

+

+    private SCADomain domain;

+    

+    @Override

+    protected void setUp() throws Exception {

+        domain = SCADomain.newInstance("myDomain", "src/test/resources/repository3/contribution.zip", null );

+    }

+

+    public void testInvoke() throws Exception {

+        CalculatorService service = domain.getService(CalculatorService.class, "CalculatorServiceComponent");

+        assertEquals(3.0, service.add(1, 2));

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        domain.close();

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
new file mode 100644
index 0000000000..a318cf50d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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;

+

+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.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
new file mode 100644
index 0000000000..ac88b2ac48
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" />

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

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

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

+    </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.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8b60ae590c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:sample="http://sample">

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

+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
new file mode 100644
index 0000000000..7e4a7132a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
new file mode 100644
index 0000000000..0e16e11b0b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
new file mode 100644
index 0000000000..b293aa4bcc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/pom.xml
new file mode 100644
index 0000000000..8d731c07d7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-export-composite</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Export</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
new file mode 100644
index 0000000000..e65422136f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
new file mode 100644
index 0000000000..5369c18497
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..3c14560a56
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
new file mode 100644
index 0000000000..636b7111d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
new file mode 100644
index 0000000000..72b77564d2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
@@ -0,0 +1,91 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/contribution-import-export/export-java/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/pom.xml
new file mode 100644
index 0000000000..85c50da029
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-export-java</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java Export</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..74d22ed830
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..dc33dfa560
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
new file mode 100644
index 0000000000..5a14b41650
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
@@ -0,0 +1,30 @@
+<?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.5.1/itest/contribution-import-export/export-resource/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/pom.xml
new file mode 100644
index 0000000000..8d5eb73174
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-export-resource</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Resource Export</name>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..f11eacb416
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
new file mode 100644
index 0000000000..1ff281373a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
@@ -0,0 +1,27 @@
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/export-wsdl/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/pom.xml
new file mode 100644
index 0000000000..1793d8e70a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-export-wsdl</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution WSDL Export</name>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b7394ec14b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
new file mode 100644
index 0000000000..9b31363e1a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
new file mode 100644
index 0000000000..d3c83b08c6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+   Licensed to the Apache Software Foundation (ASF) under one

+   or more contributor license agreements.  See the NOTICE file

+   distributed with this work for additional information

+   regarding copyright ownership.  The ASF licenses this file

+   to you under the Apache License, Version 2.0 (the

+   "License"); you may not use this file except in compliance

+   with the License.  You may obtain a copy of the License at

+   

+     http://www.apache.org/licenses/LICENSE-2.0

+     

+   Unless required by applicable law or agreed to in writing,

+   software distributed under the License is distributed on an

+   "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/import-composite/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/pom.xml
new file mode 100644
index 0000000000..35c0314f65
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-import-composite</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Import</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-export-composite</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..966f56d7d5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
new file mode 100644
index 0000000000..3d43290380
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
@@ -0,0 +1,46 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..74d22ed830
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..9f3f5be452
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
new file mode 100644
index 0000000000..9b31363e1a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
new file mode 100644
index 0000000000..d3c83b08c6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+   Licensed to the Apache Software Foundation (ASF) under one

+   or more contributor license agreements.  See the NOTICE file

+   distributed with this work for additional information

+   regarding copyright ownership.  The ASF licenses this file

+   to you under the Apache License, Version 2.0 (the

+   "License"); you may not use this file except in compliance

+   with the License.  You may obtain a copy of the License at

+   

+     http://www.apache.org/licenses/LICENSE-2.0

+     

+   Unless required by applicable law or agreed to in writing,

+   software distributed under the License is distributed on an

+   "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
new file mode 100644
index 0000000000..e2f852ff7e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
new file mode 100644
index 0000000000..1176a89143
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
@@ -0,0 +1,126 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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.5.1/itest/contribution-import-export/import-java/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/pom.xml
new file mode 100644
index 0000000000..32befa7498
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-import-java</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java Import</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-export-java</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..4cdcc1fd0b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..224e2c4d79
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
new file mode 100644
index 0000000000..9b650e4acc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
new file mode 100644
index 0000000000..431988cc04
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
@@ -0,0 +1,127 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/contribution-import-export/import-resource/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/pom.xml
new file mode 100644
index 0000000000..214231ba18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/pom.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-import-resource</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Resource Import</name>
+
+<dependencies>
+	
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-export-resource</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-resource</artifactId>
+            <version>1.5.1</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.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..ac6d7becb3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
new file mode 100644
index 0000000000..bb5a7b764f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
new file mode 100644
index 0000000000..1b7542b7d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/contribution-import-export/import-wsdl/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/pom.xml
new file mode 100644
index 0000000000..9b60834e53
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-import-wsdl</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution WSDL Import</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-export-wsdl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..4cdcc1fd0b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
new file mode 100644
index 0000000000..3d43290380
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
@@ -0,0 +1,46 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..74d22ed830
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..d46fe0b57c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
new file mode 100644
index 0000000000..5008a2ea5b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
new file mode 100644
index 0000000000..5c40606e50
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
@@ -0,0 +1,137 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/contribution-import-export/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/pom.xml
new file mode 100644
index 0000000000..76fedfafc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-import-export/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
new file mode 100644
index 0000000000..123c776499
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 30</name>
+    <packaging>ear</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
+            <version>1.5.1</version>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
+            <version>1.5.1</version>
+            <type>war</type>
+            <scope>provided</scope>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <modules>
+                        <jarModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId>
+                            <includeInApplicationXml>true</includeInApplicationXml>
+                            <bundleDir>/</bundleDir>
+                        </jarModule>
+                        <ejbModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
+                            <bundleDir>/</bundleDir>
+                        </ejbModule>
+                        <webModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
+                            <bundleDir>/</bundleDir>
+                        </webModule>
+                    </modules>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
new file mode 100644
index 0000000000..3b1555f567
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworldServiceComponent">
+        <implementation.ejb ejb-link="itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar#HelloworldServiceBean"/>
+        <service name="HelloworldService8">
+            <interface.java interface="sample.ejb3.HelloworldService8"/>
+            <binding.sca/>
+        </service>
+        <reference name="hwReference" target="HelloworldServiceJavaComponent"/>
+        <property name="hwProperty">EJB</property>
+    </component>
+    
+    <service name="TheService" promote="HelloworldServiceComponent/HelloworldService8"/>
+    
+    <reference name="TheReference" promote="HelloworldServiceComponent/hwReference"/>
+    
+    <component name="HelloworldServiceJavaComponent">
+        <implementation.java class="sample.java.HelloworldServiceJavaImpl"/>
+        <property name="hwProperty">Java</property>
+    </component>
+    
+    <service name="JavaService" promote="HelloworldServiceJavaComponent/HelloworldServiceJava"/>
+    
+    <reference name="JavaReference" promote="HelloworldServiceJavaComponent/hwReference"/>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
new file mode 100644
index 0000000000..fe71740c9c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 29</name>
+    <packaging>ear</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
+            <version>1.5.1</version>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
+            <version>1.5.1</version>
+            <type>war</type>
+            <scope>provided</scope>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <modules>
+                        <jarModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId>
+                            <includeInApplicationXml>true</includeInApplicationXml>
+                            <bundleDir>/</bundleDir>
+                        </jarModule>
+                        <ejbModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
+                            <bundleDir>/</bundleDir>
+                        </ejbModule>
+                        <webModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
+                            <bundleDir>/</bundleDir>
+                        </webModule>
+                    </modules>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
new file mode 100644
index 0000000000..b131d375b0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworldServiceComponent">
+        <implementation.ejb ejb-link="itest-contribution-jee-samples-08-ejb-enhanced.jar#HelloworldService8Bean"/>
+        <service name="HelloworldService8">
+            <interface.java interface="sample.ejb3.HelloworldService8"/>
+            <binding.sca/>
+        </service>
+        <reference name="hwReference" target="HelloworldServiceJavaComponent"/>
+        <property name="hwProperty">EJB</property>
+    </component>
+    
+    <component name="HelloworldServiceComponent2">
+        <implementation.ejb ejb-link="itest-contribution-jee-samples-08-ejb-enhanced.jar#HelloworldService8Bean"/>
+        <service name="HelloworldService8">
+            <interface.java interface="sample.ejb3.HelloworldService8"/>
+            <binding.sca/>
+        </service>
+        <reference name="hwReference" target="HelloworldServiceJavaComponent"/>
+        <property name="hwProperty">EJB</property>
+    </component>    
+    
+    <service name="TheService" promote="HelloworldServiceComponent/HelloworldService8"/>
+    
+    <reference name="TheReference" promote="HelloworldServiceComponent/hwReference"/>
+    
+    <service name="TheService2" promote="HelloworldServiceComponent2/HelloworldService8"/>
+    
+    <reference name="TheReference2" promote="HelloworldServiceComponent2/hwReference"/>
+    
+    <component name="HelloworldServiceJavaComponent">
+        <implementation.java class="sample.java.HelloworldServiceJavaImpl"/>
+        <property name="hwProperty">Java</property>
+    </component>
+    
+    <service name="JavaService" promote="HelloworldServiceJavaComponent/HelloworldServiceJava"/>
+    
+    <reference name="JavaReference" promote="HelloworldServiceJavaComponent/hwReference"/>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
new file mode 100644
index 0000000000..90872041b0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" />
+        <reference name="subtractService" target="SubtractServiceComponent" />
+        <reference name="multiplyService" target="MultiplyServiceComponent" />
+        <reference name="divideService" target="DivideServiceComponent" />
+    </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.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
new file mode 100644
index 0000000000..94795ab129
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-13-ear-nonenhanced</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 13</name>
+    <packaging>ear</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
+            <version>1.5.1</version>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
+            <version>1.5.1</version>
+            <type>war</type>
+            <scope>provided</scope>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <modules>
+                        <ejbModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
+                            <bundleDir>/</bundleDir>
+                        </ejbModule>
+                        <webModule>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
+                            <bundleDir>/</bundleDir>
+                        </webModule>
+                    </modules>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
new file mode 100644
index 0000000000..e7f7422a7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 12</name>
+    <packaging>ejb</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-ejb-plugin</artifactId>
+            <configuration>
+              <ejbVersion>3.0</ejbVersion>
+            </configuration>
+          </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
new file mode 100644
index 0000000000..ad9003dc67
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
@@ -0,0 +1,40 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Stateless;
+
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * HelloworldService EJB implementation with no SCA enhancement
+
+ */
+@Stateless
+public class HelloworldServiceBean implements HelloworldService {
+    
+    @Reference
+    protected HelloworldService nextService;
+
+    public String getGreetings(String name) {
+        String greeting = "Hello " + name;
+        System.out.println(greeting);
+        return greeting;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
new file mode 100644
index 0000000000..bcaa154913
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworldServiceComponent">
+        <implementation.ejb ejb-link="HelloworldServiceBean"/>
+        <service name="HelloworldService">
+            <interface.java interface="sample.ejb3.HelloworldService"/>
+            <binding.sca/>
+        </service>
+    </component>
+    
+    <service name="TheService" promote="HelloworldServiceComponent/HelloworldService"/>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
new file mode 100644
index 0000000000..9a97cbd535
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"src/main/resources/META-INF/application.xml"
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<ejb:openejb-jar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>test</dep:groupId>
+            <dep:artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</dep:artifactId>
+            <dep:version>1.0</dep:version>
+            <dep:type>jar</dep:type>
+        </dep:moduleId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
+</ejb:openejb-jar>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
new file mode 100644
index 0000000000..10aa2d8127
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 08</name>
+    <packaging>ejb</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-ejb-plugin</artifactId>
+            <configuration>
+              <ejbVersion>3.0</ejbVersion>
+            </configuration>
+          </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
new file mode 100644
index 0000000000..b5224a2319
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Local;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Local
+public interface HelloworldLocal8 {
+	String getGreetingsLocal(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
new file mode 100644
index 0000000000..e5e9fe6a82
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService8 {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
new file mode 100644
index 0000000000..a6d7f2dd04
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
@@ -0,0 +1,50 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Stateless;
+
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * HelloworldService EJB implementation  SCA enhancement
+
+ */
+@Stateless
+public class HelloworldService8Bean implements HelloworldService8, HelloworldLocal8 {
+    
+    @Reference
+    protected HelloworldService8 hwReference;
+    
+    @Property 
+    protected String hwProperty;
+
+    public String getGreetings(String name) {
+        String greeting = "Hello remote " + name;
+        System.out.println(greeting);
+        return greeting;
+    }
+    
+    public String getGreetingsLocal(String name) {
+        String greeting = "Hello local " + name;
+        System.out.println(greeting);
+        return greeting;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
new file mode 100644
index 0000000000..db36c4b140
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"src/main/resources/META-INF/application.xml"
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<ejb:openejb-jar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>test</dep:groupId>
+            <dep:artifactId>itest-contribution-jee-samples-08-ejb-enhanced</dep:artifactId>
+            <dep:version>1.0</dep:version>
+            <dep:type>jar</dep:type>
+        </dep:moduleId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
+</ejb:openejb-jar>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
new file mode 100644
index 0000000000..90872041b0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" />
+        <reference name="subtractService" target="SubtractServiceComponent" />
+        <reference name="multiplyService" target="MultiplyServiceComponent" />
+        <reference name="divideService" target="DivideServiceComponent" />
+    </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.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
new file mode 100644
index 0000000000..506652388d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 07</name>
+    <packaging>ejb</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-ejb-plugin</artifactId>
+            <configuration>
+              <ejbVersion>3.0</ejbVersion>
+            </configuration>
+          </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
new file mode 100644
index 0000000000..4df5cd37de
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Local;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Local
+public interface HelloworldLocal7 {
+	String getGreetingsLocal(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
new file mode 100644
index 0000000000..41ecddb62e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService7 {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
new file mode 100644
index 0000000000..403ead623c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
@@ -0,0 +1,41 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Stateless;
+
+/**
+ * HelloworldService EJB implementation with no SCA enhancement
+
+ */
+@Stateless
+public class HelloworldService7Bean implements HelloworldService7, HelloworldLocal7 {
+
+    public String getGreetings(String name) {
+        String greeting = "Hello remote " + name;
+        System.out.println(greeting);
+        return greeting;
+    }
+    
+    public String getGreetingsLocal(String name) {
+        String greeting = "Hello local " + name;
+        System.out.println(greeting);
+        return greeting;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
new file mode 100644
index 0000000000..97242bff96
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
@@ -0,0 +1,41 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Stateless;
+
+/**
+ * Another HelloworldService EJB implementation with no SCA enhancement
+ * A test for TUSCANY-3198
+ */
+@Stateless
+public class HelloworldService7aBean implements HelloworldService7, HelloworldLocal7 {
+
+    public String getGreetings(String name) {
+        String greeting = "Hello remote " + name;
+        System.out.println(greeting);
+        return greeting;
+    }
+    
+    public String getGreetingsLocal(String name) {
+        String greeting = "Hello local " + name;
+        System.out.println(greeting);
+        return greeting;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
new file mode 100644
index 0000000000..7428735903
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"src/main/resources/META-INF/application.xml"
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<ejb:openejb-jar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>test</dep:groupId>
+            <dep:artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</dep:artifactId>
+            <dep:version>1.0</dep:version>
+            <dep:type>jar</dep:type>
+        </dep:moduleId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
+</ejb:openejb-jar>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml
new file mode 100644
index 0000000000..0e7836ceb1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 00</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>2.2</version>
+            <configuration>
+              <archive>
+                <manifest>
+                    <mainClass>sample.java.JarMain</mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+          </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
new file mode 100644
index 0000000000..5a08769550
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.java;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remotable
+public interface HelloworldServiceJava {    
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
new file mode 100644
index 0000000000..265af5b3a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
@@ -0,0 +1,36 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES 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.java;
+
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+
+public class HelloworldServiceJavaImpl implements HelloworldServiceJava {
+    
+    @Reference
+    protected HelloworldServiceJava hwReference;
+    
+    @Property 
+    protected String hwProperty;
+
+    public String getGreetings(String name) {
+        String greeting = hwReference.getGreetings(name) + " " + hwProperty;
+        System.out.println(greeting);
+        return greeting;
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
new file mode 100644
index 0000000000..81793e47e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
@@ -0,0 +1,24 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES 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.java;
+
+public class JarMain {
+
+    public static void main(String[] args) {
+        System.out.println("JarMain called");
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/pom.xml
new file mode 100644
index 0000000000..6ab28e497d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples</name>
+
+    <packaging>pom</packaging>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>jar-shared</module>
+                <module>war-nonenhanced</module>
+                <module>war-appcomp-contrib-implicit</module>
+                <module>ejb-nonenhanced</module>
+                <module>ejb-enhanced</module>
+                <module>ejb-appcomp-contrib-implicit</module>
+                <module>ear-nonenhanced</module>
+                <module>ear-appcomp-contrib-implicit</module>
+                <module>ear-appcomp-contrib-implicit-war-appcomp</module>
+                <module>scajar-ear-nonenhanced</module>
+                <module>scajar-ear-appcomp</module>
+                <module>scajar-ear-appcomp-war-appcomp</module>
+                <module>scazip-ejb-appcomp</module>
+                <module>scazip-war-appcomp</module>
+            </modules>
+        </profile>
+    </profiles>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
new file mode 100644
index 0000000000..302a758784
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 43</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.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
new file mode 100644
index 0000000000..1fad282a75
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.java;
+
+import org.osoa.sca.annotations.Remotable;
+
+
+@Remotable
+public interface HelloworldServiceJava {    
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
new file mode 100644
index 0000000000..8adb6a5995
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+public interface HelloworldClient2 {
+
+    String getGreetings(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
new file mode 100644
index 0000000000..ae16263505
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+import sample.java.HelloworldServiceJava;
+
+public class HelloworldClient2Impl implements HelloworldClient2 {
+    
+    @Reference
+    protected HelloworldService hwService;
+    
+    @Reference 
+    protected HelloworldServiceJava hwJavaService;
+
+    public String getGreetings(String name){
+        //return hwService.getGreetings(name) + hwJavaService.getGreetings(name);
+        return hwJavaService.getGreetings(name);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
new file mode 100644
index 0000000000..05885cead7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+import sample.java.HelloworldServiceJava;
+
+public class HelloworldTargetImpl implements HelloworldServiceJava {
+
+    public String getGreetings(String name){
+        return "Hello " + name;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..e9346fb2bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworldClientComponent">
+		<implementation.java class="sample.pojo.HelloworldClient2Impl"/>
+        <reference name="hwService" target="HelloworldServiceComponent/TheService" />
+        <reference name="hwJavaService" target="HelloworldServiceComponent/JavaService" />
+    </component>
+
+    <component name="HelloworldServiceComponent">
+        <implementation.jee archive="itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear"/>
+        <reference name="JavaReference" target="HelloworldTargetComponent"/>
+    </component>
+    
+    <component name="HelloworldTargetComponent">
+        <implementation.java class="sample.pojo.HelloworldTargetImpl"/>
+    </component>    
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
new file mode 100644
index 0000000000..718a745068
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-jee-samples-41-scajar-ear-appcomp</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 41</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.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
new file mode 100644
index 0000000000..1fad282a75
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.java;
+
+import org.osoa.sca.annotations.Remotable;
+
+
+@Remotable
+public interface HelloworldServiceJava {    
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
new file mode 100644
index 0000000000..8adb6a5995
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+public interface HelloworldClient2 {
+
+    String getGreetings(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
new file mode 100644
index 0000000000..ae16263505
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+import sample.java.HelloworldServiceJava;
+
+public class HelloworldClient2Impl implements HelloworldClient2 {
+    
+    @Reference
+    protected HelloworldService hwService;
+    
+    @Reference 
+    protected HelloworldServiceJava hwJavaService;
+
+    public String getGreetings(String name){
+        //return hwService.getGreetings(name) + hwJavaService.getGreetings(name);
+        return hwJavaService.getGreetings(name);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
new file mode 100644
index 0000000000..05885cead7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+import sample.java.HelloworldServiceJava;
+
+public class HelloworldTargetImpl implements HelloworldServiceJava {
+
+    public String getGreetings(String name){
+        return "Hello " + name;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..ebd8377725
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworldClientComponent">
+		<implementation.java class="sample.pojo.HelloworldClient2Impl"/>
+        <reference name="hwService" target="HelloworldServiceComponent/TheService" />
+        <reference name="hwJavaService" target="HelloworldServiceComponent/JavaService" />
+    </component>
+
+    <component name="HelloworldServiceComponent">
+        <implementation.jee archive="itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear"/>
+        <reference name="JavaReference" target="HelloworldTargetComponent"/>
+    </component>
+    
+    <component name="HelloworldTargetComponent">
+        <implementation.java class="sample.pojo.HelloworldTargetImpl"/>
+    </component>    
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
new file mode 100644
index 0000000000..c29d0c58ce
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-jee-samples-35-scajar-ear-nonenhanced</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 35</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.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
new file mode 100644
index 0000000000..6f37c9b272
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+public interface HelloworldClient {
+
+    String getGreetings(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
new file mode 100644
index 0000000000..a38c4a773f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+
+public class HelloworldClientImpl implements HelloworldClient {
+    
+    @Reference
+    protected HelloworldService hwService;
+
+    public String getGreetings(String name){
+        return hwService.getGreetings(name);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..79c9dd3243
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworlClientComponent">
+		<implementation.java class="sample.pojo.HelloworldClientImpl"/>
+        <reference name="hwService" target="HelloworldServiceComponent/HelloworldService7Bean_HelloworldService7" />
+    </component>
+
+    <component name="HelloworldServiceComponent">
+        <implementation.jee archive="itest-contribution-jee-samples-13-ear-nonenhanced.ear"/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
new file mode 100644
index 0000000000..bdbe79a46d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
@@ -0,0 +1,24 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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="copy-jar-to-zip" default="copy"> 
+    <target name="copy"> 
+        <copy file="${from.file}" 
+              toFile="${to.file}"/>
+    </target>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
new file mode 100644
index 0000000000..67241cc12e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-jee-samples-10-scazip-ejb-appcomp</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 10</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.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
+            <version>1.5.1</version>
+            <type>ejb</type>
+        </dependency>   
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.tuscany.sca</groupId>
+                                    <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
+                                    <version>${project.version}</version>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>copy-jar-to-zip</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <property name="from.file" value="target/${artifactId}.jar"/>
+                                <property name="to.file" value="target/${artifactId}.zip"/>
+                                <ant antfile="./build.xml" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
new file mode 100644
index 0000000000..6f37c9b272
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+public interface HelloworldClient {
+
+    String getGreetings(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
new file mode 100644
index 0000000000..a38c4a773f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+
+public class HelloworldClientImpl implements HelloworldClient {
+    
+    @Reference
+    protected HelloworldService hwService;
+
+    public String getGreetings(String name){
+        return hwService.getGreetings(name);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..909b8a1484
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworlClientComponent">
+		<implementation.java class="sample.pojo.HelloworldClientImpl"/>
+        <reference name="hwService" target="HelloworldServiceComponent/HelloworldServiceBean_HelloworldService" />
+    </component>
+
+    <component name="HelloworldServiceComponent">
+        <implementation.jee archive="itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar"/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
new file mode 100644
index 0000000000..bdbe79a46d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
@@ -0,0 +1,24 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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="copy-jar-to-zip" default="copy"> 
+    <target name="copy"> 
+        <copy file="${from.file}" 
+              toFile="${to.file}"/>
+    </target>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
new file mode 100644
index 0000000000..f88d68876d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-jee-samples-04-scazip-war-appcomp</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 04</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.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
+            <version>1.5.1</version>
+            <type>war</type>
+        </dependency>  
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.tuscany.sca</groupId>
+                                    <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>copy-jar-to-zip</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <property name="from.file" value="target/${artifactId}.jar"/>
+                                <property name="to.file" value="target/${artifactId}.zip"/>
+                                <ant antfile="./build.xml" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
new file mode 100644
index 0000000000..6f37c9b272
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+public interface HelloworldClient {
+
+    String getGreetings(String name);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
new file mode 100644
index 0000000000..a38c4a773f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.pojo;
+
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+
+public class HelloworldClientImpl implements HelloworldClient {
+    
+    @Reference
+    protected HelloworldService hwService;
+
+    public String getGreetings(String name){
+        return hwService.getGreetings(name);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..eaa567595e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloworldServiceComponent">
+        <implementation.jee archive="itest-contribution-jee-samples-6-war-appcomp-contrib-implicit.jar"/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
new file mode 100644
index 0000000000..f5295b7388
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 06</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
new file mode 100644
index 0000000000..ae8613f8db
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 java.io.IOException;
+import java.io.Writer;
+
+import javax.ejb.EJB;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+
+/**
+ * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class HelloworldEjbServlet extends HttpServlet {
+	private static final long serialVersionUID = -4448818871934180718L;
+
+	@EJB
+    private HelloworldService service;
+
+    @Reference
+    protected HelloworldService helloworldSca;
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        String name = request.getParameter("name");
+        String greeting = service.getGreetings(name);
+        String greeting2 = helloworldSca.getGreetings(name.toUpperCase());
+
+        Writer out = response.getWriter();
+        out.write("<html><head><title>Apache Tuscany Helloworld Web Sample</title></head><body>");
+        out.write("<h2>Apache Tuscany Helloworld Web Sample</h2>");
+        out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB.");
+        out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name);
+        out.write(greeting);
+        out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean");
+        out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase());
+        out.write(greeting2);
+        out.write("</body></html>");
+        out.flush();
+        out.close();
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..2563c8b7c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  * 
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.    
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+  <environment>
+    <moduleId>
+      <groupId>test</groupId>
+      <artifactId>helloworld-web</artifactId>
+      <version>1.0</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>test</groupId>
+        <artifactId>helloworld-ejb</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+      </dependency>
+    </dependencies>
+    <hidden-classes />
+    <non-overridable-classes />
+  </environment>
+  <context-root>helloworld-web</context-root>
+  <nam:ejb-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+    <nam:ref-name>ejb/HelloworldServiceBean</nam:ref-name>
+    <nam:pattern>
+      <nam:groupId>test</nam:groupId>
+      <nam:artifactId>helloworld-ejb</nam:artifactId>
+      <nam:version>1.0</nam:version>
+      <nam:name>HelloworldServiceBean</nam:name>
+    </nam:pattern>
+  </nam:ejb-ref>
+</web-app>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..823085e81f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:xsd="http://www.w3.org/2001/XMLSchema"
+           name="Helloworld-web">
+
+    <component name="HelloworldWebComponent">
+        <implementation.java class="sample.HelloworldEjbServlet"/>
+        <reference name="helloworldSca">
+            <interface.java interface="sample.ejb3.HelloworldService"/>
+            <binding.sca uri="http://localhost:8080/SomeService"/>
+        </reference>
+    </component>
+    
+    <reference name="helloworldSca" promote="HelloworldWebComponent/helloworldSca"/>
+
+</composite>
+
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..628588a974
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  * 
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.    
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+  <display-name>Helloworld Web Sample</display-name>
+
+  <servlet>
+     <servlet-name>HelloworldEjbServlet</servlet-name>
+     <servlet-class>sample.HelloworldEjbServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+     <servlet-name>HelloworldEjbServlet</servlet-name>
+     <url-pattern>/HelloworldEjbServlet</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>hello.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
new file mode 100644
index 0000000000..69473543c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
@@ -0,0 +1,50 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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>Apache Tuscany Helloworld Web Sample</title>
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Web Sample</h2>
+
+This web page posts the data to <b>HelloworldEjbServlet</b>. The servlet invokes <b>HelloworldServiceBean</b>, which is a Stateless EJB.
+The EJB in turn invokes <b>Helloworld</b> SCA service through proxies injected into EJB fields.
+
+<br/><br/>
+
+<form action="HelloworldEjbServlet" method="post">
+    <table>
+        <tr>
+            <td>Enter your name:</td>
+            <td>
+                <input type="text" name="name" width="10">
+            </td>
+        </tr>
+        <tr>
+            <td align="left" colspan="2">
+                <button name="submit" type="submit">getGreeting</button>
+            </td>
+        </tr>
+    </table>
+</form>
+</body>
+</html>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
new file mode 100644
index 0000000000..aa14813a14
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-contribution-jee-samples</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE Samples 01</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
new file mode 100644
index 0000000000..71055bbdfe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 java.io.IOException;
+import java.io.Writer;
+
+import javax.ejb.EJB;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+
+/**
+ * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class HelloworldEjbServlet extends HttpServlet {
+	private static final long serialVersionUID = -4448818871934180718L;
+
+	@EJB
+    private HelloworldService service;
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        String name = request.getParameter("name");
+        String greeting = service.getGreetings(name);
+        //String greeting2 = helloworldSca.getGreetings(name.toUpperCase());
+
+        Writer out = response.getWriter();
+        out.write("<html><head><title>Apache Tuscany Helloworld Web Sample</title></head><body>");
+        out.write("<h2>Apache Tuscany Helloworld Web Sample</h2>");
+        out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB.");
+        out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name);
+        out.write(greeting);
+        out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean");
+        out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase());
+        //out.write(greeting2);
+        out.write("</body></html>");
+        out.flush();
+        out.close();
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..0194d1870c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * HelloworldService EJB interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..2563c8b7c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  * 
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.    
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+  <environment>
+    <moduleId>
+      <groupId>test</groupId>
+      <artifactId>helloworld-web</artifactId>
+      <version>1.0</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>test</groupId>
+        <artifactId>helloworld-ejb</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+      </dependency>
+    </dependencies>
+    <hidden-classes />
+    <non-overridable-classes />
+  </environment>
+  <context-root>helloworld-web</context-root>
+  <nam:ejb-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+    <nam:ref-name>ejb/HelloworldServiceBean</nam:ref-name>
+    <nam:pattern>
+      <nam:groupId>test</nam:groupId>
+      <nam:artifactId>helloworld-ejb</nam:artifactId>
+      <nam:version>1.0</nam:version>
+      <nam:name>HelloworldServiceBean</nam:name>
+    </nam:pattern>
+  </nam:ejb-ref>
+</web-app>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..628588a974
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  * 
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.    
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+  <display-name>Helloworld Web Sample</display-name>
+
+  <servlet>
+     <servlet-name>HelloworldEjbServlet</servlet-name>
+     <servlet-class>sample.HelloworldEjbServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+     <servlet-name>HelloworldEjbServlet</servlet-name>
+     <url-pattern>/HelloworldEjbServlet</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>hello.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
new file mode 100644
index 0000000000..69473543c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
@@ -0,0 +1,50 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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>Apache Tuscany Helloworld Web Sample</title>
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Web Sample</h2>
+
+This web page posts the data to <b>HelloworldEjbServlet</b>. The servlet invokes <b>HelloworldServiceBean</b>, which is a Stateless EJB.
+The EJB in turn invokes <b>Helloworld</b> SCA service through proxies injected into EJB fields.
+
+<br/><br/>
+
+<form action="HelloworldEjbServlet" method="post">
+    <table>
+        <tr>
+            <td>Enter your name:</td>
+            <td>
+                <input type="text" name="name" width="10">
+            </td>
+        </tr>
+        <tr>
+            <td align="left" colspan="2">
+                <button name="submit" type="submit">getGreeting</button>
+            </td>
+        </tr>
+    </table>
+</form>
+</body>
+</html>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee/pom.xml
new file mode 100644
index 0000000000..7f245e2da5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/pom.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-jee</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution Java EE</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-jee-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-ejb</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-jee</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-impl</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_1.0_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        
+        <!-- the sample war, jar and ear files that are used to test JEE contribution processing -->
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
+            <version>1.5.1</version>
+            <type>war</type>
+        </dependency>
+                
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
+            <version>1.5.1</version>
+            <type>war</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
+            <version>1.5.1</version>
+            <type>ejb</type>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
+            <version>1.5.1</version>
+            <type>ejb</type>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
+            <version>1.5.1</version>
+            <type>ejb</type>
+        </dependency>       
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-13-ear-nonenhanced</artifactId>
+            <version>1.5.1</version>
+            <type>ear</type>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit</artifactId>
+            <version>1.5.1</version>
+            <type>ear</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-35-scajar-ear-nonenhanced</artifactId>
+            <version>1.5.1</version>
+            <type>jar</type>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-contribution-jee-samples-41-scajar-ear-appcomp</artifactId>
+            <version>1.5.1</version>
+            <type>jar</type>
+        </dependency>
+                        
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
new file mode 100644
index 0000000000..e7e1d90797
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ImplementationProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+
+class TestEJBImplementationProvider implements ImplementationProvider {
+    
+    TestEJBImplementationProvider(RuntimeComponent component, EJBImplementation ejbImplementation) {
+    }
+
+    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
+        return null;
+    }
+    
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+    public void start() {
+    }
+
+    public void stop() {
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
new file mode 100644
index 0000000000..4660fee7fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.provider.ImplementationProvider;
+import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+
+/**
+ * A factory for resource implementation providers.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestEJBImplementationProviderFactory implements ImplementationProviderFactory<EJBImplementation> {
+
+    /**
+     * Constructs a resource implementation.
+     */
+    public TestEJBImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
+    }
+
+    public ImplementationProvider createImplementationProvider(RuntimeComponent component, EJBImplementation implementation) {
+        return new TestEJBImplementationProvider(component, implementation);
+    }
+    
+    public Class<EJBImplementation> getModelType() {
+        return EJBImplementation.class;
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
new file mode 100644
index 0000000000..34bf3702d3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+
+public class TestExternalEarModelResolver implements ModelResolver {
+
+    private Map<URI, ExternalEarInfo> map = new HashMap<URI, ExternalEarInfo>();
+    private JavaEEIntrospector jeeIntrospector;
+    private ContributionService contributionService;
+    
+    
+    public TestExternalEarModelResolver(Contribution contribution, ExtensionPointRegistry extensionPoints) {
+       jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class);
+       UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+       contributionService = utilities.getUtility(ContributionService.class);
+
+    }
+        
+    public void addModel(Object resolved) {
+        ExternalEarInfo jeeApp = (ExternalEarInfo)resolved;
+        map.put(jeeApp.getAppInfo().getUri(), jeeApp);
+    }
+
+    public Object removeModel(Object resolved) {
+        return map.remove(((ExternalEarInfo)resolved).getAppInfo().getUri());
+    }
+
+    public <T> T resolveModel(final Class<T> modelClass, T unresolved) {
+        URI uri = ((ExternalEarInfo)unresolved).getAppInfo().getUri();
+        if (uri != null) {
+            ExternalEarInfo resolved = (ExternalEarInfo) map.get(uri);
+            if (resolved != null) {
+                return modelClass.cast(resolved);
+            } else {
+                // if you don't care about application composites you can 
+                // simply read the EAR directly
+                /*                
+                try {
+                    File f = new File(uri.toString());
+                    final JavaEEApplicationInfo o = jeeIntrospector.introspectJeeArchive(f.toURI().toURL());
+                    return (T)new ExternalEarInfo() {
+                        public JavaEEApplicationInfo getAppInfo() {
+                            return (JavaEEApplicationInfo)o;
+                        }
+                    };
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                */
+                
+                // if you do care about the application composite you
+                // need to process the ear as a contribution 
+                try{
+                    // find the location of the ear using a very specific algorithm 
+                    URL earLocation = null;
+                    if ( uri.toString().equals("itest-contribution-jee-samples-13-ear-nonenhanced.ear")){                       
+                        earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL();
+                    } else if ( uri.toString().equals("itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear")){                       
+                        earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit/target/itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear").toURL();
+                    } else if ( uri.toString().equals("itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear")){                       
+                        earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/target/itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear").toURL();                        
+                    } else {
+                        return unresolved;
+                    }
+                    
+                    // if you do care about application composites we have 
+                    // to process the EAR as a contribution
+                    Contribution contribution = contributionService.contribute(uri.toString(), earLocation, false);
+                    
+                    JavaEEApplicationInfo appInfo = null;
+                    Composite appComposite = null;
+                    
+                    // get the ear info 
+                    for (Artifact artifact : contribution.getArtifacts()){
+                        if (artifact.getModel() instanceof JavaEEApplicationInfo){
+                            appInfo = (JavaEEApplicationInfo)artifact.getModel();
+                        }
+                        
+                        if (artifact.getURI().equals("META-INF/application.composite")){
+                            appComposite = (Composite)artifact.getModel();
+                        }
+                    }
+                                       
+                    
+                    final JavaEEApplicationInfo returnAppInfo = appInfo;
+                    final Composite returnAppComposite = appComposite;
+                    
+                    return (T)new ExternalEarInfo() {
+                        public JavaEEApplicationInfo getAppInfo() {
+                            return returnAppInfo;
+                        }
+                        public Composite getAppComposite() {
+                            return returnAppComposite;
+                        }                        
+                    };
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+        return unresolved;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
new file mode 100644
index 0000000000..a39171507c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License. 

+

+org.apache.tuscany.sca.test.contribution.jee.TestExternalEarModelResolver;model=org.apache.tuscany.sca.contribution.jee.ExternalEarInfo

diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
new file mode 100644
index 0000000000..adc93d9015
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT 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 implementation extension

+org.apache.tuscany.sca.test.contribution.jee.TestEJBImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.ejb.EJBImplementation

diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
new file mode 100644
index 0000000000..b81f67c287
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
@@ -0,0 +1,329 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+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.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * This is an integration test for Java EE contribution processing. *
+ * 
+ * @version $Rev$ $Date$
+ */
+
+public class ContributionServiceTestCase {
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+    private static final String CONTRIBUTION_002_ID = "contribution002/";
+    private static final String JAR_CONTRIBUTION = "/repository/helloworld-service.jar";
+    private static final String EJB_JAR_CONTRIBUTION = "/repository/helloworld-ejb.jar";
+    private static final String EJB_JAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-ejb-w-dep.jar";
+    private static final String WAR_CONTRIBUTION = "/repository/helloworld-web.war";
+    private static final String WAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-web-w-dep.war";
+    private static final String EAR_CONTRIBUTION = "/repository/helloworld-ejb.ear";
+    private static final String EAR_NONENHANCED_CONTRIBUTION = "/repository/simple-app-ear.jar";
+    private static final String EAR_ENHANCED_16_CONTRIBUTION = "/repository/simple-app.ear";
+    private static final String EAR_ENHANCED_19_CONTRIBUTION = "/repository/enhanced-app.ear";
+ 
+
+    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
+     */
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * This method tests a non Java EE contribution.
+     */
+    @Test
+    public void testContributeJAR() throws Exception {
+        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Assert.assertNotNull(contributionService.getContribution(contributionId));
+    }
+
+    /**
+     * This method tests an EJB jar as a contribution.
+     */
+    @Test
+    public void testContributeEJBJAR() throws Exception {
+        URL contributionLocation = getClass().getResource(EJB_JAR_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Assert.assertNotNull(contributionService.getContribution(contributionId));
+
+        Contribution contribution = contributionService.getContribution(contributionId);
+        List<Artifact> artifacts = contribution.getArtifacts();
+        for(Artifact artifact : artifacts) {
+            if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) {
+                Composite composite = (Composite)artifact.getModel();
+                Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+                Component component = composite.getComponents().get(0);
+                Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation);
+                EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation();
+                Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size());
+                Service service = ejbImpl.getServices().get(0);
+                Assert.assertEquals("Service name", "HelloworldService", service.getName());
+            }
+        }
+    }
+
+    /**
+     * This method tests an EJB jar with sca-contribution.xml as a contribution.
+     */
+    @Test
+    public void testContributeEJBJARwDeployable() throws Exception {
+        URL contributionLocation = getClass().getResource(EJB_JAR_W_DEPLOYABLE_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Assert.assertNotNull(contributionService.getContribution(contributionId));
+
+        Contribution contribution = contributionService.getContribution(contributionId);
+        List<Artifact> artifacts = contribution.getArtifacts();
+        for(Artifact artifact : artifacts) {
+            if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) {
+                Composite composite = (Composite)artifact.getModel();
+                Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+                Component component = composite.getComponents().get(0);
+                Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation);
+                EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation();
+                Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size());
+                Service service = ejbImpl.getServices().get(0);
+                Assert.assertEquals("Service name", "HelloworldService", service.getName());
+            }
+        }
+        
+        List<Composite> deployables = contribution.getDeployables();
+        Assert.assertEquals("Deployable composites", 1, deployables.size());
+        Composite composite = deployables.get(0);
+        Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+        Component component = composite.getComponents().get(0);
+        Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation);
+        EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation();
+        Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size());
+        Service service = ejbImpl.getServices().get(0);
+        Assert.assertEquals("Service name", "HelloworldService", service.getName());
+    }
+
+    /**
+     * This method tests WAR as a contribution.
+     */
+    @Test
+    public void testContributeWAR() throws Exception {
+        URL contributionLocation = getClass().getResource(WAR_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Assert.assertNotNull(contributionService.getContribution(contributionId));
+
+        Contribution contribution = contributionService.getContribution(contributionId);
+        List<Artifact> artifacts = contribution.getArtifacts();
+        for(Artifact artifact : artifacts) {
+            if(artifact.getURI().toString().equals("WEB-INF/web.composite")) {
+                Composite composite = (Composite)artifact.getModel();
+                Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+                Component component = composite.getComponents().get(0);
+                Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation);
+                WebImplementation webImpl = (WebImplementation) component.getImplementation();
+                Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size());
+                List<String> referenceNames = new ArrayList<String>();
+                referenceNames.add("name1");
+                referenceNames.add("sample.HelloworldEjbServlet_service");
+                for(Reference ref : webImpl.getReferences()) {
+                    Assert.assertTrue(referenceNames.contains(ref.getName()));
+                }
+            }
+        }
+    }
+
+    /**
+     * This method tests WAR with sca-contribution.xml as a contribution.
+     */
+    @Test
+    public void testContributeWARwDeployable() throws Exception {
+        URL contributionLocation = getClass().getResource(WAR_W_DEPLOYABLE_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Assert.assertNotNull(contributionService.getContribution(contributionId));
+
+        Contribution contribution = contributionService.getContribution(contributionId);
+        List<Artifact> artifacts = contribution.getArtifacts();
+        for(Artifact artifact : artifacts) {
+            if(artifact.getURI().toString().equals("WEB-INF/web.composite")) {
+                Composite composite = (Composite)artifact.getModel();
+                Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+                Component component = composite.getComponents().get(0);
+                Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation);
+                WebImplementation webImpl = (WebImplementation) component.getImplementation();
+                Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size());
+                List<String> referenceNames = new ArrayList<String>();
+                referenceNames.add("name1");
+                referenceNames.add("sample.HelloworldEjbServlet_service");
+                for(Reference ref : webImpl.getReferences()) {
+                    Assert.assertTrue(referenceNames.contains(ref.getName()));
+                }
+            }
+        }
+        
+        List<Composite> deployables = contribution.getDeployables();
+        Assert.assertEquals("Deployable composites", 1, deployables.size());
+        Composite composite = deployables.get(0);
+        Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+        Component component = composite.getComponents().get(0);
+        Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation);
+        WebImplementation webImpl = (WebImplementation) component.getImplementation();
+        Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size());
+        List<String> referenceNames = new ArrayList<String>();
+        referenceNames.add("name1");
+        referenceNames.add("sample.HelloworldEjbServlet_service");
+        for(Reference ref : webImpl.getReferences()) {
+            Assert.assertTrue(referenceNames.contains(ref.getName()));
+        }
+    }
+
+    /**
+     * This method test EAR as a contribution.
+     */
+    @Test
+    public void testContributeEAR() throws Exception {
+        URL contributionLocation = getClass().getResource(EAR_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Assert.assertNotNull(contributionService.getContribution(contributionId));
+    }
+
+    /**
+     * This method tests a JAR containing an EAR as a contribution.
+     * non-enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR.
+     */
+    @Ignore
+    @Test
+    public void testContributeEAR_NonEnhanced() throws Exception {
+        URL contributionLocation = getClass().getResource(EAR_NONENHANCED_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Contribution contribution = contributionService.getContribution(contributionId);
+        Assert.assertNotNull(contribution);
+        List<Composite> deployables = contribution.getDeployables();
+        Assert.assertEquals("Deployable composites", 1, deployables.size());
+        Composite composite = deployables.get(0);
+        Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+        Component component = composite.getComponents().get(0);
+        Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation);
+        JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation();
+        Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size());
+        Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size());
+    }
+
+    /**
+     * This method tests an EAR as a contribution.
+     * Enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR.
+     */
+    @Test
+    public void testContributeEAR_Enhanced16() throws Exception {
+        URL contributionLocation = getClass().getResource(EAR_ENHANCED_16_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Contribution contribution = contributionService.getContribution(contributionId);
+        Assert.assertNotNull(contribution);
+        List<Composite> deployables = contribution.getDeployables();
+        Assert.assertEquals("Deployable composites", 1, deployables.size());
+        Composite composite = deployables.get(0);
+        Assert.assertEquals("Number of components", 1, composite.getComponents().size());
+        Component component = composite.getComponents().get(0);
+        Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation);
+        JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation();
+        Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size());
+      // TODO - TUSCANY-3008
+      //  Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size());
+    }
+
+    /**
+     * This method tests an EAR as a contribution.
+     * Enhanced EAR w application composite containing non-enhanced WAR, non-enhanced EJB JAR.
+     */
+    @Test
+    public void testContributeEAR_Enhanced19() throws Exception {
+        URL contributionLocation = getClass().getResource(EAR_ENHANCED_19_CONTRIBUTION);
+        String contributionId = CONTRIBUTION_001_ID;
+        contributionService.contribute(contributionId, contributionLocation, false);
+        Contribution contribution = contributionService.getContribution(contributionId);
+        Assert.assertNotNull(contribution);
+
+        List<Artifact> artifacts = contribution.getArtifacts();
+        for(Artifact artifact : artifacts) {
+            if(artifact.getURI().toString().equals("META-INF/application.composite")) {
+                Composite composite = (Composite)artifact.getModel();
+                Assert.assertEquals("Number of components", 3, composite.getComponents().size());
+                for(Component component : composite.getComponents()) {
+                    if(component.getName().equals("webComponent")) {
+                        Assert.assertTrue(component.getImplementation() instanceof WebImplementation);
+                        WebImplementation webImpl = (WebImplementation)component.getImplementation();
+                        Assert.assertEquals("Number of references", 1, webImpl.getReferences().size());
+                    } else if(component.getName().equals("ejbComponent1")) {
+                        Assert.assertTrue(component.getImplementation() instanceof EJBImplementation);
+                        EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation();
+                        Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size());
+                        Assert.assertEquals("Number of references", 0, ejbImpl.getReferences().size());
+                    } else if(component.getName().equals("ejbComponent2")) {
+                        Assert.assertTrue(component.getImplementation() instanceof EJBImplementation);
+                        EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation();
+                        Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size());
+                        Assert.assertEquals("Number of references", 1, ejbImpl.getReferences().size());
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
new file mode 100644
index 0000000000..4241b7928f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+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.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+public class EjbAppcompTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private ContributionService contributionService;
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * EJB         - It's an JEE EAR file that is a contribution
+     *    appcomp  - It has an application composite in it
+     *    
+     */
+    @Test
+    public void testEjbAppcom() throws Exception {
+
+        URL contributionLocation = new File("../contribution-jee-samples/ejb-appcomp-contrib-implicit/target/itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar").toURL();
+        Contribution contribution =  contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
+        
+        Assert.assertNotNull(contribution);
+        
+        Composite composite = null;
+        for (Artifact artifact : contribution.getArtifacts()){
+            if (artifact.getModel() instanceof Composite){
+                composite = (Composite) artifact.getModel();
+            }
+        }
+        
+        Assert.assertNotNull(composite);
+        
+        Assert.assertEquals(1, composite.getComponents().size());
+        Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getServices().size());            
+        Assert.assertEquals("HelloworldService", composite.getComponents().get(0).getImplementation().getServices().get(0).getName());
+        
+        domain.buildComposite(composite);
+        
+        // assert that the build process has worked
+        Assert.assertNotNull(composite);
+
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
new file mode 100644
index 0000000000..64c31b4393
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+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.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import sample.pojo.HelloworldClient2;
+
+
+public class SCAJarEarAppcompTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private ContributionService contributionService;
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * SCAJAR      - It's an SCA contribution in a JAR with no nested archives
+     *               but which references a...
+     * EAR         - It's an JEE EAR file
+     *    appcomp  - It has an application composite in it
+     *    
+     */
+    @Test
+    public void testSCAJarEarAppcomp() throws Exception {
+
+        URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp/target/itest-contribution-jee-samples-41-scajar-ear-appcomp.jar").toURL();
+        Contribution contribution =  contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
+        
+        Assert.assertNotNull(contribution);
+        
+        Composite composite = null;
+        for (Artifact artifact : contribution.getArtifacts()){
+            if (artifact.getModel() instanceof Composite){
+                composite = (Composite) artifact.getModel();
+            }
+        }
+        
+        Assert.assertNotNull(composite);
+        
+        domain.getDomainComposite().getIncludes().add(composite);
+        
+        Assert.assertEquals(3, composite.getComponents().size());
+        Assert.assertEquals(3, composite.getComponents().get(1).getImplementation().getServices().size());            
+        Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName());
+        
+        domain.buildComposite(composite);
+        
+        // assert that the build process has worked
+        Assert.assertNotNull(composite);
+        
+        domain.getCompositeActivator().activate(composite);
+        domain.getCompositeActivator().start(composite);
+        
+        HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent");
+        Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred"));
+        
+        domain.stop();
+
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
new file mode 100644
index 0000000000..9f50ea573c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+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.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import sample.pojo.HelloworldClient2;
+
+
+public class SCAJarEarAppcompWarAppcompTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private ContributionService contributionService;
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * SCAJAR      - It's an SCA contribution in a JAR with no nested archives
+     *               but which references a...
+     * EAR         - It's an JEE EAR file
+     *   appcomp   - It has an application composite in it
+     *   WAR       - It has a WAR (and and EAR) in it
+     *     appcomp - It has an application composite in it which should be ignored
+     */
+    @Test
+    public void testSCAJarEarAppcomp() throws Exception {
+
+        URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp-war-appcomp/target/itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp.jar").toURL();
+        Contribution contribution =  contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
+        
+        Assert.assertNotNull(contribution);
+        
+        Composite composite = null;
+        for (Artifact artifact : contribution.getArtifacts()){
+            if (artifact.getModel() instanceof Composite){
+                composite = (Composite) artifact.getModel();
+            }
+        }
+        
+        Assert.assertNotNull(composite);
+        
+        domain.getDomainComposite().getIncludes().add(composite);
+        
+        Assert.assertEquals(3, composite.getComponents().size());
+        Assert.assertEquals(2, composite.getComponents().get(1).getImplementation().getServices().size());            
+        Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName());
+        
+        domain.buildComposite(composite);
+        
+        // assert that the build process has worked
+        Assert.assertNotNull(composite);
+        
+        domain.getCompositeActivator().activate(composite);
+        domain.getCompositeActivator().start(composite);
+        
+        HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent");
+        Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred"));
+        
+        domain.stop();
+
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
new file mode 100644
index 0000000000..97e23d1bf7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+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.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+public class SCAJarEarNonenhancedTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+    private static final String CONTRIBUTION_002_ID = "contribution002/";
+
+    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
+     */
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * SCAJAR      - It's an SCA contribution in a JAR with no nested archives
+     *               but which references a...
+     * EAR         - It's an JEE EAR file
+     *    nonenhanced  - It has no SCA enhancements. Just a normal EAR
+     *    
+     */
+    @Test
+    public void testSCAJarEarNonenhanced() throws Exception{
+        /* some thoughts about how to preprocess the ear
+         * as an alternative to relying on the model resolver
+         * to do contribution processing. 
+         
+        // Get some things from the extension registry that help us create the
+        // link between the contribution and the ear that it references
+        ExtensionPointRegistry registry = domain.getExtensionPointRegistry();
+        ModelResolverExtensionPoint modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class);
+        Class<? extends ModelResolver> externalEarModelResolver = modelResolvers.getResolver(ExternalEarInfo.class);
+        
+        // locate the ear
+        URL earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL();
+        contributionService.contribute(CONTRIBUTION_001_ID, earLocation, false);
+        
+        // find the app info
+        for (Artifact artifact : contributionService.getContribution(CONTRIBUTION_001_ID).getArtifacts()){
+            if (artifact.getModel() instanceof JavaEEApplicationInfo){
+                // need to make this model available to the external ear model
+                // resolver. But how?
+            }
+        }
+        */
+          
+        URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-nonenhanced/target/itest-contribution-jee-samples-35-scajar-ear-nonenhanced.jar").toURL();
+        Contribution contribution =  contributionService.contribute(CONTRIBUTION_002_ID, contributionLocation, false);
+        
+        Assert.assertNotNull(contribution);
+        
+        Composite composite = null;
+        for (Artifact artifact : contribution.getArtifacts()){
+            if (artifact.getModel() instanceof Composite){
+                composite = (Composite) artifact.getModel();
+            }
+        }
+        
+        Assert.assertNotNull(composite);
+        
+        Assert.assertEquals(2, composite.getComponents().size());
+        Assert.assertEquals(4, composite.getComponents().get(1).getImplementation().getServices().size());
+        Assert.assertEquals("HelloworldService7Bean_HelloworldService7", composite.getComponents().get(1).getImplementation().getServices().get(0).getName());
+        
+        domain.buildComposite(composite);
+        
+        // assert that the build process has worked
+        Assert.assertNotNull(composite);        
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
new file mode 100644
index 0000000000..db4d9e5bf6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+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.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+public class SCAZipEjbAppcompTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private ContributionService contributionService;
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * SCAZIP      - It's an SCA contribution in a ZIP with no nested archive
+     *               but with a reference to an EJB Jar
+     * JAR
+     *    appcomp  - It has an application composite in it
+     *    
+     */
+    @Test
+    public void testSCAZipEjbAppcomp() throws Exception {
+
+        URL contributionLocation = new File("../contribution-jee-samples/scazip-ejb-appcomp/target/itest-contribution-jee-samples-10-scazip-ejb-appcomp.zip").toURL();
+        Contribution contribution =  contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
+        
+        Assert.assertNotNull(contribution);
+        
+        Composite composite = null;
+        for (Artifact artifact : contribution.getArtifacts()){
+            if (artifact.getModel() instanceof Composite){
+                composite = (Composite) artifact.getModel();
+            }
+        }
+        
+        Assert.assertNotNull(composite);
+        
+        Assert.assertEquals(2, composite.getComponents().size());
+        Assert.assertEquals(1, composite.getComponents().get(1).getImplementation().getServices().size());            
+        Assert.assertEquals("HelloworldServiceBean_HelloworldService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName());
+        
+        domain.buildComposite(composite);
+        
+        // assert that the build process has worked
+        Assert.assertNotNull(composite);
+
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
new file mode 100644
index 0000000000..211f51c9bd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+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.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+public class SCAZipWarAppcompTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private ContributionService contributionService;
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * SCAJAR      - It's an SCA contribution in a JAR with no nested archives
+     *               but which references a...
+     * EAR         - It's an JEE EAR file
+     *    appcomp  - It has an application composite in it
+     *    
+     */
+    // not picking up references correctly 
+    @Ignore
+    @Test
+    public void testSCAJarEarNonenhanced() throws Exception {
+
+        URL contributionLocation = new File("../contribution-jee-samples/scazip-war-appcomp/target/itest-contribution-jee-samples-04-scazip-war-appcomp.zip").toURL();
+        Contribution contribution =  contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
+        
+        Assert.assertNotNull(contribution);
+        
+        Composite composite = null;
+        for (Artifact artifact : contribution.getArtifacts()){
+            if (artifact.getModel() instanceof Composite){
+                composite = (Composite) artifact.getModel();
+            }
+        }
+        
+        Assert.assertNotNull(composite);
+        
+        Assert.assertEquals(1, composite.getComponents().size());
+        Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size());            
+        Assert.assertEquals("????", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName());
+        
+        domain.buildComposite(composite);
+        
+        // assert that the build process has worked
+        Assert.assertNotNull(composite);
+
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
new file mode 100644
index 0000000000..7696b64f9c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+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.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+public class WARAppcompContribImplicitTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+
+    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
+     */
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * WAR         - It's a WAR
+     *    Appcomp  - It has an application composite
+     *    Contrib  - It's a contribution in it's own right
+     *    Implicit - Composite deployment is implicit
+     *    
+     */
+    @Test
+    public void testWARAppcompContribImplicit() throws Exception {
+        URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL();
+        contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
+        Assert.assertNotNull(contributionService.getContribution(CONTRIBUTION_001_ID));
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
new file mode 100644
index 0000000000..f54a4f98df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.jee;
+
+import java.io.File;
+import java.net.URL;
+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.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+public class WarAppcompTestCase {
+ 
+    private static final String CONTRIBUTION_001_ID = "contribution001/";
+
+    private ClassLoader cl;
+    private EmbeddedSCADomain domain;
+    private ContributionService contributionService;
+
+    @Before
+    public 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();
+    }
+
+    /**
+     * EJB         - It's an JEE EAR file that is a contribution
+     *    appcomp  - It has an application composite in it
+     *    
+     */
+    @Test
+    public void testEjbAppcom() throws Exception {
+
+        URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL();
+        Contribution contribution =  contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false);
+        
+        Assert.assertNotNull(contribution);
+        
+        Composite composite = null;
+        for (Artifact artifact : contribution.getArtifacts()){
+            if (artifact.getModel() instanceof Composite){
+                composite = (Composite) artifact.getModel();
+            }
+        }
+        
+        Assert.assertNotNull(composite);
+        
+        Assert.assertEquals(1, composite.getComponents().size());
+        Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size());            
+        Assert.assertEquals("helloworldSca", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName());
+        
+        domain.buildComposite(composite);
+        
+        // assert that the build process has worked
+        Assert.assertNotNull(composite);
+
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
new file mode 100644
index 0000000000..11d2a029ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
new file mode 100644
index 0000000000..a5b160c875
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
new file mode 100644
index 0000000000..9fb1ed9d14
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
new file mode 100644
index 0000000000..3a704137ed
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
new file mode 100644
index 0000000000..228f4d27d7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
new file mode 100644
index 0000000000..0b75db2745
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
new file mode 100644
index 0000000000..938ea75941
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
new file mode 100644
index 0000000000..24f55a5f63
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear
new file mode 100644
index 0000000000..c912e64237
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear
diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/pom.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/pom.xml
new file mode 100644
index 0000000000..2dd332dcc2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution-multiple</artifactId>
+    <name>Apache Tuscany SCA iTest Multiple Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/Hello.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/Hello.java
new file mode 100644
index 0000000000..7e574a7db3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/Hello.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
new file mode 100644
index 0000000000..ff9f6e75f3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..c062afaed0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..5251fc0a45
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
new file mode 100644
index 0000000000..ec5123eb2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
new file mode 100644
index 0000000000..133c98f357
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
new file mode 100644
index 0000000000..790b6fed98
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8b76783c3d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
new file mode 100644
index 0000000000..aeeab337fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..bfbf74373a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
new file mode 100644
index 0000000000..7a8003577e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..bea6f39932
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
new file mode 100644
index 0000000000..aeeab337fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..bfbf74373a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
new file mode 100644
index 0000000000..45cb504ea4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..cbabdcd4fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
new file mode 100644
index 0000000000..4c9225de34
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution/pom.xml b/tags/java/sca/1.5.1/itest/contribution/pom.xml
new file mode 100644
index 0000000000..e41db401dc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-contribution</artifactId>
+    <name>Apache Tuscany SCA iTest Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddService.java
new file mode 100644
index 0000000000..4e72f92fda
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddService.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
new file mode 100644
index 0000000000..e9c635e3c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
new file mode 100644
index 0000000000..719ad69eef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
@@ -0,0 +1,46 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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/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.5.1/itest/contribution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorService.java
new file mode 100644
index 0000000000..f288af0174
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorService.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..ae4ed12b7b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
@@ -0,0 +1,70 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideService.java
new file mode 100644
index 0000000000..ad99418f5b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideService.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
new file mode 100644
index 0000000000..8c33862f6d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyService.java
new file mode 100644
index 0000000000..3987b0a54f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyService.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..c7fbc73c00
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractService.java
new file mode 100644
index 0000000000..25e0ed6ca7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractService.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
new file mode 100644
index 0000000000..1a7f145ad8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/contribution/src/main/resources/ContributionTest.composite b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/ContributionTest.composite
new file mode 100644
index 0000000000..d814e439e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/ContributionTest.composite
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution/src/main/resources/calculator/Calculator.composite b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/Calculator.composite
new file mode 100644
index 0000000000..657a2f95d8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/Calculator.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
new file mode 100644
index 0000000000..e95796d83a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/tags/java/sca/1.5.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
new file mode 100644
index 0000000000..97b2e5d6ed
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
@@ -0,0 +1,218 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/tags/java/sca/1.5.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
new file mode 100644
index 0000000000..0ca3a1b781
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/tags/java/sca/1.5.1/itest/contribution/src/test/resources/repository/sample-calculator.jar b/tags/java/sca/1.5.1/itest/contribution/src/test/resources/repository/sample-calculator.jar
new file mode 100644
index 0000000000..0ca3a1b781
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/pom.xml b/tags/java/sca/1.5.1/itest/conversations-ws/pom.xml
new file mode 100644
index 0000000000..3e79902b89
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-conversations-ws</artifactId>
+    <name>Apache Tuscany SCA iTest Conversations Over Web Services Binding</name>
+
+    <dependencies>
+
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>         
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
new file mode 100644
index 0000000000..9cd88620e3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
new file mode 100644
index 0000000000..53dadc3dc7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
new file mode 100644
index 0000000000..cb7a032e85
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
new file mode 100644
index 0000000000..2532346349
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
new file mode 100644
index 0000000000..8f008fa711
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
@@ -0,0 +1,36 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
new file mode 100644
index 0000000000..1e36ce6917
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
@@ -0,0 +1,58 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
new file mode 100644
index 0000000000..b4d3fe3d71
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
@@ -0,0 +1,59 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
new file mode 100644
index 0000000000..ed3a01c10b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
@@ -0,0 +1,42 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
new file mode 100644
index 0000000000..1603916cca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
@@ -0,0 +1,76 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
new file mode 100644
index 0000000000..accc1eee27
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
@@ -0,0 +1,48 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
new file mode 100644
index 0000000000..90f6de86ac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
@@ -0,0 +1,76 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
new file mode 100644
index 0000000000..3f7a90b3dc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
@@ -0,0 +1,322 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
new file mode 100644
index 0000000000..ab91498132
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
@@ -0,0 +1,311 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
new file mode 100644
index 0000000000..e4f83656de
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
@@ -0,0 +1,318 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
new file mode 100644
index 0000000000..8fe7c5b6ba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
@@ -0,0 +1,43 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
new file mode 100644
index 0000000000..9f4857f703
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
@@ -0,0 +1,124 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
new file mode 100644
index 0000000000..4b06251414
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
@@ -0,0 +1,119 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
new file mode 100644
index 0000000000..be039748fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
@@ -0,0 +1,118 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
new file mode 100644
index 0000000000..42f2f1a603
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
@@ -0,0 +1,122 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
new file mode 100644
index 0000000000..a852aeda56
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
@@ -0,0 +1,94 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..d5a1ff7410
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
new file mode 100644
index 0000000000..c4da99145d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
new file mode 100644
index 0000000000..20a92c9dc7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..73d078674c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
new file mode 100644
index 0000000000..9c6b0a2b34
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
new file mode 100644
index 0000000000..9df966ebc2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
@@ -0,0 +1,75 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.After;

+import org.junit.Assert;

+import org.junit.Before;

+import org.junit.Test;

+

+public class ConversationWSDLTestCase {

+

+    private SCANode node; 

+    private ConversationalClient conversationalStatelessClientStatefulService;    

+

+    @Before

+    public void setUp() throws Exception {

+        SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
new file mode 100644
index 0000000000..ebd1e55dac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
@@ -0,0 +1,198 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class NonConversationalCallbackTestCase {

+

+    private static SCANode 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 {

+            SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
new file mode 100644
index 0000000000..2c16145f54
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
@@ -0,0 +1,209 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class RequestScopeTestCase {

+

+    private static SCANode 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 {

+            SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
new file mode 100644
index 0000000000..4166e6acdf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
@@ -0,0 +1,193 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class StatefulStatefulTestCase {

+

+    private static SCANode 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 {

+            SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
new file mode 100644
index 0000000000..6023b7cd53
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
@@ -0,0 +1,193 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class StatefulStatelessTestCase {

+

+    private static SCANode 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 {

+            SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
new file mode 100644
index 0000000000..fb3a3cec6f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
@@ -0,0 +1,205 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class StatelessStatefulTestCase {

+

+    private static SCANode 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 {

+            SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
new file mode 100644
index 0000000000..5fbe2c3f69
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
@@ -0,0 +1,192 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class StatelessStatelessTestCase {

+

+    private static SCANode 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 {

+            SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/conversations/pom.xml b/tags/java/sca/1.5.1/itest/conversations/pom.xml
new file mode 100644
index 0000000000..f5c80f240a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-conversations</artifactId>
+    <name>Apache Tuscany SCA iTest Conversations</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
new file mode 100644
index 0000000000..a3b83dfc14
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
new file mode 100644
index 0000000000..8e98b9cbd4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
new file mode 100644
index 0000000000..e7583c339a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
@@ -0,0 +1,56 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
new file mode 100644
index 0000000000..bc4a5fc571
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
new file mode 100644
index 0000000000..77d7f4c007
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
@@ -0,0 +1,42 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
new file mode 100644
index 0000000000..e422938b27
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
new file mode 100644
index 0000000000..a6dbf56797
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
new file mode 100644
index 0000000000..3f04e9f09e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
@@ -0,0 +1,25 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
new file mode 100644
index 0000000000..53dadc3dc7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
new file mode 100644
index 0000000000..8cad88d2f4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
new file mode 100644
index 0000000000..2532346349
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
new file mode 100644
index 0000000000..8f008fa711
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
@@ -0,0 +1,36 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
new file mode 100644
index 0000000000..546382cfd1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
@@ -0,0 +1,62 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
new file mode 100644
index 0000000000..f1a21cc18f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
@@ -0,0 +1,62 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
new file mode 100644
index 0000000000..74afbfb763
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
new file mode 100644
index 0000000000..5f97b16088
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
new file mode 100644
index 0000000000..3ce3e3ada7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
@@ -0,0 +1,46 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
new file mode 100644
index 0000000000..95c9c7ae6e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
@@ -0,0 +1,111 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
new file mode 100644
index 0000000000..a5f37f7a52
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
new file mode 100644
index 0000000000..c1e27641ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
@@ -0,0 +1,73 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
new file mode 100644
index 0000000000..900b8f743f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
new file mode 100644
index 0000000000..b21f956bd9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
new file mode 100644
index 0000000000..9deef312ac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
new file mode 100644
index 0000000000..cffa76186a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
new file mode 100644
index 0000000000..1272c7ab7f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
new file mode 100644
index 0000000000..847b038881
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
@@ -0,0 +1,321 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
new file mode 100644
index 0000000000..b77e4c0194
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
@@ -0,0 +1,310 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
new file mode 100644
index 0000000000..5b3906fc2c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
@@ -0,0 +1,317 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
new file mode 100644
index 0000000000..8fe7c5b6ba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
@@ -0,0 +1,43 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
new file mode 100644
index 0000000000..9a25f0f59a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
@@ -0,0 +1,123 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
new file mode 100644
index 0000000000..efcbdff06f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
@@ -0,0 +1,117 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
new file mode 100644
index 0000000000..8454b3846b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
@@ -0,0 +1,117 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
new file mode 100644
index 0000000000..07186c91e1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
@@ -0,0 +1,123 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
new file mode 100644
index 0000000000..344aa99dff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
@@ -0,0 +1,93 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
new file mode 100644
index 0000000000..8d79bb75e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
new file mode 100644
index 0000000000..d1b769216b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/main/resources/ConversationAge.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationAge.composite
new file mode 100644
index 0000000000..abd1c35ced
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationAge.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/conversations/src/main/resources/ConversationUniqueId.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationUniqueId.composite
new file mode 100644
index 0000000000..831449a079
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationUniqueId.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/conversations/src/main/resources/conversationId.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationId.composite
new file mode 100644
index 0000000000..e61eb08194
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationId.composite
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/conversations/src/main/resources/conversationLifetime.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationLifetime.composite
new file mode 100644
index 0000000000..3b79dc43d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationLifetime.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/conversations/src/main/resources/conversational.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversational.composite
new file mode 100644
index 0000000000..4da3ce74d5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversational.composite
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
new file mode 100644
index 0000000000..3e750bdd1e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
new file mode 100644
index 0000000000..326a833a42
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
@@ -0,0 +1,203 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
new file mode 100644
index 0000000000..431962221a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
new file mode 100644
index 0000000000..cc31c77873
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
new file mode 100644
index 0000000000..8480e04028
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
new file mode 100644
index 0000000000..da359bc296
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
@@ -0,0 +1,649 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/corba/pom.xml b/tags/java/sca/1.5.1/itest/corba/pom.xml
new file mode 100644
index 0000000000..ac07e651b2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/pom.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	* Licensed to the Apache Software Foundation (ASF) under one
+	* or more contributor license agreements.  See the NOTICE file
+	* distributed with this work for additional information
+	* regarding copyright ownership.  The ASF licenses this file
+	* to you under the Apache License, Version 2.0 (the
+	* "License"); you may not use this file except in compliance
+	* with the License.  You may obtain a copy of the License at
+	* 
+	*   http://www.apache.org/licenses/LICENSE-2.0
+	* 
+	* Unless required by applicable law or agreed to in writing,
+	* software distributed under the License is distributed on an
+	* "AS IS" BASIS, WITHOUT 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.5.1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>itest-corba-binding</artifactId>
+	<name>Apache Tuscany SCA iTest CORBA Binding</name>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-embedded</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-implementation-java-runtime</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-corba-runtime</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-corba-jse</artifactId>
+			<version>1.5.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-corba-jse-tns</artifactId>
+			<version>1.5.1</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-sca</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-sca-corba</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+
+<!-- 
+		<dependency>
+			<groupId>org.apache.ws.commons.axiom</groupId>
+			<artifactId>axiom-api</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xercesImpl</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>stax</groupId>
+					<artifactId>stax-api</artifactId>
+				</exclusion>
+			</exclusions>
+			<version>1.2.5</version>
+		</dependency>
+ -->        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-sdo</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</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-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.1</version>
+				<executions>
+					<execution>
+						<id>generate-scenariofour-sdo</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<schemaFile>
+								${basedir}/src/test/resources/scenariofour.xsd
+							</schemaFile>
+							<javaPackage>
+								org.apache.tuscany.sca.test.corba.scenariofour
+							</javaPackage>
+							<prefix>ScenarioFour</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.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
new file mode 100644
index 0000000000..46e214eac3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import static org.junit.Assert.fail;
+
+import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.test.corba.types.ScenarioFive;
+import org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent;
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ * Tests usage of TNS JSE Corba host
+ */
+public class ScenarioFiveTestCase {
+
+    @Test
+    public void test_providedNameServer() {
+        TestCorbaHost.setCorbaHost(new TnsDefaultCorbaHost());
+        try {
+            // just make sure we can obtain and use the reference with success
+            SCADomain domain = SCADomain.newInstance("ScenarioFive.composite");
+            ScenarioFive scenarioFive =
+                domain.getService(ScenarioFiveComponent.class, "ScenarioFive").getScenarioFive();
+            scenarioFive.doNothing();
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
new file mode 100644
index 0000000000..cba8c823e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourFactory;
+import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
+import org.apache.tuscany.sca.test.corba.types.ScenarioFour;
+import org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent;
+import org.apache.tuscany.sca.test.corba.types.ScenarioFourException;
+import org.apache.tuscany.sca.test.corba.types.ScenarioFourStruct;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ * Tests SCA default binding over CORBA binding
+ */
+public class ScenarioFourTestCase {
+
+    // note that those values are also used in resources/*.composite file
+    private static SCADomain domain;
+    private static ScenarioFourComponent scenarioFourComponent;
+    private static ScenarioFour scenarioFour;
+    private static TransientNameServer server;
+    private static final int ORB_INITIAL_PORT = 5080;
+    
+    /**
+     * Initial configuration
+     */
+    @BeforeClass
+    public static void setUp() {
+        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
+        try {
+            server = new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
+            Thread t = server.start();
+            if (t == null) {
+                Assert.fail("The naming server cannot be started");
+            }
+            // obtain domain
+            domain = SCADomain.newInstance("ScenarioFour.composite");
+            scenarioFourComponent = domain.getService(ScenarioFourComponent.class, "ScenarioFour");
+            scenarioFour = scenarioFourComponent.getScenarioFour();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Test cleanup
+     */
+    @AfterClass
+    public static void tearDown() {
+        server.stop();
+    }
+
+    /**
+     * General tests for passing JAXB objects
+     */
+    @Test
+    public void test_generalJAXB() {
+        try {
+            ScenarioFourStruct input = new ScenarioFourStruct();
+            input.field1 = "Test";
+            input.field2 = 1;
+            input.field3 = new double[1];
+            ScenarioFourStruct output = scenarioFour.setStruct(input);
+            assertTrue(input.equals(output));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Test for JAXB exceptions
+     */
+    @Test
+    public void test_exceptionsJAXB() {
+        try {
+            scenarioFour.exceptionTest();
+            fail();
+        } catch (ScenarioFourException e) {
+            assertTrue(ScenarioFourException.DEFAULT_CONTENT.equals(e.getContent()));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * General test for passing SDO objects
+     */
+    @Test
+    public void test_generalSDO() {
+        try {
+            ScenarioFourSdo scenarioFourSdo = ScenarioFourFactory.INSTANCE.createScenarioFourSdo();
+            scenarioFourSdo.setMessage("Test1");
+            scenarioFourSdo.setSymbol("Test2");
+            ScenarioFourSdo result = scenarioFour.passScenarioFourStruct(scenarioFourSdo);
+            assertTrue(scenarioFourSdo.getMessage().equals(result.getMessage()) && scenarioFourSdo.getSymbol()
+                .equals(result.getSymbol()));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests reusing local name server with multiple bindings
+     */
+    @Test
+    public void test_nameServerReuse() {
+        try {
+            ScenarioFour scenarioFour =
+                domain.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour();
+            ScenarioFourStruct struct = new ScenarioFourStruct();
+            scenarioFour.setStruct(struct);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
new file mode 100644
index 0000000000..0135c04495
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
@@ -0,0 +1,371 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.test.corba.generated.Color;
+import org.apache.tuscany.sca.test.corba.generated.InnerStruct;
+import org.apache.tuscany.sca.test.corba.generated.RichStruct;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioOne;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations;
+import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
+import org.apache.tuscany.sca.test.corba.generated.WrongColor;
+import org.apache.tuscany.sca.test.corba.types.ScenarioOneServant;
+import org.apache.tuscany.sca.test.corba.types.TColor;
+import org.apache.tuscany.sca.test.corba.types.TInnerStruct;
+import org.apache.tuscany.sca.test.corba.types.TRichStruct;
+import org.apache.tuscany.sca.test.corba.types.TScenarioOne;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+/**
+ * @version $Rev$ $Date$
+ * This test class contains three main tests:<br>
+ * 1. Tuscany is being used as a consumer of some non-Tuscany CORBA service<br>
+ * 2. Tuscany is being used as a service provider, which will be consumed by
+ * non-Tuscany CORBA client<br>
+ * 3. Tuscany is being used as a service provider, which will be consumed by
+ * Tuscany client<br>
+ * But that's not all, there are some other variations. Tuscany CORBA binding
+ * supports using Java interface generated by IDLJ, also it supports interfaces
+ * provided by user - I combined those cases in each test.<br>
+ */
+public class ScenarioOneTestCase {
+
+    // note that those values are also used in resources/*.composite file
+    private static int ORB_INITIAL_PORT = 5060;
+    private static String SERVICE_NAME = "ScenarioOne";
+
+    private static SCADomain domain;
+
+    private static TransientNameServer server;
+    private static ORB orb;
+
+    /**
+     * Sets up name service, creates and registers traditional CORBA service,
+     * obtains SCADomain
+     */
+    @BeforeClass
+    public static void setUp() {
+        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
+        try {
+            try {
+                server =
+                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
+                Thread t = server.start();
+                if (t == null) {
+                    Assert.fail("The naming server cannot be started");
+                }
+                orb = server.getORB();
+            } catch (Throwable e) {
+                e.printStackTrace();
+                Assert.fail(e.getMessage());
+            }
+            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
+            NamingContext ncRef = NamingContextHelper.narrow(objRef);
+            NameComponent nc = new NameComponent(SERVICE_NAME, "");
+            NameComponent path[] = {nc};
+            ScenarioOne scenarioOne = new ScenarioOneServant();
+            ncRef.rebind(path, scenarioOne);
+            // obtain domain
+            domain = SCADomain.newInstance("ScenarioOne.composite");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Kills previously spawned name service.
+     */
+    @AfterClass
+    public static void tearDown() {
+        server.stop();
+    }
+
+    /**
+     * Creates nicely filled structure for user provided interface.
+     * 
+     * @return
+     */
+    private static TRichStruct getTRichStruct() {
+        int[][] intArr = new int[][] { {1, 2}, {3, 4}};
+        TInnerStruct innerStruct = new TInnerStruct(intArr, "Test", TColor.green);
+        String[] strSeq = {"i", "Test"};
+        return new TRichStruct(innerStruct, strSeq, 1);
+
+    }
+
+    /**
+     * Creates nicely filled structure for generated interface.
+     * 
+     * @return
+     */
+    private static RichStruct getRichStruct() {
+        int[][] intArr = new int[][] { {1, 2}, {3, 4}};
+        InnerStruct innerStruct2 = new InnerStruct(intArr, "Test", Color.green);
+        String[] strSeq = {"i", "Test"};
+        return new RichStruct(innerStruct2, strSeq, 1);
+    }
+
+    /**
+     * Compares String arrays
+     * 
+     * @param arg1
+     * @param arg2
+     * @return
+     */
+    private boolean areSrringArraysEqual(String[] arg1, String[] arg2) {
+        try {
+            for (int i = 0; i < arg1.length; i++) {
+                if (!arg1[i].equals(arg2[i])) {
+                    return false;
+                }
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Compares two dimensional int arrays
+     * 
+     * @param arg1
+     * @param arg2
+     * @return
+     */
+    private boolean areTwoDimIntArraysEqual(int[][] arg1, int[][] arg2) {
+        try {
+            for (int i = 0; i < arg1.length; i++) {
+                for (int j = 0; j < arg1[i].length; j++) {
+                    if (arg1[i][j] != arg2[i][j]) {
+                        return false;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    private boolean equalTo(TInnerStruct arg1, TInnerStruct arg2) {
+        return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence,
+                                                                                                                                 arg2.twoDimLongSequence));
+    }
+
+    private boolean equalTo(InnerStruct arg1, InnerStruct arg2) {
+        return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence,
+                                                                                                                                 arg2.twoDimLongSequence));
+    }
+
+    private boolean equalTo(TRichStruct arg1, TRichStruct arg2) {
+        return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence,
+                                                                                                                        arg2.stringSequence));
+    }
+
+    private boolean equalTo(RichStruct arg1, RichStruct arg2) {
+        return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence,
+                                                                                                                        arg2.stringSequence));
+    }
+
+    /**
+     * Helper method used several times for various components. Executes several
+     * tests using Tuscany reference binding. This helper uses generated Java
+     * interface.
+     * 
+     * @param componentName
+     */
+    private void testClientUsingGeneratedInterface(String componentName) {
+        ScenarioOneOperations component = domain.getService(ScenarioOneOperations.class, componentName);
+        RichStruct richStruct = getRichStruct();
+
+        try {
+            RichStruct result = component.setRichStruct(richStruct);
+            assertTrue(equalTo(result, richStruct));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+
+        try {
+            richStruct.longField = 0;
+            component.setRichStruct(richStruct);
+            fail();
+        } catch (Exception e) {
+            assertTrue(e instanceof UnexpectedException);
+        }
+
+        try {
+            richStruct.longField = 1;
+            richStruct.innerStruct.color = Color.red;
+            component.setRichStruct(richStruct);
+        } catch (Exception e) {
+            assertTrue(e instanceof WrongColor);
+        }
+    }
+
+    /**
+     * Helper method used several times for various components. Executes several
+     * tests using Tuscany reference binding. This helper uses user provided
+     * Java interface.
+     * 
+     * @param componentName
+     */
+    private void testClientUsingUserProvidedInterface(String componentName) {
+        TScenarioOne component = domain.getService(TScenarioOne.class, componentName);
+        TRichStruct tRichStruct = getTRichStruct();
+
+        try {
+            TRichStruct result = component.setRichStruct(tRichStruct);
+            assertTrue(equalTo(result, tRichStruct));
+        } catch (Exception e) {
+            fail();
+        }
+
+        try {
+            tRichStruct.longField = 0;
+            component.setRichStruct(tRichStruct);
+            fail();
+        } catch (Exception e) {
+            assertTrue(e instanceof UnexpectedException);
+        }
+
+        try {
+            tRichStruct.longField = 1;
+            tRichStruct.innerStruct.color = TColor.red;
+            component.setRichStruct(tRichStruct);
+        } catch (Exception e) {
+            assertTrue(e instanceof WrongColor);
+        }
+    }
+
+    public void testServiceUsingGeneratedClient(String serviceName) {
+        try {
+            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
+            NamingContext ncRef = NamingContextHelper.narrow(objRef);
+            NameComponent nc = new NameComponent(serviceName, "");
+            NameComponent path[] = {nc};
+            ScenarioOne so = ScenarioOneHelper.narrow(ncRef.resolve(path));
+
+            RichStruct richStruct = getRichStruct();
+            RichStruct result = so.setRichStruct(richStruct);
+            assertTrue(equalTo(result, richStruct));
+
+            try {
+                richStruct.innerStruct.color = Color.red;
+                result = so.setRichStruct(richStruct);
+                fail();
+            } catch (Exception e) {
+                assertTrue(e instanceof WrongColor);
+            }
+
+            try {
+                richStruct.innerStruct.color = Color.green;
+                richStruct.longField = 0;
+                result = so.setRichStruct(richStruct);
+                fail();
+            } catch (Exception e) {
+                assertTrue(e instanceof UnexpectedException);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Service is exposed in traditional way (using CORBA API from JDK).
+     * Reference is obtained from Tuscany.
+     */
+    @Test
+    public void test_TraditionalService_TuscanyClient() {
+
+        // Client is using user provided interface
+        testClientUsingUserProvidedInterface("ScenarioOne");
+
+        // Client is using generated interface
+        testClientUsingGeneratedInterface("ScenarioOneGenerated");
+    }
+
+    /**
+     * Service is exposed by Tuscany. Reference is obtained in traditional way.
+     * (using CORBA API from JDK)
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void test_TuscanyService_TraditionalClient() throws Exception {
+
+        // tests service which uses user provided interface
+        testServiceUsingGeneratedClient("ScenarioOneTuscany");
+
+        // tests service which uses generated interface
+        testServiceUsingGeneratedClient("ScenarioOneTuscanyGenerated");
+    }
+
+    /**
+     * Service is exposed by Tuscany. Reference is obtained from Tuscany. There
+     * are 4 combinations (basing on if we are using generated or user provided
+     * interfaces, both on service and reference side).
+     */
+    @Test
+    public void test_TuscanyService_TuscanyClient() {
+
+        // Client is using user provided interface, service is using user
+        // provided interface.
+        testClientUsingUserProvidedInterface("TU2TS1");
+
+        // Client is using user provided interface, service is using generated
+        // interface.
+        testClientUsingUserProvidedInterface("TU2TS2");
+
+        // Client is using generated interface, service is using user provided
+        // interface.
+        testClientUsingGeneratedInterface("TG2TS1");
+
+        // Client is using generated interface, service is using generated
+        // interface.
+        testClientUsingGeneratedInterface("TG2TS2");
+    }
+    
+    /**
+     * Tests using reference obtained by corbaname URI
+     */
+    @Test
+    public void test_serviceAndReferenceByURI() {
+        testClientUsingUserProvidedInterface("UriBinding");
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
new file mode 100644
index 0000000000..b7309d68a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct;
+import org.apache.tuscany.sca.test.corba.generated.InnerUnion;
+import org.apache.tuscany.sca.test.corba.generated.RichUnion;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioSix;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper;
+import org.apache.tuscany.sca.test.corba.types.ScenarioSixServant;
+import org.apache.tuscany.sca.test.corba.types.TAnnotatedStruct;
+import org.apache.tuscany.sca.test.corba.types.TInnerUnion;
+import org.apache.tuscany.sca.test.corba.types.TRichUnion;
+import org.apache.tuscany.sca.test.corba.types.TScenarioSix;
+import org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+/**
+ * Tests using enhanced Java interfaces (annotations)
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ScenarioSixTestCase {
+
+    // note that those values are also used in resources/*.composite file
+    private static int ORB_INITIAL_PORT = 5050;
+    private static String SERVICE_NAME = "ScenarioSix";
+    private static String TUSCANY_SERVICE_NAME = "ScenarioSixTuscany";
+
+    private static SCADomain domain;
+
+    private static TransientNameServer server;
+    private static ORB orb;
+
+    /**
+     * Sets up name service, creates and registers traditional CORBA service,
+     * obtains SCADomain
+     */
+    @BeforeClass
+    public static void setUp() {
+        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
+        try {
+            try {
+                server =
+                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
+                Thread t = server.start();
+                if (t == null) {
+                    Assert.fail("The naming server cannot be started");
+                }
+                orb = server.getORB();
+            } catch (Throwable e) {
+                e.printStackTrace();
+                Assert.fail(e.getMessage());
+            }
+            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
+            NamingContext ncRef = NamingContextHelper.narrow(objRef);
+            NameComponent nc = new NameComponent(SERVICE_NAME, "");
+            NameComponent path[] = {nc};
+            ScenarioSix scenarioSix = new ScenarioSixServant();
+            ncRef.rebind(path, scenarioSix);
+            // obtain domain
+            domain = SCADomain.newInstance("ScenarioSix.composite");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Kills previously spawned name service.
+     */
+    @AfterClass
+    public static void tearDown() {
+        server.stop();
+    }
+
+    private boolean areArraysEqual(String[][] arr1, String[][] arr2) {
+        for (int i = 0; i < arr1.length; i++) {
+            for (int j = 0; j < arr1[i].length; j++) {
+                if (!arr1[i][j].equals(arr2[i][j])) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private String[][] getStringArray() {
+        String[][] result = { {"Hello", "World"}, {"Hi", "Again"}};
+        return result;
+    }
+
+    /**
+     * Tests passing arrays. Tuscany acts as a client, servant object is served
+     * in a traditional way
+     */
+    @Test
+    public void test_arraysPassing_tuscanyAsClient() {
+        try {
+            TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
+            String[][] arrayArg = getStringArray();
+            String[][] arrayRes = ref.passStringArray(arrayArg);
+            assertTrue(areArraysEqual(arrayArg, arrayRes));
+            TAnnotatedStruct structArg = new TAnnotatedStruct();
+            structArg.stringArray = getStringArray();
+            TAnnotatedStruct structRes = ref.passAnnotatedStruct(structArg);
+            assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests passing arrays. Servant object is served by Tuscany and it is
+     * accessed by traditional Corba client
+     */
+    @Test
+    public void test_arraysPassing_tuscanyAsService() {
+        try {
+            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
+            NamingContext ncRef = NamingContextHelper.narrow(objRef);
+            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
+            NameComponent path[] = {nc};
+            ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path));
+            String[][] stringArg = getStringArray();
+            String[][] stringRes = ref.passStringArray(stringArg);
+            assertTrue(areArraysEqual(stringArg, stringRes));
+            AnnotatedStruct structArg = new AnnotatedStruct();
+            structArg.stringArray = getStringArray();
+            AnnotatedStruct structRes = ref.passAnnotatedStruct(structArg);
+            assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests passing unions. Tuscany acts as a client, servant object is served
+     * in a traditional way
+     */
+    @Test
+    public void test_unionsPassing_tuscanyAsClient() {
+        try {
+            TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
+            TRichUnion arg = new TRichUnion();
+            TInnerUnion inner = new TInnerUnion();
+            inner.setY(10f);
+            arg.setIu(inner);
+            TRichUnion result = ref.passRichUnion(arg);
+            assertEquals(arg.getIu().getY(), result.getIu().getY(), 0.0f);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+        try {
+            TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
+            TRichUnion arg = new TRichUnion();
+            arg.setY(15f);
+            TRichUnion result = ref.passRichUnion(arg);
+            assertEquals(arg.getY(), result.getY(), 0.0f);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+    
+    /**
+     * Tests passing unions. Servant object is served by Tuscany and it is
+     * accessed by traditional Corba client
+     */
+    @Test
+    public void test_unionsPassing_tuscanyAsService() {
+        try {
+            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
+            NamingContext ncRef = NamingContextHelper.narrow(objRef);
+            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
+            NameComponent path[] = {nc};
+            ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path));
+            RichUnion arg = new RichUnion();
+            InnerUnion inner = new InnerUnion();
+            inner.y(20f);
+            arg.iu(inner);
+            RichUnion result = ref.passRichUnion(arg);
+            assertEquals(arg.iu().y(), result.iu().y(), 0.0f);
+            arg = new RichUnion();
+            arg.y(15f);
+            result = ref.passRichUnion(arg);
+            assertEquals(arg.y(), result.y(), 0.0f);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
new file mode 100644
index 0000000000..a738c6f211
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.test.corba.types.TScenarioThree;
+import org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ * Tests various mapping scenarios.
+ */
+public class ScenarioThreeTestCase {
+
+    // note that those values are also used in resources/*.composite file
+    private static int ORB_INITIAL_PORT = 5060;
+    private static SCADomain domain;
+    private static TransientNameServer server;
+
+    /**
+     * Sets up name service, creates and registers traditional CORBA service,
+     * obtains SCADomain
+     */
+    @BeforeClass
+    public static void setUp() {
+        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
+        try {
+            try {
+                server =
+                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
+                Thread t = server.start();
+                if (t == null) {
+                    Assert.fail("The naming server cannot be started");
+                }
+            } catch (Throwable e) {
+                e.printStackTrace();
+                Assert.fail(e.getMessage());
+            }
+            // obtain domain
+            domain = SCADomain.newInstance("ScenarioThree.composite");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Kills previously spawned name service.
+     */
+    @AfterClass
+    public static void tearDown() {
+        server.stop();
+    }
+
+    /**
+     * Tests mapping for getters and setters
+     */
+    @Test
+    public void test_getterSetter() {
+        try {
+            TScenarioThree ref =
+                domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
+            ref.getIntField();
+            ref.setIntField(1);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests mapping the same operation names but with different cases
+     */
+    @Test
+    public void test_nameCase() {
+        try {
+            TScenarioThree ref =
+                domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
+            assertEquals(0, ref.caseDifferent());
+            assertEquals(1, ref.CaseDifferent());
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests mappings for operations with overloaded names
+     */
+    @Test
+    public void test_overloadedNames() {
+        try {
+            TScenarioThree ref =
+                domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
+            ref.overloadedName();
+            ref.overloadedName("");
+            ref.overloadedName("", 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
new file mode 100644
index 0000000000..008212bdbe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioTwo;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper;
+import org.apache.tuscany.sca.test.corba.types.ScenarioTwoServant;
+import org.apache.tuscany.sca.test.corba.types.TScenarioTwo;
+import org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+/**
+ * @version $Rev$ $Date$
+ * Tests attribute get/set mapping using cooperation between traditional CORBA
+ * and Tuscany CORBA
+ */
+public class ScenarioTwoTestCase {
+
+    // note that those values are also used in resources/*.composite file
+    private static int ORB_INITIAL_PORT = 5060;
+
+    private static SCADomain domain;
+
+    private static TransientNameServer server;
+    private static ORB orb;
+    private static String TUSCANY_SERVICE_NAME = "ScenarioTwo";
+    private static String GENERATED_SERVICE_NAME = "ScenarioTwoGenerated";
+
+    /**
+     * Sets up name service, creates and registers traditional CORBA service,
+     * obtains SCADomain
+     */
+    @BeforeClass
+    public static void setUp() {
+        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
+        try {
+            try {
+                server =
+                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
+                Thread t = server.start();
+                if (t == null) {
+                    Assert.fail("The naming server cannot be started");
+                }
+                orb = server.getORB();
+                org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
+                NamingContext ncRef = NamingContextHelper.narrow(objRef);
+                NameComponent nc = new NameComponent(GENERATED_SERVICE_NAME, "");
+                NameComponent path[] = {nc};
+                ScenarioTwo scenarioTwo = new ScenarioTwoServant();
+                ncRef.rebind(path, scenarioTwo);
+            } catch (Throwable e) {
+                e.printStackTrace();
+                Assert.fail(e.getMessage());
+            }
+            // obtain domain
+            domain = SCADomain.newInstance("ScenarioTwo.composite");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Kills previously spawned name service.
+     */
+    @AfterClass
+    public static void tearDown() {
+        server.stop();
+    }
+
+    /**
+     * Tests using objects attribute (which is server in traditional way) by
+     * Tuscany CORBA binding
+     */
+    @Test
+    public void test_tuscanyGetSetAttribute() {
+        try {
+            TScenarioTwo ref = domain.getService(TScenarioTwoComponent.class, "ScenarioTwo").getScenarioTwo();
+            String strVal = "Whatever";
+            ref.setStringField(strVal);
+            assertEquals(strVal, ref.getStringField());
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests using objects attribute (which is served by Tuscany) in traditional
+     * way (by idlj generated code)
+     */
+    @Test
+    public void test_getneratedGetSetAttribute() {
+        try {
+            orb = server.getORB();
+            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
+            NamingContext ncRef = NamingContextHelper.narrow(objRef);
+            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
+            NameComponent path[] = {nc};
+            ScenarioTwo st = ScenarioTwoHelper.narrow(ncRef.resolve(path));
+            st.stringField("");
+            assertEquals("", st.stringField());
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
new file mode 100644
index 0000000000..bd1ce8cb49
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import org.apache.tuscany.sca.host.corba.CorbaHost;
+import org.apache.tuscany.sca.host.corba.CorbaHostException;
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
+import org.omg.CORBA.Object;
+
+/**
+ * @version $Rev$ $Date$
+ * Mock Corba host which proxies to configured Corba host
+ */
+public class TestCorbaHost implements CorbaHost {
+
+    private static CorbaHost corbaHost = new DefaultCorbaHost();
+
+    /**
+     * Configures environment to use given Corba host
+     * 
+     * @param corbaHost Corba host to use
+     */
+    public static void setCorbaHost(CorbaHost corbaHost) {
+       TestCorbaHost.corbaHost = corbaHost;
+    }
+    
+    public Object lookup(String arg0) throws CorbaHostException {
+        return TestCorbaHost.corbaHost.lookup(arg0);
+    }
+
+    public void registerServant(String arg0, Object arg1) throws CorbaHostException {
+        TestCorbaHost.corbaHost.registerServant(arg0, arg1);
+    }
+
+    public void unregisterServant(String arg0) throws CorbaHostException {
+        TestCorbaHost.corbaHost.unregisterServant(arg0);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
new file mode 100644
index 0000000000..c25372c837
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ModuleActivator;
+import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
+
+/**
+ * @version $Rev$ $Date$
+ * Registers TestCorbaHost as a Corba host extension. 
+ */
+public class TestCorbaHostModuleActivator implements ModuleActivator {
+
+    public void start(ExtensionPointRegistry extensionPointRegistry) {
+        CorbaHostExtensionPoint chep = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
+        chep.getCorbaHosts().add(0, new TestCorbaHost());
+    }
+
+    public void stop(ExtensionPointRegistry extensionPointRegistry) {
+
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
new file mode 100644
index 0000000000..82b327f11c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+public final class AnnotatedStruct implements org.omg.CORBA.portable.IDLEntity
+{
+  public String stringArray[][] = null;
+
+  public AnnotatedStruct ()
+  {
+  } // ctor
+
+  public AnnotatedStruct (String[][] _stringArray)
+  {
+    stringArray = _stringArray;
+  } // ctor
+
+} // class AnnotatedStruct
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
new file mode 100644
index 0000000000..010dea1e1a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+abstract public class AnnotatedStructHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct/AnnotatedStruct:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  private static boolean __active = false;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      synchronized (org.omg.CORBA.TypeCode.class)
+      {
+        if (__typeCode == null)
+        {
+          if (__active)
+          {
+            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
+          }
+          __active = true;
+          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1];
+          org.omg.CORBA.TypeCode _tcOf_members0 = null;
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", _tcOf_members0);
+          _members0[0] = new org.omg.CORBA.StructMember (
+            "stringArray",
+            _tcOf_members0,
+            null);
+          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.id (), "AnnotatedStruct", _members0);
+          __active = false;
+        }
+      }
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct read (org.omg.CORBA.portable.InputStream istream)
+  {
+    org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = new org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct ();
+    value.stringArray = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (istream);
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value)
+  {
+    org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (ostream, value.stringArray);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
new file mode 100644
index 0000000000..67acde6682
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+public final class AnnotatedStructHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = null;
+
+  public AnnotatedStructHolder ()
+  {
+  }
+
+  public AnnotatedStructHolder (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
new file mode 100644
index 0000000000..1a2c30ee62
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/Color.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public class Color implements org.omg.CORBA.portable.IDLEntity
+{
+  private        int __value;
+  private static int __size = 3;
+  private static org.apache.tuscany.sca.test.corba.generated.Color[] __array = new org.apache.tuscany.sca.test.corba.generated.Color [__size];
+
+  public static final int _red = 0;
+  public static final org.apache.tuscany.sca.test.corba.generated.Color red = new org.apache.tuscany.sca.test.corba.generated.Color(_red);
+  public static final int _yellow = 1;
+  public static final org.apache.tuscany.sca.test.corba.generated.Color yellow = new org.apache.tuscany.sca.test.corba.generated.Color(_yellow);
+  public static final int _green = 2;
+  public static final org.apache.tuscany.sca.test.corba.generated.Color green = new org.apache.tuscany.sca.test.corba.generated.Color(_green);
+
+  public int value ()
+  {
+    return __value;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.Color from_int (int value)
+  {
+    if (value >= 0 && value < __size)
+      return __array[value];
+    else
+      throw new org.omg.CORBA.BAD_PARAM ();
+  }
+
+  protected Color (int value)
+  {
+    __value = value;
+    __array[__value] = this;
+  }
+} // class Color
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
new file mode 100644
index 0000000000..7f358936fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ColorHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class ColorHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/Color:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.Color that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.Color extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().create_enum_tc (org.apache.tuscany.sca.test.corba.generated.ColorHelper.id (), "Color", new String[] { "red", "yellow", "green"} );
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.Color read (org.omg.CORBA.portable.InputStream istream)
+  {
+    return org.apache.tuscany.sca.test.corba.generated.Color.from_int (istream.read_long ());
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.Color value)
+  {
+    ostream.write_long (value.value ());
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
new file mode 100644
index 0000000000..b07e193995
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ColorHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class ColorHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.Color value = null;
+
+  public ColorHolder ()
+  {
+  }
+
+  public ColorHolder (org.apache.tuscany.sca.test.corba.generated.Color initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
new file mode 100644
index 0000000000..1c1cd31dc1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/InnerStruct.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class InnerStruct implements org.omg.CORBA.portable.IDLEntity
+{
+  public int twoDimLongSequence[][] = null;
+  public String stringField = null;
+  public org.apache.tuscany.sca.test.corba.generated.Color color = null;
+
+  public InnerStruct ()
+  {
+  } // ctor
+
+  public InnerStruct (int[][] _twoDimLongSequence, String _stringField, org.apache.tuscany.sca.test.corba.generated.Color _color)
+  {
+    twoDimLongSequence = _twoDimLongSequence;
+    stringField = _stringField;
+    color = _color;
+  } // ctor
+
+} // class InnerStruct
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
new file mode 100644
index 0000000000..565557db2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class InnerStructHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerStruct/InnerStruct:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerStruct that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.InnerStruct extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  private static boolean __active = false;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      synchronized (org.omg.CORBA.TypeCode.class)
+      {
+        if (__typeCode == null)
+        {
+          if (__active)
+          {
+            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
+          }
+          __active = true;
+          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
+          org.omg.CORBA.TypeCode _tcOf_members0 = null;
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", _tcOf_members0);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", _tcOf_members0);
+          _members0[0] = new org.omg.CORBA.StructMember (
+            "twoDimLongSequence",
+            _tcOf_members0,
+            null);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
+          _members0[1] = new org.omg.CORBA.StructMember (
+            "stringField",
+            _tcOf_members0,
+            null);
+          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
+          _members0[2] = new org.omg.CORBA.StructMember (
+            "color",
+            _tcOf_members0,
+            null);
+          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.id (), "InnerStruct", _members0);
+          __active = false;
+        }
+      }
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.InnerStruct read (org.omg.CORBA.portable.InputStream istream)
+  {
+    org.apache.tuscany.sca.test.corba.generated.InnerStruct value = new org.apache.tuscany.sca.test.corba.generated.InnerStruct ();
+    value.twoDimLongSequence = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (istream);
+    value.stringField = istream.read_string ();
+    value.color = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerStruct value)
+  {
+    org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (ostream, value.twoDimLongSequence);
+    ostream.write_string (value.stringField);
+    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.color);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
new file mode 100644
index 0000000000..6e581e5215
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class InnerStructHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.InnerStruct value = null;
+
+  public InnerStructHolder ()
+  {
+  }
+
+  public InnerStructHolder (org.apache.tuscany.sca.test.corba.generated.InnerStruct initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
new file mode 100644
index 0000000000..9c088b8bb9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
@@ -0,0 +1,130 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.corba.generated;

+

+

+/**

+* org/apache/tuscany/sca/test/corba/generated/InnerUnion.java .

+* Generated by the IDL-to-Java compiler (portable), version "3.2"

+* from itest_scenario.idl

+* niedziela, 17 sierpie 2008 19:07:14 CEST

+*/

+

+public final class InnerUnion implements org.omg.CORBA.portable.IDLEntity

+{

+  private int ___x;

+  private float ___y;

+  private int __discriminator;

+  private boolean __uninitialized = true;

+

+  public InnerUnion ()

+  {

+  }

+

+  public int discriminator ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    return __discriminator;

+  }

+

+  public int x ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    verifyx (__discriminator);

+    return ___x;

+  }

+

+  public void x (int value)

+  {

+    __discriminator = 1;

+    ___x = value;

+    __uninitialized = false;

+  }

+

+  public void x (int discriminator, int value)

+  {

+    verifyx (discriminator);

+    __discriminator = discriminator;

+    ___x = value;

+    __uninitialized = false;

+  }

+

+  private void verifyx (int discriminator)

+  {

+    if (discriminator != 1)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+  }

+

+  public float y ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    verifyy (__discriminator);

+    return ___y;

+  }

+

+  public void y (float value)

+  {

+    __discriminator = 2;

+    ___y = value;

+    __uninitialized = false;

+  }

+

+  public void y (int discriminator, float value)

+  {

+    verifyy (discriminator);

+    __discriminator = discriminator;

+    ___y = value;

+    __uninitialized = false;

+  }

+

+  private void verifyy (int discriminator)

+  {

+    if (discriminator != 2)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+  }

+

+  public void _default ()

+  {

+    __discriminator = -2147483648;

+    __uninitialized = false;

+  }

+

+  public void _default (int discriminator)

+  {

+    verifyDefault( discriminator ) ;

+    __discriminator = discriminator ;

+    __uninitialized = false;

+  }

+

+  private void verifyDefault( int value )

+  {

+    switch (value) {

+      case 1:

+      case 2:

+        throw new org.omg.CORBA.BAD_OPERATION() ;

+

+      default:

+        return;

+    }

+  }

+

+} // class InnerUnion

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
new file mode 100644
index 0000000000..50069d7ac8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
@@ -0,0 +1,124 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.corba.generated;

+

+

+/**

+* org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java .

+* Generated by the IDL-to-Java compiler (portable), version "3.2"

+* from itest_scenario.idl

+* niedziela, 17 sierpie 2008 19:07:14 CEST

+*/

+

+abstract public class InnerUnionHelper

+{

+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerUnion/InnerUnion:1.0";

+

+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerUnion that)

+  {

+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();

+    a.type (type ());

+    write (out, that);

+    a.read_value (out.create_input_stream (), type ());

+  }

+

+  public static org.apache.tuscany.sca.test.corba.generated.InnerUnion extract (org.omg.CORBA.Any a)

+  {

+    return read (a.create_input_stream ());

+  }

+

+  private static org.omg.CORBA.TypeCode __typeCode = null;

+  synchronized public static org.omg.CORBA.TypeCode type ()

+  {

+    if (__typeCode == null)

+    {

+      org.omg.CORBA.TypeCode _disTypeCode0;

+      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);

+      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [2];

+      org.omg.CORBA.TypeCode _tcOf_members0;

+      org.omg.CORBA.Any _anyOf_members0;

+

+      // Branch for x (case label 1)

+      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();

+      _anyOf_members0.insert_long ((int)1);

+      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);

+      _members0[0] = new org.omg.CORBA.UnionMember (

+        "x",

+        _anyOf_members0,

+        _tcOf_members0,

+        null);

+

+      // Branch for y (case label 2)

+      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();

+      _anyOf_members0.insert_long ((int)2);

+      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);

+      _members0[1] = new org.omg.CORBA.UnionMember (

+        "y",

+        _anyOf_members0,

+        _tcOf_members0,

+        null);

+      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.id (), "InnerUnion", _disTypeCode0, _members0);

+    }

+    return __typeCode;

+  }

+

+  public static String id ()

+  {

+    return _id;

+  }

+

+  public static org.apache.tuscany.sca.test.corba.generated.InnerUnion read (org.omg.CORBA.portable.InputStream istream)

+  {

+    org.apache.tuscany.sca.test.corba.generated.InnerUnion value = new org.apache.tuscany.sca.test.corba.generated.InnerUnion ();

+    int _dis0 = (int)0;

+    _dis0 = istream.read_long ();

+    switch (_dis0)

+    {

+      case 1:

+        int _x = (int)0;

+        _x = istream.read_long ();

+        value.x (_x);

+        break;

+      case 2:

+        float _y = (float)0;

+        _y = istream.read_float ();

+        value.y (_y);

+        break;

+      default:

+        value._default( _dis0 ) ;

+        break;

+    }

+    return value;

+  }

+

+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerUnion value)

+  {

+    ostream.write_long (value.discriminator ());

+    switch (value.discriminator ())

+    {

+      case 1:

+        ostream.write_long (value.x ());

+        break;

+      case 2:

+        ostream.write_float (value.y ());

+        break;

+    }

+  }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
new file mode 100644
index 0000000000..e63120a083
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
@@ -0,0 +1,56 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.corba.generated;

+

+/**

+* org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java .

+* Generated by the IDL-to-Java compiler (portable), version "3.2"

+* from itest_scenario.idl

+* niedziela, 17 sierpie 2008 19:07:14 CEST

+*/

+

+public final class InnerUnionHolder implements org.omg.CORBA.portable.Streamable

+{

+  public org.apache.tuscany.sca.test.corba.generated.InnerUnion value = null;

+

+  public InnerUnionHolder ()

+  {

+  }

+

+  public InnerUnionHolder (org.apache.tuscany.sca.test.corba.generated.InnerUnion initialValue)

+  {

+    value = initialValue;

+  }

+

+  public void _read (org.omg.CORBA.portable.InputStream i)

+  {

+    value = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (i);

+  }

+

+  public void _write (org.omg.CORBA.portable.OutputStream o)

+  {

+    org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (o, value);

+  }

+

+  public org.omg.CORBA.TypeCode _type ()

+  {

+    return org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type ();

+  }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
new file mode 100644
index 0000000000..b8e3e16a31
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class LongSequenceHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/LongSequence:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, int[] that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static int[] extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
+      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
+      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode);
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static int[] read (org.omg.CORBA.portable.InputStream istream)
+  {
+    int value[] = null;
+    int _len0 = istream.read_long ();
+    value = new int[_len0];
+    istream.read_long_array (value, 0, _len0);
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, int[] value)
+  {
+    ostream.write_long (value.length);
+    ostream.write_long_array (value, 0, value.length);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
new file mode 100644
index 0000000000..292c3af11b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class LongSequenceHolder implements org.omg.CORBA.portable.Streamable
+{
+  public int value[] = null;
+
+  public LongSequenceHolder ()
+  {
+  }
+
+  public LongSequenceHolder (int[] initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
new file mode 100644
index 0000000000..8a6047c92e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/RichStruct.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class RichStruct implements org.omg.CORBA.portable.IDLEntity
+{
+  public org.apache.tuscany.sca.test.corba.generated.InnerStruct innerStruct = null;
+  public String stringSequence[] = null;
+  public int longField = (int)0;
+
+  public RichStruct ()
+  {
+  } // ctor
+
+  public RichStruct (org.apache.tuscany.sca.test.corba.generated.InnerStruct _innerStruct, String[] _stringSequence, int _longField)
+  {
+    innerStruct = _innerStruct;
+    stringSequence = _stringSequence;
+    longField = _longField;
+  } // ctor
+
+} // class RichStruct
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
new file mode 100644
index 0000000000..d9fcc63371
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class RichStructHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichStruct/RichStruct:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichStruct that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.RichStruct extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  private static boolean __active = false;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      synchronized (org.omg.CORBA.TypeCode.class)
+      {
+        if (__typeCode == null)
+        {
+          if (__active)
+          {
+            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
+          }
+          __active = true;
+          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
+          org.omg.CORBA.TypeCode _tcOf_members0 = null;
+          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type ();
+          _members0[0] = new org.omg.CORBA.StructMember (
+            "innerStruct",
+            _tcOf_members0,
+            null);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", _tcOf_members0);
+          _members0[1] = new org.omg.CORBA.StructMember (
+            "stringSequence",
+            _tcOf_members0,
+            null);
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
+          _members0[2] = new org.omg.CORBA.StructMember (
+            "longField",
+            _tcOf_members0,
+            null);
+          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.RichStructHelper.id (), "RichStruct", _members0);
+          __active = false;
+        }
+      }
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.RichStruct read (org.omg.CORBA.portable.InputStream istream)
+  {
+    org.apache.tuscany.sca.test.corba.generated.RichStruct value = new org.apache.tuscany.sca.test.corba.generated.RichStruct ();
+    value.innerStruct = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (istream);
+    value.stringSequence = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (istream);
+    value.longField = istream.read_long ();
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichStruct value)
+  {
+    org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (ostream, value.innerStruct);
+    org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (ostream, value.stringSequence);
+    ostream.write_long (value.longField);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
new file mode 100644
index 0000000000..a3f2c8314e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class RichStructHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.RichStruct value = null;
+
+  public RichStructHolder ()
+  {
+  }
+
+  public RichStructHolder (org.apache.tuscany.sca.test.corba.generated.RichStruct initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.RichStructHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
new file mode 100644
index 0000000000..2c49fac39f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
@@ -0,0 +1,195 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.corba.generated;

+

+

+/**

+* org/apache/tuscany/sca/test/corba/generated/RichUnion.java .

+* Generated by the IDL-to-Java compiler (portable), version "3.2"

+* from itest_scenario.idl

+* niedziela, 17 sierpie 2008 19:07:14 CEST

+*/

+

+public final class RichUnion implements org.omg.CORBA.portable.IDLEntity

+{

+  private int ___x;

+  private float ___y;

+  private String ___z;

+  private org.apache.tuscany.sca.test.corba.generated.InnerUnion ___iu;

+  private boolean ___a;

+  private int __discriminator;

+  private boolean __uninitialized = true;

+

+  public RichUnion ()

+  {

+  }

+

+  public int discriminator ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    return __discriminator;

+  }

+

+  public int x ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    verifyx (__discriminator);

+    return ___x;

+  }

+

+  public void x (int value)

+  {

+    __discriminator = 1;

+    ___x = value;

+    __uninitialized = false;

+  }

+

+  public void x (int discriminator, int value)

+  {

+    verifyx (discriminator);

+    __discriminator = discriminator;

+    ___x = value;

+    __uninitialized = false;

+  }

+

+  private void verifyx (int discriminator)

+  {

+    if (discriminator != 1)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+  }

+

+  public float y ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    verifyy (__discriminator);

+    return ___y;

+  }

+

+  public void y (float value)

+  {

+    __discriminator = 2;

+    ___y = value;

+    __uninitialized = false;

+  }

+

+  public void y (int discriminator, float value)

+  {

+    verifyy (discriminator);

+    __discriminator = discriminator;

+    ___y = value;

+    __uninitialized = false;

+  }

+

+  private void verifyy (int discriminator)

+  {

+    if (discriminator != 2)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+  }

+

+  public String z ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    verifyz (__discriminator);

+    return ___z;

+  }

+

+  public void z (String value)

+  {

+    __discriminator = 3;

+    ___z = value;

+    __uninitialized = false;

+  }

+

+  public void z (int discriminator, String value)

+  {

+    verifyz (discriminator);

+    __discriminator = discriminator;

+    ___z = value;

+    __uninitialized = false;

+  }

+

+  private void verifyz (int discriminator)

+  {

+    if (discriminator != 3)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+  }

+

+  public org.apache.tuscany.sca.test.corba.generated.InnerUnion iu ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    verifyiu (__discriminator);

+    return ___iu;

+  }

+

+  public void iu (org.apache.tuscany.sca.test.corba.generated.InnerUnion value)

+  {

+    __discriminator = 4;

+    ___iu = value;

+    __uninitialized = false;

+  }

+

+  public void iu (int discriminator, org.apache.tuscany.sca.test.corba.generated.InnerUnion value)

+  {

+    verifyiu (discriminator);

+    __discriminator = discriminator;

+    ___iu = value;

+    __uninitialized = false;

+  }

+

+  private void verifyiu (int discriminator)

+  {

+    if (discriminator != 4)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+  }

+

+  public boolean a ()

+  {

+    if (__uninitialized)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+    verifya (__discriminator);

+    return ___a;

+  }

+

+  public void a (boolean value)

+  {

+    __discriminator = -2147483648;

+    ___a = value;

+    __uninitialized = false;

+  }

+

+  public void a (int discriminator, boolean value)

+  {

+    verifya (discriminator);

+    __discriminator = discriminator;

+    ___a = value;

+    __uninitialized = false;

+  }

+

+  private void verifya (int discriminator)

+  {

+    if (discriminator == 1 || discriminator == 2 || discriminator == 3 || discriminator == 4)

+      throw new org.omg.CORBA.BAD_OPERATION ();

+  }

+

+} // class RichUnion

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
new file mode 100644
index 0000000000..5b1b710919
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
@@ -0,0 +1,175 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.corba.generated;

+

+

+/**

+* org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java .

+* Generated by the IDL-to-Java compiler (portable), version "3.2"

+* from itest_scenario.idl

+* niedziela, 17 sierpie 2008 19:07:14 CEST

+*/

+

+abstract public class RichUnionHelper

+{

+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichUnion/RichUnion:1.0";

+

+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichUnion that)

+  {

+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();

+    a.type (type ());

+    write (out, that);

+    a.read_value (out.create_input_stream (), type ());

+  }

+

+  public static org.apache.tuscany.sca.test.corba.generated.RichUnion extract (org.omg.CORBA.Any a)

+  {

+    return read (a.create_input_stream ());

+  }

+

+  private static org.omg.CORBA.TypeCode __typeCode = null;

+  synchronized public static org.omg.CORBA.TypeCode type ()

+  {

+    if (__typeCode == null)

+    {

+      org.omg.CORBA.TypeCode _disTypeCode0;

+      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);

+      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [5];

+      org.omg.CORBA.TypeCode _tcOf_members0;

+      org.omg.CORBA.Any _anyOf_members0;

+

+      // Branch for x (case label 1)

+      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();

+      _anyOf_members0.insert_long ((int)1);

+      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);

+      _members0[0] = new org.omg.CORBA.UnionMember (

+        "x",

+        _anyOf_members0,

+        _tcOf_members0,

+        null);

+

+      // Branch for y (case label 2)

+      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();

+      _anyOf_members0.insert_long ((int)2);

+      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);

+      _members0[1] = new org.omg.CORBA.UnionMember (

+        "y",

+        _anyOf_members0,

+        _tcOf_members0,

+        null);

+

+      // Branch for z (case label 3)

+      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();

+      _anyOf_members0.insert_long ((int)3);

+      _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);

+      _members0[2] = new org.omg.CORBA.UnionMember (

+        "z",

+        _anyOf_members0,

+        _tcOf_members0,

+        null);

+

+      // Branch for iu (case label 4)

+      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();

+      _anyOf_members0.insert_long ((int)4);

+      _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type ();

+      _members0[3] = new org.omg.CORBA.UnionMember (

+        "iu",

+        _anyOf_members0,

+        _tcOf_members0,

+        null);

+

+      // Branch for a (Default case)

+      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();

+      _anyOf_members0.insert_octet ((byte)0); // default member label

+      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_boolean);

+      _members0[4] = new org.omg.CORBA.UnionMember (

+        "a",

+        _anyOf_members0,

+        _tcOf_members0,

+        null);

+      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.id (), "RichUnion", _disTypeCode0, _members0);

+    }

+    return __typeCode;

+  }

+

+  public static String id ()

+  {

+    return _id;

+  }

+

+  public static org.apache.tuscany.sca.test.corba.generated.RichUnion read (org.omg.CORBA.portable.InputStream istream)

+  {

+    org.apache.tuscany.sca.test.corba.generated.RichUnion value = new org.apache.tuscany.sca.test.corba.generated.RichUnion ();

+    int _dis0 = (int)0;

+    _dis0 = istream.read_long ();

+    switch (_dis0)

+    {

+      case 1:

+        int _x = (int)0;

+        _x = istream.read_long ();

+        value.x (_x);

+        break;

+      case 2:

+        float _y = (float)0;

+        _y = istream.read_float ();

+        value.y (_y);

+        break;

+      case 3:

+        String _z = null;

+        _z = istream.read_string ();

+        value.z (_z);

+        break;

+      case 4:

+        org.apache.tuscany.sca.test.corba.generated.InnerUnion _iu = null;

+        _iu = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (istream);

+        value.iu (_iu);

+        break;

+      default:

+        boolean _a = false;

+        _a = istream.read_boolean ();

+        value.a (_dis0, _a);

+        break;

+    }

+    return value;

+  }

+

+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichUnion value)

+  {

+    ostream.write_long (value.discriminator ());

+    switch (value.discriminator ())

+    {

+      case 1:

+        ostream.write_long (value.x ());

+        break;

+      case 2:

+        ostream.write_float (value.y ());

+        break;

+      case 3:

+        ostream.write_string (value.z ());

+        break;

+      case 4:

+        org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (ostream, value.iu ());

+        break;

+      default:

+        ostream.write_boolean (value.a ());

+        break;

+    }

+  }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
new file mode 100644
index 0000000000..3bf646a485
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
@@ -0,0 +1,56 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.corba.generated;

+

+/**

+* org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java .

+* Generated by the IDL-to-Java compiler (portable), version "3.2"

+* from itest_scenario.idl

+* niedziela, 17 sierpie 2008 19:07:14 CEST

+*/

+

+public final class RichUnionHolder implements org.omg.CORBA.portable.Streamable

+{

+  public org.apache.tuscany.sca.test.corba.generated.RichUnion value = null;

+

+  public RichUnionHolder ()

+  {

+  }

+

+  public RichUnionHolder (org.apache.tuscany.sca.test.corba.generated.RichUnion initialValue)

+  {

+    value = initialValue;

+  }

+

+  public void _read (org.omg.CORBA.portable.InputStream i)

+  {

+    value = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (i);

+  }

+

+  public void _write (org.omg.CORBA.portable.OutputStream o)

+  {

+    org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (o, value);

+  }

+

+  public org.omg.CORBA.TypeCode _type ()

+  {

+    return org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.type ();

+  }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
new file mode 100644
index 0000000000..08ca7c699a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public interface ScenarioOne extends ScenarioOneOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
+{
+} // interface ScenarioOne
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
new file mode 100644
index 0000000000..6d189ddc2a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class ScenarioOneHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioOne that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.id (), "ScenarioOne");
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne read (org.omg.CORBA.portable.InputStream istream)
+  {
+    return narrow (istream.read_Object (_ScenarioOneStub.class));
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioOne value)
+  {
+    ostream.write_Object ((org.omg.CORBA.Object) value);
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne narrow (org.omg.CORBA.Object obj)
+  {
+    if (obj == null)
+      return null;
+    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne)
+      return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj;
+    else if (!obj._is_a (id ()))
+      throw new org.omg.CORBA.BAD_PARAM ();
+    else
+    {
+      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
+      org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub ();
+      stub._set_delegate(delegate);
+      return stub;
+    }
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne unchecked_narrow (org.omg.CORBA.Object obj)
+  {
+    if (obj == null)
+      return null;
+    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne)
+      return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj;
+    else
+    {
+      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
+      org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub ();
+      stub._set_delegate(delegate);
+      return stub;
+    }
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
new file mode 100644
index 0000000000..6bb5fe9044
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class ScenarioOneHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.ScenarioOne value = null;
+
+  public ScenarioOneHolder ()
+  {
+  }
+
+  public ScenarioOneHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioOne initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
new file mode 100644
index 0000000000..43aca562ad
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public interface ScenarioOneOperations 
+{
+  org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
+} // interface ScenarioOneOperations
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
new file mode 100644
index 0000000000..73c96c260d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+public interface ScenarioSix extends ScenarioSixOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
+{
+} // interface ScenarioSix
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
new file mode 100644
index 0000000000..6fd029ec6f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+abstract public class ScenarioSixHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioSix that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.id (), "ScenarioSix");
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix read (org.omg.CORBA.portable.InputStream istream)
+  {
+    return narrow (istream.read_Object (_ScenarioSixStub.class));
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioSix value)
+  {
+    ostream.write_Object ((org.omg.CORBA.Object) value);
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix narrow (org.omg.CORBA.Object obj)
+  {
+    if (obj == null)
+      return null;
+    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix)
+      return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj;
+    else if (!obj._is_a (id ()))
+      throw new org.omg.CORBA.BAD_PARAM ();
+    else
+    {
+      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
+      org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub ();
+      stub._set_delegate(delegate);
+      return stub;
+    }
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix unchecked_narrow (org.omg.CORBA.Object obj)
+  {
+    if (obj == null)
+      return null;
+    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix)
+      return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj;
+    else
+    {
+      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
+      org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub ();
+      stub._set_delegate(delegate);
+      return stub;
+    }
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
new file mode 100644
index 0000000000..103db27cd2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+public final class ScenarioSixHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.ScenarioSix value = null;
+
+  public ScenarioSixHolder ()
+  {
+  }
+
+  public ScenarioSixHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioSix initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
new file mode 100644
index 0000000000..c47565e63e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* niedziela, 17 sierpie 2008 19:07:14 CEST
+*/
+
+public interface ScenarioSixOperations 
+{
+  String[][] passStringArray (String[][] arg);
+  org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg);
+  org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg);
+} // interface ScenarioSixOperations
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
new file mode 100644
index 0000000000..b57e098a56
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* wtorek, 15 lipiec 2008 13:36:31 CEST
+*/
+
+
+// objects for ScenarioTwo
+public interface ScenarioTwo extends ScenarioTwoOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
+{
+} // interface ScenarioTwo
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
new file mode 100644
index 0000000000..8ddfa10575
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* wtorek, 15 lipiec 2008 13:36:31 CEST
+*/
+
+
+// objects for ScenarioTwo
+abstract public class ScenarioTwoHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.id (), "ScenarioTwo");
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo read (org.omg.CORBA.portable.InputStream istream)
+  {
+    return narrow (istream.read_Object (_ScenarioTwoStub.class));
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value)
+  {
+    ostream.write_Object ((org.omg.CORBA.Object) value);
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo narrow (org.omg.CORBA.Object obj)
+  {
+    if (obj == null)
+      return null;
+    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)
+      return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj;
+    else if (!obj._is_a (id ()))
+      throw new org.omg.CORBA.BAD_PARAM ();
+    else
+    {
+      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
+      org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub ();
+      stub._set_delegate(delegate);
+      return stub;
+    }
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo unchecked_narrow (org.omg.CORBA.Object obj)
+  {
+    if (obj == null)
+      return null;
+    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)
+      return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj;
+    else
+    {
+      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
+      org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub ();
+      stub._set_delegate(delegate);
+      return stub;
+    }
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
new file mode 100644
index 0000000000..9717629711
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* wtorek, 15 lipiec 2008 13:36:31 CEST
+*/
+
+
+// objects for ScenarioTwo
+public final class ScenarioTwoHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value = null;
+
+  public ScenarioTwoHolder ()
+  {
+  }
+
+  public ScenarioTwoHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
new file mode 100644
index 0000000000..1247b4618d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* wtorek, 15 lipiec 2008 13:36:31 CEST
+*/
+
+
+// objects for ScenarioTwo
+public interface ScenarioTwoOperations 
+{
+  String stringField ();
+  void stringField (String newStringField);
+} // interface ScenarioTwoOperations
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
new file mode 100644
index 0000000000..9f1cb6bc6b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+abstract public class StringArrayHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringArray:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, String[][] that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static String[][] extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
+      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
+      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
+      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", __typeCode);
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static String[][] read (org.omg.CORBA.portable.InputStream istream)
+  {
+    String value[][] = null;
+    value = new String[2][];
+    for (int _o0 = 0;_o0 < (2); ++_o0)
+    {
+      value[_o0] = new String[2];
+      for (int _o1 = 0;_o1 < (2); ++_o1)
+      {
+        value[_o0][_o1] = istream.read_string ();
+      }
+    }
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value)
+  {
+    if (value.length != (2))
+      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+    for (int _i0 = 0;_i0 < (2); ++_i0)
+    {
+      if (value[_i0].length != (2))
+        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+      for (int _i1 = 0;_i1 < (2); ++_i1)
+      {
+        ostream.write_string (value[_i0][_i1]);
+      }
+    }
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
new file mode 100644
index 0000000000..b2906bb13c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* sobota, 16 sierpie 2008 15:31:35 CEST
+*/
+
+public final class StringArrayHolder implements org.omg.CORBA.portable.Streamable
+{
+  public String value[][] = null;
+
+  public StringArrayHolder ()
+  {
+  }
+
+  public StringArrayHolder (String[][] initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
new file mode 100644
index 0000000000..adf72c5c35
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class StringSequenceHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringSequence:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, String[] that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static String[] extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
+      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
+      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", __typeCode);
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static String[] read (org.omg.CORBA.portable.InputStream istream)
+  {
+    String value[] = null;
+    int _len0 = istream.read_long ();
+    value = new String[_len0];
+    for (int _o1 = 0;_o1 < value.length; ++_o1)
+      value[_o1] = istream.read_string ();
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[] value)
+  {
+    ostream.write_long (value.length);
+    for (int _i0 = 0;_i0 < value.length; ++_i0)
+      ostream.write_string (value[_i0]);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
new file mode 100644
index 0000000000..ddaec3549e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class StringSequenceHolder implements org.omg.CORBA.portable.Streamable
+{
+  public String value[] = null;
+
+  public StringSequenceHolder ()
+  {
+  }
+
+  public StringSequenceHolder (String[] initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
new file mode 100644
index 0000000000..993dc155d6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class TwoDimLongSequenceHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequence:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, int[][] that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static int[][] extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
+      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
+      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode);
+      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
+      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", __typeCode);
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static int[][] read (org.omg.CORBA.portable.InputStream istream)
+  {
+    int value[][] = null;
+    int _len0 = istream.read_long ();
+    value = new int[_len0][];
+    for (int _o1 = 0;_o1 < value.length; ++_o1)
+      value[_o1] = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (istream);
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, int[][] value)
+  {
+    ostream.write_long (value.length);
+    for (int _i0 = 0;_i0 < value.length; ++_i0)
+      org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (ostream, value[_i0]);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
new file mode 100644
index 0000000000..6e3deb2251
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class TwoDimLongSequenceHolder implements org.omg.CORBA.portable.Streamable
+{
+  public int value[][] = null;
+
+  public TwoDimLongSequenceHolder ()
+  {
+  }
+
+  public TwoDimLongSequenceHolder (int[][] initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
new file mode 100644
index 0000000000..86787ee968
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class UnexpectedException extends org.omg.CORBA.UserException
+{
+  public String info = null;
+
+  public UnexpectedException ()
+  {
+    super(UnexpectedExceptionHelper.id());
+  } // ctor
+
+  public UnexpectedException (String _info)
+  {
+    super(UnexpectedExceptionHelper.id());
+    info = _info;
+  } // ctor
+
+
+  public UnexpectedException (String $reason, String _info)
+  {
+    super(UnexpectedExceptionHelper.id() + "  " + $reason);
+    info = _info;
+  } // ctor
+
+} // class UnexpectedException
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
new file mode 100644
index 0000000000..6a5646c73d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class UnexpectedExceptionHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.UnexpectedException that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  private static boolean __active = false;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      synchronized (org.omg.CORBA.TypeCode.class)
+      {
+        if (__typeCode == null)
+        {
+          if (__active)
+          {
+            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
+          }
+          __active = true;
+          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1];
+          org.omg.CORBA.TypeCode _tcOf_members0 = null;
+          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
+          _members0[0] = new org.omg.CORBA.StructMember (
+            "info",
+            _tcOf_members0,
+            null);
+          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.id (), "UnexpectedException", _members0);
+          __active = false;
+        }
+      }
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException read (org.omg.CORBA.portable.InputStream istream)
+  {
+    org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = new org.apache.tuscany.sca.test.corba.generated.UnexpectedException ();
+    // read and discard the repository ID
+    istream.read_string ();
+    value.info = istream.read_string ();
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.UnexpectedException value)
+  {
+    // write the repository ID
+    ostream.write_string (id ());
+    ostream.write_string (value.info);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
new file mode 100644
index 0000000000..0f62442652
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class UnexpectedExceptionHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = null;
+
+  public UnexpectedExceptionHolder ()
+  {
+  }
+
+  public UnexpectedExceptionHolder (org.apache.tuscany.sca.test.corba.generated.UnexpectedException initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
new file mode 100644
index 0000000000..1167c7de21
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/WrongColor.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class WrongColor extends org.omg.CORBA.UserException
+{
+  public org.apache.tuscany.sca.test.corba.generated.Color givenColor = null;
+  public org.apache.tuscany.sca.test.corba.generated.Color correctColor = null;
+
+  public WrongColor ()
+  {
+    super(WrongColorHelper.id());
+  } // ctor
+
+  public WrongColor (org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor)
+  {
+    super(WrongColorHelper.id());
+    givenColor = _givenColor;
+    correctColor = _correctColor;
+  } // ctor
+
+
+  public WrongColor (String $reason, org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor)
+  {
+    super(WrongColorHelper.id() + "  " + $reason);
+    givenColor = _givenColor;
+    correctColor = _correctColor;
+  } // ctor
+
+} // class WrongColor
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
new file mode 100644
index 0000000000..fc32fd1db6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+abstract public class WrongColorHelper
+{
+  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.WrongColor that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.WrongColor extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  private static boolean __active = false;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      synchronized (org.omg.CORBA.TypeCode.class)
+      {
+        if (__typeCode == null)
+        {
+          if (__active)
+          {
+            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
+          }
+          __active = true;
+          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2];
+          org.omg.CORBA.TypeCode _tcOf_members0 = null;
+          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
+          _members0[0] = new org.omg.CORBA.StructMember (
+            "givenColor",
+            _tcOf_members0,
+            null);
+          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
+          _members0[1] = new org.omg.CORBA.StructMember (
+            "correctColor",
+            _tcOf_members0,
+            null);
+          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.id (), "WrongColor", _members0);
+          __active = false;
+        }
+      }
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.apache.tuscany.sca.test.corba.generated.WrongColor read (org.omg.CORBA.portable.InputStream istream)
+  {
+    org.apache.tuscany.sca.test.corba.generated.WrongColor value = new org.apache.tuscany.sca.test.corba.generated.WrongColor ();
+    // read and discard the repository ID
+    istream.read_string ();
+    value.givenColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
+    value.correctColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.WrongColor value)
+  {
+    // write the repository ID
+    ostream.write_string (id ());
+    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.givenColor);
+    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.correctColor);
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
new file mode 100644
index 0000000000..9648e29d6d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public final class WrongColorHolder implements org.omg.CORBA.portable.Streamable
+{
+  public org.apache.tuscany.sca.test.corba.generated.WrongColor value = null;
+
+  public WrongColorHolder ()
+  {
+  }
+
+  public WrongColorHolder (org.apache.tuscany.sca.test.corba.generated.WrongColor initialValue)
+  {
+    value = initialValue;
+  }
+
+  public void _read (org.omg.CORBA.portable.InputStream i)
+  {
+    value = org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read (i);
+  }
+
+  public void _write (org.omg.CORBA.portable.OutputStream o)
+  {
+    org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (o, value);
+  }
+
+  public org.omg.CORBA.TypeCode _type ()
+  {
+    return org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.type ();
+  }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
new file mode 100644
index 0000000000..93d9fe164d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public abstract class _ScenarioOneImplBase extends org.omg.CORBA.portable.ObjectImpl
+                implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne, org.omg.CORBA.portable.InvokeHandler
+{
+
+  // Constructors
+  public _ScenarioOneImplBase ()
+  {
+  }
+
+  private static java.util.Hashtable _methods = new java.util.Hashtable ();
+  static
+  {
+    _methods.put ("setRichStruct", new java.lang.Integer (0));
+  }
+
+  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
+                                org.omg.CORBA.portable.InputStream in,
+                                org.omg.CORBA.portable.ResponseHandler $rh)
+  {
+    org.omg.CORBA.portable.OutputStream out = null;
+    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
+    if (__method == null)
+      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+
+    switch (__method.intValue ())
+    {
+       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioOne/setRichStruct
+       {
+         try {
+           org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (in);
+           org.apache.tuscany.sca.test.corba.generated.RichStruct $result = null;
+           $result = this.setRichStruct (richStruct);
+           out = $rh.createReply();
+           org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (out, $result);
+         } catch (org.apache.tuscany.sca.test.corba.generated.WrongColor $ex) {
+           out = $rh.createExceptionReply ();
+           org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (out, $ex);
+         } catch (org.apache.tuscany.sca.test.corba.generated.UnexpectedException $ex) {
+           out = $rh.createExceptionReply ();
+           org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (out, $ex);
+         }
+         break;
+       }
+
+       default:
+         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+    }
+
+    return out;
+  } // _invoke
+
+  // Type-specific CORBA::Object operations
+  private static String[] __ids = {
+    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"};
+
+  public String[] _ids ()
+  {
+    return (String[])__ids.clone ();
+  }
+
+
+} // class _ScenarioOneImplBase
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
new file mode 100644
index 0000000000..622adaf46b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* pitek, 27 czerwiec 2008 20:40:03 CEST
+*/
+
+public class _ScenarioOneStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne
+{
+
+  public org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException
+  {
+            org.omg.CORBA.portable.InputStream $in = null;
+            try {
+                org.omg.CORBA.portable.OutputStream $out = _request ("setRichStruct", true);
+                org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write ($out, richStruct);
+                $in = _invoke ($out);
+                org.apache.tuscany.sca.test.corba.generated.RichStruct $result = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read ($in);
+                return $result;
+            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+                $in = $ex.getInputStream ();
+                String _id = $ex.getId ();
+                if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0"))
+                    throw org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read ($in);
+                else if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0"))
+                    throw org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read ($in);
+                else
+                    throw new org.omg.CORBA.MARSHAL (_id);
+            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+                return setRichStruct (richStruct        );
+            } finally {
+                _releaseReply ($in);
+            }
+  } // setRichStruct
+
+  // Type-specific CORBA::Object operations
+  private static String[] __ids = {
+    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"};
+
+  public String[] _ids ()
+  {
+    return (String[])__ids.clone ();
+  }
+
+  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
+  {
+     String str = s.readUTF ();
+     String[] args = null;
+     java.util.Properties props = null;
+     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
+     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
+     _set_delegate (delegate);
+  }
+
+  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
+  {
+     String[] args = null;
+     java.util.Properties props = null;
+     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
+     s.writeUTF (str);
+  }
+} // class _ScenarioOneStub
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
new file mode 100644
index 0000000000..117d1d6382
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* niedziela, 17 sierpie 2008 23:35:36 CEST
+*/
+
+public abstract class _ScenarioSixImplBase extends org.omg.CORBA.portable.ObjectImpl
+                implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix, org.omg.CORBA.portable.InvokeHandler
+{
+
+  // Constructors
+  public _ScenarioSixImplBase ()
+  {
+  }
+
+  private static java.util.Hashtable _methods = new java.util.Hashtable ();
+  static
+  {
+    _methods.put ("passStringArray", new java.lang.Integer (0));
+    _methods.put ("passAnnotatedStruct", new java.lang.Integer (1));
+    _methods.put ("passRichUnion", new java.lang.Integer (2));
+  }
+
+  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
+                                org.omg.CORBA.portable.InputStream in,
+                                org.omg.CORBA.portable.ResponseHandler $rh)
+  {
+    org.omg.CORBA.portable.OutputStream out = null;
+    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
+    if (__method == null)
+      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+
+    switch (__method.intValue ())
+    {
+       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passStringArray
+       {
+         String arg[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (in);
+         String $result[][] = null;
+         $result = this.passStringArray (arg);
+         out = $rh.createReply();
+         org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (out, $result);
+         break;
+       }
+
+       case 1:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passAnnotatedStruct
+       {
+         org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (in);
+         org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = null;
+         $result = this.passAnnotatedStruct (arg);
+         out = $rh.createReply();
+         org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (out, $result);
+         break;
+       }
+
+       case 2:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passRichUnion
+       {
+         org.apache.tuscany.sca.test.corba.generated.RichUnion arg = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (in);
+         org.apache.tuscany.sca.test.corba.generated.RichUnion $result = null;
+         $result = this.passRichUnion (arg);
+         out = $rh.createReply();
+         org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (out, $result);
+         break;
+       }
+
+       default:
+         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+    }
+
+    return out;
+  } // _invoke
+
+  // Type-specific CORBA::Object operations
+  private static String[] __ids = {
+    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"};
+
+  public String[] _ids ()
+  {
+    return (String[])__ids.clone ();
+  }
+
+
+} // class _ScenarioSixImplBase
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
new file mode 100644
index 0000000000..eba1b61fa3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* niedziela, 17 sierpie 2008 19:07:14 CEST
+*/
+
+public class _ScenarioSixStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix
+{
+
+  public String[][] passStringArray (String[][] arg)
+  {
+            org.omg.CORBA.portable.InputStream $in = null;
+            try {
+                org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true);
+                org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write ($out, arg);
+                $in = _invoke ($out);
+                String $result[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read ($in);
+                return $result;
+            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+                $in = $ex.getInputStream ();
+                String _id = $ex.getId ();
+                throw new org.omg.CORBA.MARSHAL (_id);
+            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+                return passStringArray (arg        );
+            } finally {
+                _releaseReply ($in);
+            }
+  } // passStringArray
+
+  public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg)
+  {
+            org.omg.CORBA.portable.InputStream $in = null;
+            try {
+                org.omg.CORBA.portable.OutputStream $out = _request ("passAnnotatedStruct", true);
+                org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write ($out, arg);
+                $in = _invoke ($out);
+                org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read ($in);
+                return $result;
+            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+                $in = $ex.getInputStream ();
+                String _id = $ex.getId ();
+                throw new org.omg.CORBA.MARSHAL (_id);
+            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+                return passAnnotatedStruct (arg        );
+            } finally {
+                _releaseReply ($in);
+            }
+  } // passAnnotatedStruct
+
+  public org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg)
+  {
+            org.omg.CORBA.portable.InputStream $in = null;
+            try {
+                org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true);
+                org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write ($out, arg);
+                $in = _invoke ($out);
+                org.apache.tuscany.sca.test.corba.generated.RichUnion $result = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read ($in);
+                return $result;
+            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+                $in = $ex.getInputStream ();
+                String _id = $ex.getId ();
+                throw new org.omg.CORBA.MARSHAL (_id);
+            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+                return passRichUnion (arg        );
+            } finally {
+                _releaseReply ($in);
+            }
+  } // passRichUnion
+
+  // Type-specific CORBA::Object operations
+  private static String[] __ids = {
+    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"};
+
+  public String[] _ids ()
+  {
+    return (String[])__ids.clone ();
+  }
+
+  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
+  {
+     String str = s.readUTF ();
+     String[] args = null;
+     java.util.Properties props = null;
+     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
+     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
+     _set_delegate (delegate);
+  }
+
+  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
+  {
+     String[] args = null;
+     java.util.Properties props = null;
+     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
+     s.writeUTF (str);
+  }
+} // class _ScenarioSixStub
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
new file mode 100644
index 0000000000..750006cec6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* wtorek, 15 lipiec 2008 13:36:31 CEST
+*/
+
+
+// objects for ScenarioTwo
+public abstract class _ScenarioTwoImplBase extends org.omg.CORBA.portable.ObjectImpl
+                implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo, org.omg.CORBA.portable.InvokeHandler
+{
+
+  // Constructors
+  public _ScenarioTwoImplBase ()
+  {
+  }
+
+  private static java.util.Hashtable _methods = new java.util.Hashtable ();
+  static
+  {
+    _methods.put ("_get_stringField", new java.lang.Integer (0));
+    _methods.put ("_set_stringField", new java.lang.Integer (1));
+  }
+
+  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
+                                org.omg.CORBA.portable.InputStream in,
+                                org.omg.CORBA.portable.ResponseHandler $rh)
+  {
+    org.omg.CORBA.portable.OutputStream out = null;
+    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
+    if (__method == null)
+      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+
+    switch (__method.intValue ())
+    {
+       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_get_stringField
+       {
+         String $result = null;
+         $result = this.stringField ();
+         out = $rh.createReply();
+         out.write_string ($result);
+         break;
+       }
+
+       case 1:  // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_set_stringField
+       {
+         String newStringField = in.read_string ();
+         this.stringField (newStringField);
+         out = $rh.createReply();
+         break;
+       }
+
+       default:
+         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+    }
+
+    return out;
+  } // _invoke
+
+  // Type-specific CORBA::Object operations
+  private static String[] __ids = {
+    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"};
+
+  public String[] _ids ()
+  {
+    return (String[])__ids.clone ();
+  }
+
+
+} // class _ScenarioTwoImplBase
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
new file mode 100644
index 0000000000..ef9f561d1b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.generated;
+
+
+/**
+* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from itest_scenario.idl
+* wtorek, 15 lipiec 2008 13:36:31 CEST
+*/
+
+
+// objects for ScenarioTwo
+public class _ScenarioTwoStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo
+{
+
+  public String stringField ()
+  {
+            org.omg.CORBA.portable.InputStream $in = null;
+            try {
+                org.omg.CORBA.portable.OutputStream $out = _request ("_get_stringField", true);
+                $in = _invoke ($out);
+                String $result = $in.read_string ();
+                return $result;
+            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+                $in = $ex.getInputStream ();
+                String _id = $ex.getId ();
+                throw new org.omg.CORBA.MARSHAL (_id);
+            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+                return stringField (        );
+            } finally {
+                _releaseReply ($in);
+            }
+  } // stringField
+
+  public void stringField (String newStringField)
+  {
+            org.omg.CORBA.portable.InputStream $in = null;
+            try {
+                org.omg.CORBA.portable.OutputStream $out = _request ("_set_stringField", true);
+                $out.write_string (newStringField);
+                $in = _invoke ($out);
+                return;
+            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+                $in = $ex.getInputStream ();
+                String _id = $ex.getId ();
+                throw new org.omg.CORBA.MARSHAL (_id);
+            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+                stringField (newStringField        );
+            } finally {
+                _releaseReply ($in);
+            }
+  } // stringField
+
+  // Type-specific CORBA::Object operations
+  private static String[] __ids = {
+    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"};
+
+  public String[] _ids ()
+  {
+    return (String[])__ids.clone ();
+  }
+
+  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
+  {
+     String str = s.readUTF ();
+     String[] args = null;
+     java.util.Properties props = null;
+     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
+     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
+     _set_delegate (delegate);
+  }
+
+  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
+  {
+     String[] args = null;
+     java.util.Properties props = null;
+     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
+     s.writeUTF (str);
+  }
+} // class _ScenarioTwoStub
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
new file mode 100644
index 0000000000..4f6eacc9ff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * @version $Rev$ $Date$
+ * Operations for scenario five
+ */
+@Remotable
+public interface ScenarioFive {
+
+    void doNothing();
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
new file mode 100644
index 0000000000..a3be6daa23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ * Component for obtaining ScenarioFive reference
+ */
+public class ScenarioFiveComponent {
+
+    private ScenarioFive scenarioFive;
+
+    @Reference
+    public void setScenarioFive(ScenarioFive scenarioFive) {
+        this.scenarioFive = scenarioFive;
+    }
+    
+    public ScenarioFive getScenarioFive() {
+        return scenarioFive;
+    }
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
new file mode 100644
index 0000000000..dc752a2aea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Implementation of ScenarioFive service
+ */
+public class ScenarioFiveImpl implements ScenarioFive {
+
+    public void doNothing() {
+        // does nothing
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
new file mode 100644
index 0000000000..aec0f7b1bf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * @version $Rev$ $Date$
+ * Operations for ScenarioFour
+ */
+@Remotable
+public interface ScenarioFour {
+
+    ScenarioFourStruct setStruct(ScenarioFourStruct struct);
+
+    void exceptionTest() throws ScenarioFourException;
+
+    ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
new file mode 100644
index 0000000000..04aef326af
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ * Component for obtaining ScenarioFour reference
+ */
+public class ScenarioFourComponent {
+
+    private ScenarioFour scenarioFour;
+
+    @Reference
+    public void setScenarioFour(ScenarioFour scenarioFour) {
+        this.scenarioFour = scenarioFour;
+    }
+
+    public ScenarioFour getScenarioFour() {
+        return scenarioFour;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
new file mode 100644
index 0000000000..bc76373633
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Exception for ScenarioFour tests
+ */
+public class ScenarioFourException extends Exception {
+
+    public static final String DEFAULT_CONTENT = "Test";
+    
+    private static final long serialVersionUID = 1L;
+    private String content;
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
new file mode 100644
index 0000000000..2f10177bd0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
+
+/**
+ * @version $Rev$ $Date$
+ * Implementation of ScenarioFour service
+ */
+public class ScenarioFourImpl implements ScenarioFour {
+
+    public ScenarioFourStruct setStruct(ScenarioFourStruct struct) {
+        return struct;
+    }
+
+    public void exceptionTest() throws ScenarioFourException {
+        ScenarioFourException exception = new ScenarioFourException();
+        exception.setContent(ScenarioFourException.DEFAULT_CONTENT);
+        throw exception;
+    }
+
+    public ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo) {
+        return scenarioFourSdo;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
new file mode 100644
index 0000000000..de8624455f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Type for ScenarioFour test
+ */
+public class ScenarioFourStruct {
+
+    public String field1;
+    public int field2;
+    public double[] field3;
+
+    public boolean equals(ScenarioFourStruct arg) {
+        return (field1 != null && arg.field1 != null
+            && field1.equals(arg.field1)
+            && field2 == arg.field2
+            && field3 != null
+            && arg.field3 != null && field3.length == arg.field3.length);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
new file mode 100644
index 0000000000..30e4e2994a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.generated.RichStruct;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioOne;
+import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations;
+import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
+import org.apache.tuscany.sca.test.corba.generated.WrongColor;
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ * Component for reference using generated interface.
+ */
+public class ScenarioOneComponent implements ScenarioOneOperations {
+
+    private ScenarioOne scenarionOne;
+
+    @Reference
+    public void setScenarioOne(ScenarioOne scenarioOne) {
+        this.scenarionOne = scenarioOne;
+    }
+
+    public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException {
+        return scenarionOne.setRichStruct(richStruct);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
new file mode 100644
index 0000000000..9b49adbfbb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.generated.Color;
+import org.apache.tuscany.sca.test.corba.generated.RichStruct;
+import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
+import org.apache.tuscany.sca.test.corba.generated.WrongColor;
+import org.apache.tuscany.sca.test.corba.generated._ScenarioOneImplBase;
+
+/**
+ * @version $Rev$ $Date$
+ * Servant for generated interface. Uses generated classes.
+ */
+public class ScenarioOneServant extends _ScenarioOneImplBase {
+
+    private static final long serialVersionUID = 1L;
+
+    public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException {
+        if (richStruct.innerStruct.color.value() == Color.red.value()) {
+            throw new WrongColor(richStruct.innerStruct.color, Color.green);
+        } else if (richStruct.longField == 0) {
+            throw new UnexpectedException("Expected richStruct.longField != 0");
+        }
+        return richStruct;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
new file mode 100644
index 0000000000..7889a80bf1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct;
+import org.apache.tuscany.sca.test.corba.generated.RichUnion;
+import org.apache.tuscany.sca.test.corba.generated._ScenarioSixImplBase;
+
+/**
+ * @version $Rev$ $Date$
+ * Scenario six servant for generated interface. 
+ */
+public class ScenarioSixServant extends _ScenarioSixImplBase {
+
+    private static final long serialVersionUID = 1L;
+
+    public String[][] passStringArray(String[][] arg) {
+        return arg;
+    }
+
+    public AnnotatedStruct passAnnotatedStruct(AnnotatedStruct arg) {
+        return arg;
+    }
+    
+    public RichUnion passRichUnion(RichUnion arg) {
+        return arg;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
new file mode 100644
index 0000000000..cdd49904d3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.generated._ScenarioTwoImplBase;
+
+/**
+ * @version $Rev$ $Date$
+ * Servant for generated interface. 
+ */
+public class ScenarioTwoServant extends _ScenarioTwoImplBase {
+
+    private static final long serialVersionUID = 1L;
+
+    private String stringField = "";
+
+    public String stringField() {
+        return stringField;
+    }
+
+    public void stringField(String newStringField) {
+        this.stringField = newStringField;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
new file mode 100644
index 0000000000..adb48aa159
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.binding.corba.meta.CorbaArray;
+
+/**
+ * @version $Rev$ $Date$ Scenario six structure used by Tuscany.
+ */
+public final class TAnnotatedStruct {
+
+    @CorbaArray( {2, 2})
+    public String[][] stringArray;
+
+    public TAnnotatedStruct() {
+
+    }
+
+    public TAnnotatedStruct(String[][] stringArray) {
+        this.stringArray = stringArray;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
new file mode 100644
index 0000000000..71003d008f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * User provided enum representation for Color type.
+ */
+public class TColor {
+
+    private int value;
+
+    public static final int _red = 0;
+    public static final int _yellow = 1;
+    public static final int _green = 2;
+
+    public static final TColor red = new TColor(_red);
+    public static final TColor yellow = new TColor(_yellow);
+    public static final TColor green = new TColor(_green);
+
+    public int value() {
+        return value;
+    }
+
+    public static TColor from_int(int value) {
+        switch (value) {
+            case 0:
+                return red;
+            case 1:
+                return yellow;
+            case 2:
+                return green;
+        }
+        return green;
+    }
+
+    protected TColor(int value) {
+        this.value = value;
+    }
+    
+    public TColor() {
+        
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
new file mode 100644
index 0000000000..271f1e669b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * User provided interface representation for InnerStruct type.
+ */
+public final class TInnerStruct {
+
+    public int[][] twoDimLongSequence;
+    public String stringField;
+    public TColor color;
+
+    public TInnerStruct() {
+
+    }
+
+    public TInnerStruct(int[][] a1, String a2, TColor a3) {
+        twoDimLongSequence = a1;
+        stringField = a2;
+        color = a3;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
new file mode 100644
index 0000000000..d7734c48a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement;
+import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElementType;
+
+/**
+ * @version $Rev$ $Date$
+ * User provided interface representation for CORBA InnerUnion type.
+ */
+public final class TInnerUnion {
+
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
+    private int x;
+   
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
+    private float y;
+    
+    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
+    @SuppressWarnings("unused")
+    private int discriminator;
+
+    public int getX() {
+        return x;
+    }
+
+    public void setX(int x) {
+        discriminator = 1;
+        this.x = x;
+    }
+
+    public float getY() {
+        return y;
+    }
+
+    public void setY(float y) {
+        discriminator = 2;
+        this.y = y;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
new file mode 100644
index 0000000000..1b44da9752
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * User provided interface representation for RichStruct type.
+ */
+public final class TRichStruct {
+
+    public TInnerStruct innerStruct;
+    public String[] stringSequence;
+    public int longField;
+
+    public TRichStruct() {
+
+    }
+
+    public TRichStruct(TInnerStruct a1, String[] a2, int a3) {
+        innerStruct = a1;
+        stringSequence = a2;
+        longField = a3;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
new file mode 100644
index 0000000000..eb76c94643
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement;
+import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElementType;
+
+/**
+ * @version $Rev$ $Date$
+ * User provided interface representation for CORBA RichUnion type.
+ */
+public final class TRichUnion {
+
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
+    private int x;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
+    private float y;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 3)
+    private String z;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 4)
+    private TInnerUnion iu;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.defaultOption)
+    private boolean def;
+
+    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
+    @SuppressWarnings("unused")
+    private int discriminator = -1;
+
+    public int getX() {
+        return x;
+    }
+
+    public void setX(int x) {
+        this.discriminator = 1;
+        this.x = x;
+    }
+
+    public float getY() {
+        return y;
+    }
+
+    public void setY(float y) {
+        this.discriminator = 2;
+        this.y = y;
+    }
+
+    public String getZ() {
+        return z;
+    }
+
+    public void setZ(String z) {
+        this.discriminator = 3;
+        this.z = z;
+    }
+
+    public boolean isDef() {
+        return def;
+    }
+
+    public void setDef(boolean def) {
+        this.discriminator = -1;
+        this.def = def;
+    }
+
+    public TInnerUnion getIu() {
+        return iu;
+    }
+
+    public void setIu(TInnerUnion iu) {
+        this.discriminator = 4;
+        this.iu = iu;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
new file mode 100644
index 0000000000..922759cd8d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
+import org.apache.tuscany.sca.test.corba.generated.WrongColor;
+
+/**
+ * @version $Rev$ $Date$
+ * User provided CORBA service interface.
+ */
+public interface TScenarioOne {
+
+    TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException;
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
new file mode 100644
index 0000000000..a4f15488cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
+import org.apache.tuscany.sca.test.corba.generated.WrongColor;
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ * Component for reference using user provided interface.
+ */
+public class TScenarioOneComponent implements TScenarioOne {
+
+    private TScenarioOne scenarionOne;
+
+    @Reference
+    public void setScenarioOne(TScenarioOne scenarioOne) {
+        this.scenarionOne = scenarioOne;
+    }
+
+    public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException {
+        return scenarionOne.setRichStruct(richStruct);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
new file mode 100644
index 0000000000..47f0775c16
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.test.corba.generated.Color;
+import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
+import org.apache.tuscany.sca.test.corba.generated.WrongColor;
+
+/**
+ * @version $Rev$ $Date$
+ * Servant for user provided interface. Uses T* classes.
+ */
+public class TScenarioOneServant implements TScenarioOne {
+
+    private static final long serialVersionUID = 1L;
+
+    public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException {
+        if (richStruct.innerStruct.color.value() == Color.red.value()) {
+            Color translatedColor = Color.from_int(richStruct.innerStruct.color.value());
+            throw new WrongColor(translatedColor, Color.green);
+        } else if (richStruct.longField == 0) {
+            throw new UnexpectedException("Expected richStruct.longField != 0");
+        }
+        return richStruct;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
new file mode 100644
index 0000000000..3b4943a43d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.apache.tuscany.sca.binding.corba.meta.CorbaArray;
+
+/**
+ * @version $Rev$ $Date$
+ * Operations for scenario six.
+ */
+public interface TScenarioSix {
+
+    @CorbaArray( {2, 2})
+    public String[][] passStringArray(@CorbaArray( {2, 2})String[][] arg);
+
+    public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg);
+    
+    public TRichUnion passRichUnion(TRichUnion arg);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
new file mode 100644
index 0000000000..7d43badb23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ * Component for obtaining ScenartioSix reference.
+ */
+public class TScenarioSixComponent {
+
+    private TScenarioSix scenarioSix;
+
+    @Reference
+    public void setScenarioSix(TScenarioSix scenarioSix) {
+        this.scenarioSix = scenarioSix;
+    }
+    
+    public TScenarioSix getScenarioSix() {
+        return scenarioSix;
+    }
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
new file mode 100644
index 0000000000..8e76958e31
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Tuscany scenario six servant.
+ */
+public class TScenarioSixServant implements TScenarioSix {
+
+    private static final long serialVersionUID = 1L;
+
+    public String[][] passStringArray(String[][] arg) {
+        return arg;
+    }
+
+    public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg) {
+        return arg;
+    }
+    
+    public TRichUnion passRichUnion(TRichUnion arg) {
+        return arg;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
new file mode 100644
index 0000000000..1e4264256b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Operations for ScenarioThree.
+ */
+public interface TScenarioThree {
+
+    int getIntField();
+
+    void setIntField(int intField);
+
+    void overloadedName();
+
+    void overloadedName(String arg1);
+
+    void overloadedName(String arg1, int arg2);
+
+    int caseDifferent();
+
+    int CaseDifferent();
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
new file mode 100644
index 0000000000..917cceedf5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ * Component for obtaining ScenartioThree reference.
+ */
+public class TScenarioThreeComponent {
+
+    private TScenarioThree scenarionThree;
+
+    @Reference
+    public void setScenarioThree(TScenarioThree scenarioThree) {
+        this.scenarionThree = scenarioThree;
+    }
+
+    public TScenarioThree getScenarioThree() {
+        return scenarionThree;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
new file mode 100644
index 0000000000..b679214c6c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Servant for user provided interface.
+ */
+public class TScenarioThreeServant implements TScenarioThree {
+
+    public int getIntField() {
+        return 0;
+    }
+
+    public void overloadedName() {
+    }
+
+    public void overloadedName(String arg1) {
+    }
+
+    public void overloadedName(String arg1, int arg2) {
+    }
+
+    public void setIntField(int intField) {
+    }
+
+    public int CaseDifferent() {
+        return 1;
+    }
+
+    public int caseDifferent() {
+        return 0;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
new file mode 100644
index 0000000000..415634c80f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Operations for ScenarioTwo.
+ */
+public interface TScenarioTwo {
+
+    String getStringField();
+
+    void setStringField(String stringField);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
new file mode 100644
index 0000000000..d7c72b40da
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ * Component for obtaining ScenartioTwo reference.
+ */
+public class TScenarioTwoComponent {
+
+    private TScenarioTwo scenarioTwo;
+
+    @Reference
+    public void setScenarioTwo(TScenarioTwo scenarioTwo) {
+        this.scenarioTwo = scenarioTwo;
+    }
+
+    public TScenarioTwo getScenarioTwo() {
+        return scenarioTwo;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
new file mode 100644
index 0000000000..cb868d18a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.corba.types;
+
+/**
+ * @version $Rev$ $Date$
+ * Servant for user provided interface.
+ */
+public class TScenarioTwoServant implements TScenarioTwo {
+
+    private static String stringField = "";
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(String stringField) {
+        TScenarioTwoServant.stringField = stringField;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
new file mode 100644
index 0000000000..3e77527d73
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License. 

+

+org.apache.tuscany.sca.test.corba.TestCorbaHostModuleActivator

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFive.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFive.composite
new file mode 100644
index 0000000000..3c73e238a5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFive.composite
@@ -0,0 +1,41 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+

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

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

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           name="Corba">

+    

+    <component name="ScenarioFiveService">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveImpl" />

+    </component>

+	<service name="ScenarioFive" promote="ScenarioFiveService">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFive"/>

+        <binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>

+    </service>

+    

+    <component name="ScenarioFive">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent" />

+        <reference name="scenarioFive">

+			<binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>        

+        </reference>

+    </component>

+        

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFour.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFour.composite
new file mode 100644
index 0000000000..01d7e2314a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFour.composite
@@ -0,0 +1,56 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+

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

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

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           name="Corba">

+    

+    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

+    

+    <component name="ScenarioFourService">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourImpl" />

+    </component>

+	<service name="ScenarioFour" promote="ScenarioFourService">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>

+        <binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>

+    </service>

+    

+    <component name="ScenarioFour">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />

+        <reference name="scenarioFour">

+			<binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>        

+        </reference>

+    </component>

+    

+    <!-- doubled service and reference to test reuse of name server --> 

+    <service name="ScenarioFourDoubled" promote="ScenarioFourService">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>

+        <binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>

+    </service>

+    

+    <component name="ScenarioFourReuse">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />

+        <reference name="scenarioFour">

+			<binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>        

+        </reference>

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioOne.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioOne.composite
new file mode 100644
index 0000000000..c10b383661
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioOne.composite
@@ -0,0 +1,111 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+

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

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

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           name="Corba">

+    

+    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

+    

+    <!-- reference 1 - consuming traditional CORBA service using USER PROVIDED Java interface -->

+	<component name="ScenarioOne">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

+        <reference name="scenarioOne">

+			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>        

+        </reference>

+    </component>

+    

+    <!-- reference 2 - consuming traditional CORBA service using GENERATED Java interface -->

+    <component name="ScenarioOneGenerated">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

+        <reference name="scenarioOne">

+			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>        

+        </reference>

+    </component>

+    

+    <!-- TUSCANY CORBA SERVICE 1 (TS1) - CORBA service using USER PROVIDED Java interface -->

+    <component name="ScenarionOneService">

+    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />

+    </component>

+    <service name="ScenarionOneService" promote="ScenarionOneService">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioOne"/>

+        <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>

+    </service>

+    

+    <!-- TUSCANY CORBA SERVICE 2 (TS2) - CORBA service using GENERATED provided Java interface -->

+    <component name="ScenarionOneServiceGenerated">

+    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneServant" />

+    </component>

+    <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>

+        <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>

+    </service>

+    

+    <!-- reference 3 - user provided interface combined with TUSCANY SERVICE 1 (TS1) -->

+	<component name="TU2TS1">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

+        <reference name="scenarioOne">

+			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>        

+        </reference>

+    </component>

+    

+    <!-- reference 4 - generated interface combined with TUSCANY SERVICE 1 (TS1) -->

+    <component name="TG2TS1">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

+        <reference name="scenarioOne">

+			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>        

+        </reference>

+    </component>

+    

+    <!-- reference 5 - user provided interface combined with TUSCANY SERVICE 2 (TS2) -->

+    <component name="TU2TS2">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

+        <reference name="scenarioOne">

+			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>        

+        </reference>

+    </component>

+    

+    <!-- reference 6 - generated interface combined with TUSCANY SERVICE 2 (TS2) -->

+    <component name="TG2TS2">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

+        <reference name="scenarioOne">

+			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>        

+        </reference>

+    </component>

+    

+    <!-- TUSCANY CORBA SERVICE 3 (TS3) - CORBA service using registered using URI -->

+    <component name="ScenarionOneServiceURI">

+    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />

+    </component>

+    <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>

+        <tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>

+    </service>

+    

+    <!-- reference 7 - ... -->

+    <component name="UriBinding">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

+        <reference name="scenarioOne">

+			<tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>        

+        </reference>

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioSix.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioSix.composite
new file mode 100644
index 0000000000..88238478c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioSix.composite
@@ -0,0 +1,41 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+

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

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

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           name="Corba">

+    

+	<component name="ScenarioSix">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent" />

+        <reference name="scenarioSix">

+			<tuscany:binding.corba host="localhost" port="5050" name="ScenarioSix"/>        

+        </reference>

+    </component>

+    

+    <component name="ScenarionSixService">

+    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixServant" />

+    </component>

+    <service name="ScenarionSixService" promote="ScenarionSixService">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioSix"/>

+        <tuscany:binding.corba host="localhost" port="5050" name="ScenarioSixTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"/>

+    </service>

+        

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioThree.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioThree.composite
new file mode 100644
index 0000000000..f43e4a3f7a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioThree.composite
@@ -0,0 +1,43 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+

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

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

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           name="Corba">

+    

+    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

+    

+    <component name="ScenarioThreeService">

+    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeServant" />

+    </component>

+    <service name="ScenarioThreeServiceTuscany" promote="ScenarioThreeService">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioThree"/>

+        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>

+    </service>

+        

+    <component name="ScenarioThreeReference">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent" />

+        <reference name="scenarioThree">

+			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>        

+        </reference>

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioTwo.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioTwo.composite
new file mode 100644
index 0000000000..dc5ddc50d3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioTwo.composite
@@ -0,0 +1,43 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+

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

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

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           name="Corba">

+    

+    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

+    

+    <component name="ScenarioTwoService">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoServant" />

+    </component>

+	<service name="ScenarioTwoServiceTuscany" promote="ScenarioTwoService">

+    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioTwo"/>

+        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwo" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"/>

+    </service>

+    

+    <component name="ScenarioTwo">

+        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent" />

+        <reference name="scenarioTwo">

+			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwoGenerated"/>        

+        </reference>

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/itest_scenario.idl b/tags/java/sca/1.5.1/itest/corba/src/test/resources/itest_scenario.idl
new file mode 100644
index 0000000000..41489a4565
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/itest_scenario.idl
@@ -0,0 +1,110 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+/*

+ * compile by

+ * idlj -fall -oldImplBase itest_scenario.idl

+ */

+ 

+module org {

+	module apache {

+		module tuscany {

+			module sca {

+				module test {

+					module corba {

+						module generated { 

+						

+							// objects for ScenarioOne

+						

+							enum Color {red, yellow, green};

+							

+							typedef sequence<string> StringSequence;

+							typedef sequence<long> LongSequence;

+							typedef sequence<LongSequence> TwoDimLongSequence;

+							

+							struct InnerStruct {

+								TwoDimLongSequence twoDimLongSequence;

+								string stringField;

+								Color color;

+							};

+							

+							struct RichStruct {

+								InnerStruct innerStruct;

+								StringSequence stringSequence;

+								long longField;

+							};

+							

+							exception WrongColor { 

+								Color givenColor;

+								Color correctColor;

+							};

+							

+							exception UnexpectedException { 

+								string info;

+							};

+							

+							interface ScenarioOne {

+							

+								RichStruct setRichStruct(in RichStruct richStruct) raises (WrongColor, UnexpectedException);

+							

+							};

+							

+							// objects for ScenarioTwo

+							

+							interface ScenarioTwo {

+								

+								attribute string stringField;

+								

+							};

+							

+							typedef string StringArray[2][2];

+							

+							struct AnnotatedStruct {

+									StringArray stringArray;

+							};

+							

+                        	union InnerUnion switch (long) {	

+	                                case 1: long x;

+	                                case 2: float y;

+	                        };

+

+	                        union RichUnion switch (long) {

+	                            case 1: long x;

+	                                case 2: float y;

+	                            case 3: string z;

+	                            case 4: InnerUnion iu;

+	                            default: boolean a;

+	                        };

+							

+							interface ScenarioSix {

+								

+								StringArray passStringArray(in StringArray arg);

+								

+								AnnotatedStruct passAnnotatedStruct(in AnnotatedStruct arg);

+								

+								RichUnion passRichUnion(in RichUnion arg);

+								

+							};

+						};

+					};

+				};

+			};

+		};

+	};

+};

diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/scenariofour.xsd b/tags/java/sca/1.5.1/itest/corba/src/test/resources/scenariofour.xsd
new file mode 100644
index 0000000000..2669b54be3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/corba/src/test/resources/scenariofour.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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://example.com/scenariofour" xmlns="http://www.w3.org/2001/XMLSchema">
+
+    <element name="ScenarioFourSdo">
+        <complexType>
+            <sequence>
+                <element name="message" minOccurs="1" type="string" />
+                <element name="symbol" minOccurs="1" type="string" />
+            </sequence>
+        </complexType>
+    </element>
+
+</schema>
diff --git a/tags/java/sca/1.5.1/itest/databindings/common/pom.xml b/tags/java/sca/1.5.1/itest/databindings/common/pom.xml
new file mode 100644
index 0000000000..da93a73f53
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>itest-databindings-common</artifactId>
+    <version>1.5.1</version>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA iTest Databinding Common</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.1</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.1</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.5.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/tags/java/sca/1.5.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
new file mode 100644
index 0000000000..adb546a1ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
new file mode 100644
index 0000000000..b2346aa973
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
new file mode 100644
index 0000000000..88616cc997
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
new file mode 100644
index 0000000000..77a12e92ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
new file mode 100644
index 0000000000..ee73db6152
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
new file mode 100644
index 0000000000..aab564dc1e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
new file mode 100644
index 0000000000..5507a0b747
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/databindings/common/src/main/resources/generate/generate.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/generate.xsd
new file mode 100644
index 0000000000..1fabedf55f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/generate.xsd
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
new file mode 100644
index 0000000000..8927d725b6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
@@ -0,0 +1,4 @@
+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.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml
new file mode 100644
index 0000000000..f1f4346e58
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
new file mode 100644
index 0000000000..1fae43eb09
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml
new file mode 100644
index 0000000000..c20c80b658
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
new file mode 100644
index 0000000000..bd3db2e030
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
new file mode 100644
index 0000000000..30e4979dca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
new file mode 100644
index 0000000000..e7738dcff7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
new file mode 100644
index 0000000000..9552421e2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
new file mode 100644
index 0000000000..c7b9655749
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
new file mode 100644
index 0000000000..5e5e7fbd55
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
new file mode 100644
index 0000000000..5c455c2ab5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
new file mode 100644
index 0000000000..635e851632
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
new file mode 100644
index 0000000000..004dab4fbb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
new file mode 100644
index 0000000000..136092951b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
new file mode 100644
index 0000000000..796f08e1cf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
new file mode 100644
index 0000000000..927b94885c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
new file mode 100644
index 0000000000..93f83cd0a1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
new file mode 100644
index 0000000000..ea7db70595
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
new file mode 100644
index 0000000000..c64323e7e1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
new file mode 100644
index 0000000000..85c7d85fd4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
new file mode 100644
index 0000000000..543f276c50
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
new file mode 100644
index 0000000000..fcd281539b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
new file mode 100644
index 0000000000..1610c2b861
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
new file mode 100644
index 0000000000..36a0760a61
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
new file mode 100644
index 0000000000..999b72bb35
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
new file mode 100644
index 0000000000..5849165fe0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
new file mode 100644
index 0000000000..71dad561ca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
new file mode 100644
index 0000000000..8acf9376d7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
new file mode 100644
index 0000000000..a49987c352
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
new file mode 100644
index 0000000000..a35b6e174a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
new file mode 100644
index 0000000000..e1995890f9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
new file mode 100644
index 0000000000..91cfce51b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
new file mode 100644
index 0000000000..a2f86ba8c5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
new file mode 100644
index 0000000000..907474cd1b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
new file mode 100644
index 0000000000..a2f6bcfa77
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
new file mode 100644
index 0000000000..c5820e1a2e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
new file mode 100644
index 0000000000..f4d596bfe3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
new file mode 100644
index 0000000000..0debe2fec5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
new file mode 100644
index 0000000000..b5bcfdcfd4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
new file mode 100644
index 0000000000..7f001254cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
new file mode 100644
index 0000000000..8d4d106f59
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
new file mode 100644
index 0000000000..f875b9f94d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
new file mode 100644
index 0000000000..4c8a39b06c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
new file mode 100644
index 0000000000..7d343d6dda
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
new file mode 100644
index 0000000000..bb12bc04a9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
new file mode 100644
index 0000000000..7a81f3b0dd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
new file mode 100644
index 0000000000..f0e1c21233
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
new file mode 100644
index 0000000000..d35568b3c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
new file mode 100644
index 0000000000..92bd9a4b66
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
new file mode 100644
index 0000000000..52cdfa8c4e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
new file mode 100644
index 0000000000..78d001a585
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
new file mode 100644
index 0000000000..2609a858f7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
new file mode 100644
index 0000000000..38f6c55059
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
new file mode 100644
index 0000000000..7868a47ca3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
new file mode 100644
index 0000000000..0d65b124ff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
new file mode 100644
index 0000000000..3f5080d49f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
new file mode 100644
index 0000000000..340555dc5f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
new file mode 100644
index 0000000000..0deb7af980
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
new file mode 100644
index 0000000000..8059fe6da0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
new file mode 100644
index 0000000000..06c92ce19b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
new file mode 100644
index 0000000000..7b1f02d1d4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
new file mode 100644
index 0000000000..9bc0cefd0f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
new file mode 100644
index 0000000000..0c207983bc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
new file mode 100644
index 0000000000..f91b602f99
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
new file mode 100644
index 0000000000..b99bf01b73
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
new file mode 100644
index 0000000000..c99698e175
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
new file mode 100644
index 0000000000..b5b9b0d1eb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
new file mode 100644
index 0000000000..80d22ce057
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
new file mode 100644
index 0000000000..4902935db5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
new file mode 100644
index 0000000000..664bf824b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
new file mode 100644
index 0000000000..5d3658d224
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
new file mode 100644
index 0000000000..c5861fa92a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
new file mode 100644
index 0000000000..0aa4710057
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
new file mode 100644
index 0000000000..1f95950394
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
new file mode 100644
index 0000000000..6ee9c435db
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
new file mode 100644
index 0000000000..0297f1aeb4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
new file mode 100644
index 0000000000..56d027bdbb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
new file mode 100644
index 0000000000..81ba1069bd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
new file mode 100644
index 0000000000..866ab73024
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
new file mode 100644
index 0000000000..8bb3a08b94
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
new file mode 100644
index 0000000000..c7c62f812b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
new file mode 100644
index 0000000000..8235718c5e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
new file mode 100644
index 0000000000..36caba2f16
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
new file mode 100644
index 0000000000..599c428a44
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
new file mode 100644
index 0000000000..389d5a99f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
new file mode 100644
index 0000000000..919c4a20ee
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
new file mode 100644
index 0000000000..59887078b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
new file mode 100644
index 0000000000..79011f26ab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
new file mode 100644
index 0000000000..5de7d64d7b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
new file mode 100644
index 0000000000..c40be9e18b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
new file mode 100644
index 0000000000..d4a78787b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
new file mode 100644
index 0000000000..c30434de66
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
new file mode 100644
index 0000000000..5381590cd1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
new file mode 100644
index 0000000000..4cd6ea7e72
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
new file mode 100644
index 0000000000..e8faf6225b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
new file mode 100644
index 0000000000..b4375467c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
new file mode 100644
index 0000000000..a4f564d9b7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
new file mode 100644
index 0000000000..d30ab85530
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
new file mode 100644
index 0000000000..8abb34b5a5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
new file mode 100644
index 0000000000..7fd9a061ae
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
new file mode 100644
index 0000000000..1615976813
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
new file mode 100644
index 0000000000..cd567ba528
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
new file mode 100644
index 0000000000..0beaac571f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
new file mode 100644
index 0000000000..025362defb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
new file mode 100644
index 0000000000..d6d951fe5d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
new file mode 100644
index 0000000000..5736a8c121
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
new file mode 100644
index 0000000000..242be1d53b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
new file mode 100644
index 0000000000..d728115a77
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
new file mode 100644
index 0000000000..108e3a8619
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
new file mode 100644
index 0000000000..d4ffae5e17
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
new file mode 100644
index 0000000000..5ee5e0229e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
new file mode 100644
index 0000000000..3d5aed5aa8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
new file mode 100644
index 0000000000..e7b80ab11c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
new file mode 100644
index 0000000000..2b4fe5594e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
new file mode 100644
index 0000000000..fc4deb63c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
new file mode 100644
index 0000000000..03570f41d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
new file mode 100644
index 0000000000..c754502645
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
new file mode 100644
index 0000000000..4603793bfc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
new file mode 100644
index 0000000000..4bcd2f8c46
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
new file mode 100644
index 0000000000..a6861f803a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
new file mode 100644
index 0000000000..8bb251cab2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
new file mode 100644
index 0000000000..467ec007ed
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
new file mode 100644
index 0000000000..8d00646678
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
new file mode 100644
index 0000000000..7deafd798a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
new file mode 100644
index 0000000000..72ac75fee0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
new file mode 100644
index 0000000000..f6208f81b3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
new file mode 100644
index 0000000000..1f26e13673
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
new file mode 100644
index 0000000000..97de7b98eb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
new file mode 100644
index 0000000000..67716553d8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
new file mode 100644
index 0000000000..5941348921
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
new file mode 100644
index 0000000000..24d5d09054
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
new file mode 100644
index 0000000000..f684d06a4d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
new file mode 100644
index 0000000000..de4a8a666d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
new file mode 100644
index 0000000000..242908bd27
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
new file mode 100644
index 0000000000..4c00fbe295
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
new file mode 100644
index 0000000000..925e8625d5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
new file mode 100644
index 0000000000..b12bec040b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
new file mode 100644
index 0000000000..c73708ce46
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
new file mode 100644
index 0000000000..795c3ea7d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
new file mode 100644
index 0000000000..3ebdc89ae0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
new file mode 100644
index 0000000000..21546d0f67
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
new file mode 100644
index 0000000000..89657e42ca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
new file mode 100644
index 0000000000..d01b4172e4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
new file mode 100644
index 0000000000..82fd1eedaf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
new file mode 100644
index 0000000000..e1dcf06194
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
new file mode 100644
index 0000000000..ebf03c9d5d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
new file mode 100644
index 0000000000..8b9ba5b4b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
new file mode 100644
index 0000000000..26466b1b39
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
new file mode 100644
index 0000000000..ff418c56ab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
new file mode 100644
index 0000000000..27bb1ce9cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
new file mode 100644
index 0000000000..2bf1df8c99
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
new file mode 100644
index 0000000000..9b5561ed43
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
new file mode 100644
index 0000000000..0b4e7bdf45
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
new file mode 100644
index 0000000000..f1b7cd264c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
new file mode 100644
index 0000000000..a2c8456257
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
new file mode 100644
index 0000000000..1f60b0423f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
new file mode 100644
index 0000000000..21e55ab8c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
new file mode 100644
index 0000000000..30762f4912
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
new file mode 100644
index 0000000000..5bf35d0d70
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
new file mode 100644
index 0000000000..2dd01e4090
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
new file mode 100644
index 0000000000..6920cd8dd0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
new file mode 100644
index 0000000000..6a526bdc47
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
new file mode 100644
index 0000000000..1117a95eb8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
new file mode 100644
index 0000000000..ab91458bff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
new file mode 100644
index 0000000000..3e015843b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
new file mode 100644
index 0000000000..b6d68fd08a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
new file mode 100644
index 0000000000..d4453a4477
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
new file mode 100644
index 0000000000..6de3adc937
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
new file mode 100644
index 0000000000..786ab226da
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
new file mode 100644
index 0000000000..64093aa803
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
new file mode 100644
index 0000000000..01f4c2b1ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
new file mode 100644
index 0000000000..774646f682
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
new file mode 100644
index 0000000000..34da37564c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
new file mode 100644
index 0000000000..a1fb3aa803
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
new file mode 100644
index 0000000000..8eb7a4fce4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
new file mode 100644
index 0000000000..f68eb1939d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
new file mode 100644
index 0000000000..b9f77e6658
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Import.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xml
new file mode 100644
index 0000000000..fd28850050
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Import.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xsd
new file mode 100644
index 0000000000..eae93fd44a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
new file mode 100644
index 0000000000..a7e568decf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Include.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xml
new file mode 100644
index 0000000000..d4b9e24fa6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Include.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xsd
new file mode 100644
index 0000000000..34ff314a19
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd
new file mode 100644
index 0000000000..ae22ab2c44
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xml
new file mode 100644
index 0000000000..b75ac6500a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd
new file mode 100644
index 0000000000..6ad019cb81
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/Person.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Person.xsd
new file mode 100644
index 0000000000..5f5021b15e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Person.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
new file mode 100644
index 0000000000..6c5ad88ff4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
new file mode 100644
index 0000000000..6b7e39b334
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
new file mode 100644
index 0000000000..f9d4a24a49
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
new file mode 100644
index 0000000000..f649e2ba83
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
new file mode 100644
index 0000000000..410df4b7e4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
new file mode 100644
index 0000000000..5d27ef5ce1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
new file mode 100644
index 0000000000..7b74867c03
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
new file mode 100644
index 0000000000..ec16a678a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
new file mode 100644
index 0000000000..708d526f44
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
new file mode 100644
index 0000000000..ed681009f9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
new file mode 100644
index 0000000000..e404ac86b7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
new file mode 100644
index 0000000000..af0431f048
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
new file mode 100644
index 0000000000..c86a0f6bcb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
new file mode 100644
index 0000000000..89b00a36cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
new file mode 100644
index 0000000000..399b0d8175
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
new file mode 100644
index 0000000000..ea35bec61a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
new file mode 100644
index 0000000000..bc8cf35368
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
new file mode 100644
index 0000000000..57981e3666
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
new file mode 100644
index 0000000000..da2929776e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
new file mode 100644
index 0000000000..ace5427786
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
new file mode 100644
index 0000000000..e6b9697a8d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
@@ -0,0 +1,88 @@
+<?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.5.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
new file mode 100644
index 0000000000..7387568942
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
@@ -0,0 +1,88 @@
+<?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.5.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
new file mode 100644
index 0000000000..c5aabc9cc8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
@@ -0,0 +1,221 @@
+<?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.5.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/tags/java/sca/1.5.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
new file mode 100644
index 0000000000..fa3f310d4d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/config.png b/tags/java/sca/1.5.1/itest/databindings/config.png
new file mode 100644
index 0000000000..7912019e9d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/config.png
diff --git a/tags/java/sca/1.5.1/itest/databindings/config.svg b/tags/java/sca/1.5.1/itest/databindings/config.svg
new file mode 100644
index 0000000000..aaf027e2df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/config.svg
@@ -0,0 +1,117 @@
+<?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.5.1/itest/databindings/databinding.png b/tags/java/sca/1.5.1/itest/databindings/databinding.png
new file mode 100644
index 0000000000..76a9c71b7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/databinding.png
diff --git a/tags/java/sca/1.5.1/itest/databindings/databinding.svg b/tags/java/sca/1.5.1/itest/databindings/databinding.svg
new file mode 100644
index 0000000000..d6850ccf7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/databinding.svg
@@ -0,0 +1,242 @@
+<?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.5.1/itest/databindings/interop.png b/tags/java/sca/1.5.1/itest/databindings/interop.png
new file mode 100644
index 0000000000..005e0f24ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop.png
diff --git a/tags/java/sca/1.5.1/itest/databindings/interop.svg b/tags/java/sca/1.5.1/itest/databindings/interop.svg
new file mode 100644
index 0000000000..03897c6d09
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop.svg
@@ -0,0 +1,352 @@
+<?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.5.1/itest/databindings/interop/pom.xml b/tags/java/sca/1.5.1/itest/databindings/interop/pom.xml
new file mode 100644
index 0000000000..fd4bc7c0a5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop/pom.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>itest-databindings-interop</artifactId>
+    <version>1.5.1</version>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA iTest DataBinding Interop</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.5.1</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.5.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
new file mode 100644
index 0000000000..7bdfc57924
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
new file mode 100644
index 0000000000..38bfccce0c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
new file mode 100644
index 0000000000..6f02af4c9d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/interop/src/main/resources/generate/generate.xml b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/generate.xml
new file mode 100644
index 0000000000..8453dd56b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/generate.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
new file mode 100644
index 0000000000..36797fde57
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/databindings/jaxb-bottom-up/pom.xml b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/pom.xml
new file mode 100644
index 0000000000..c4e60ddc5b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/pom.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
+    <version>1.5.1</version>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA iTest Databinding - 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.5.1</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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
new file mode 100644
index 0000000000..7f9b62f9b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 AClientService.
+ */
+@Remotable
+public interface AClientService {
+    public String getGreetingsForward(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
new file mode 100644
index 0000000000..1762812c1f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 javax.jws.soap.SOAPBinding;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The interface for AService.
+ */
+@Remotable
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public interface AService {
+    public String getGreetings(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
new file mode 100644
index 0000000000..7529c2b841
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
new file mode 100644
index 0000000000..4a4419a42b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
new file mode 100644
index 0000000000..65f019ec48
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
new file mode 100644
index 0000000000..844e28863a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
new file mode 100644
index 0000000000..4e0bd38b2b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
new file mode 100644
index 0000000000..40aff31297
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
new file mode 100644
index 0000000000..ca012b967d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
new file mode 100644
index 0000000000..12ed7d0ec7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
new file mode 100644
index 0000000000..3bae554dc7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
new file mode 100644
index 0000000000..a31cc3d45a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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);
+    List<String> getGreetingsList(List<String> names);
+    ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
+    Map<String, String> getGreetingsMap(Map<String, String> namesMap);
+    HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
+    String getGreetingsVarArgs(String... names);
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
new file mode 100644
index 0000000000..34ac9024f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
new file mode 100644
index 0000000000..23ed57dec9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
new file mode 100644
index 0000000000..6239c0f5f1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
new file mode 100644
index 0000000000..c5553688e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
new file mode 100644
index 0000000000..3bdf886dfa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
new file mode 100644
index 0000000000..0fdf69459f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
new file mode 100644
index 0000000000..2842205085
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
new file mode 100644
index 0000000000..351d9df0cb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
new file mode 100644
index 0000000000..8b484e93f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.AClientService;
+import org.apache.tuscany.sca.itest.databindings.jaxb.AService;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService.
+ */
+@Service(AClientService.class)
+public class AClientServiceImpl implements AClientService {
+
+    @Reference
+    protected AService aService;
+    
+    public String getGreetingsForward(String name) {
+        return aService.getGreetings(name);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
new file mode 100644
index 0000000000..4a35d41c04
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.AService;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService.
+ */
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
new file mode 100644
index 0000000000..9e042ffe6a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
new file mode 100644
index 0000000000..ec929ddece
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
new file mode 100644
index 0000000000..58808eec4f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
new file mode 100644
index 0000000000..858b8da59a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
new file mode 100644
index 0000000000..51e48edbc9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
new file mode 100644
index 0000000000..de52cdfac3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
new file mode 100644
index 0000000000..199335c38c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 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})
+public class HelloServiceSimpleImpl implements HelloServiceSimple {
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+
+    public String[] getGreetingsArray(String[] names) {
+        String[] resps = new String[names.length];
+        for (int i = 0; i < names.length; ++i) {
+            resps[i] = "Hello " + names[i];
+        }
+        return resps;
+    }
+
+    public List<String> getGreetingsList(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;
+    }
+
+    public ArrayList<String> getGreetingsArrayList(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;
+    }
+
+    public Map<String, String> getGreetingsMap(Map<String, String> namesMap) {
+        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
+            entry.setValue("Hello " + entry.getKey());
+        }
+        return namesMap;
+    }
+
+    public HashMap<String, String> getGreetingsHashMap(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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
new file mode 100644
index 0000000000..fe9121be9d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
new file mode 100644
index 0000000000..28ace6aab7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
new file mode 100644
index 0000000000..ab1a3b4ab8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
new file mode 100644
index 0000000000..0a8f6772b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
new file mode 100644
index 0000000000..626b0e9844
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
new file mode 100644
index 0000000000..19a6cae01b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
@@ -0,0 +1,208 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
new file mode 100644
index 0000000000..68510b4b03
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
new file mode 100644
index 0000000000..10a242be4d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    *

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    *

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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://jaxb.databindings.itest.sca.tuscany.apache.org"

+                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"

+                  xmlns:ns0="http://jaxb.databindings.itest.sca.tuscany.apache.org"

+                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"

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

+                  xmlns:ns1="http://org.apache.axis2/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/"

+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

+  <wsdl:types>

+    <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org" xmlns:ns="http://jaxb.databindings.itest.sca.tuscany.apache.org">

+            <xs:element name="getGreetings" nillable="true" type="xs:string"/>

+            <xs:element name="getGreetingsResponse" nillable="true" type="xs:string"/>

+    </xs:schema>

+  </wsdl:types>

+

+  <wsdl:message name="getGreetingsRequest">

+    <wsdl:part name="parameters" element="ns0:getGreetings"/>

+  </wsdl:message>

+

+  <wsdl:message name="getGreetingsResponse">

+    <wsdl:part name="parameters" element="ns0:getGreetingsResponse"/>

+  </wsdl:message>

+

+  <wsdl:portType name="AServicePortType">

+    <wsdl:operation name="getGreetings">

+      <wsdl:input message="ns0:getGreetingsRequest" wsaw:Action="urn:getGreetings"/>

+      <wsdl:output message="ns0:getGreetingsResponse" wsaw:Action="urn:getGreetingsResponse"/>

+    </wsdl:operation>

+  </wsdl:portType>

+

+  <wsdl:binding name="AServiceSOAP12Binding" type="ns0:AServicePortType">

+    <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"/>

+      </wsdl:input>

+      <wsdl:output>

+        <soap12:body use="literal"/>

+      </wsdl:output>

+    </wsdl:operation>

+  </wsdl:binding>

+

+  <wsdl:binding name="AServicePortTypeBinding" type="ns0:AServicePortType">

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

+    <wsdl:operation name="getGreetings">

+      <soap:operation soapAction=""/>

+      <wsdl:input>

+        <soap:body use="literal"/>

+      </wsdl:input>

+      <wsdl:output>

+        <soap:body use="literal"/>

+      </wsdl:output>

+    </wsdl:operation>

+  </wsdl:binding>

+

+  <wsdl:binding name="AServiceHttpBinding" type="ns0:AServicePortType">

+    <http:binding verb="POST"/>

+    <wsdl:operation name="getGreetings">

+      <http:operation location="AService/getGreetings"/>

+      <wsdl:input>

+        <mime:content part="getGreetings" type="text/xml"/>

+      </wsdl:input>

+      <wsdl:output>

+        <mime:content part="getGreetings" type="text/xml"/>

+      </wsdl:output>

+    </wsdl:operation>

+  </wsdl:binding>

+

+  <wsdl:binding name="AServiceSOAP11Binding" type="ns0:AServicePortType">

+    <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"/>

+      </wsdl:input>

+      <wsdl:output>

+        <soap:body use="literal"/>

+      </wsdl:output>

+    </wsdl:operation>

+  </wsdl:binding>

+

+  <wsdl:service name="AServicePortTypeService">

+    <wsdl:port name="AServicePortTypePort" binding="ns0:AServicePortTypeBinding">

+      <soap:address location="http://localhost:8080/AService"/>

+    </wsdl:port>

+  </wsdl:service>

+

+  <wsdl:service name="AService">

+    <wsdl:port name="AServiceHttpport" binding="ns0:AServiceHttpBinding">

+      <http:address location="http://localhost:8080/AService/httpport"/>

+    </wsdl:port>

+    <wsdl:port name="AServiceSOAP12port_http" binding="ns0:AServiceSOAP12Binding">

+      <soap12:address location="http://localhost:8080/AService/soap12port"/>

+    </wsdl:port>

+    <wsdl:port name="AServiceSOAP11port_http" binding="ns0:AServiceSOAP11Binding">

+      <soap:address location="http://localhost:8080/AService/soap11port"/>

+    </wsdl:port>

+    <wsdl:port name="AServiceSOAP12port_http_null" binding="ns0:AServiceSOAP12Binding">

+      <soap12:address location=""/>

+    </wsdl:port>

+    <wsdl:port name="AServiceSOAP12port_http_wsdl" binding="ns0:AServiceSOAP12Binding">

+      <soap12:address location="inWsdl"/>

+    </wsdl:port>

+  </wsdl:service>

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
new file mode 100644
index 0000000000..b0d3fe7aeb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" name="doclitbarewsdltest">

+          

+    <component name="AComponent">

+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.AServiceImpl"/>

+        <service name="AService">

+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/>

+            <binding.ws uri="http://localhost:8085/AService/endpointref" requires="MTOM"/>

+        </service>

+    </component>

+    <component name="AClientComponent">

+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.AClientServiceImpl"/>

+        <reference name="aService">

+            <!--interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/-->

+            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.AService"/>

+            <binding.ws uri="http://localhost:8085/AService/endpointref" requires="MTOM"/>

+        </reference>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
new file mode 100644
index 0000000000..910091cf53
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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" requires="MTOM"/>
+        </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" requires="MTOM"/>
+            <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.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
new file mode 100644
index 0000000000..2dfcb1327b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    *

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    *

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" requires="MTOM"/>

+        </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" requires="MTOM"/>

+            <binding.sca/>

+        </service>

+        <service name="HelloLocalServiceSimple">

+            <binding.sca/>

+        </service>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
new file mode 100644
index 0000000000..20529e7273
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    *

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    *

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" requires="MTOM"/>

+        </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" requires="MTOM"/>

+            <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.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
new file mode 100644
index 0000000000..61c8a70a9a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    *

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    *

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" requires="MTOM"/>

+        </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" requires="MTOM"/>

+            <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.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
new file mode 100644
index 0000000000..4967b896a5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
@@ -0,0 +1,339 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
new file mode 100644
index 0000000000..744bf20494
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 DocLitBareWsdlTestCase {
+
+    private static SCADomain domain;
+
+    /**
+     * Runs once before running the tests
+     */
+    @BeforeClass
+    public static void setUp() throws Exception {
+        try {
+            domain = SCADomain.newInstance("doclitbarewsdl.composite");
+        } catch (Throwable e) {
+            // @Ignore("TUSCANY-2398")
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Runs once after running the tests
+     */
+    @AfterClass
+    public static void tearDown() {
+        if (domain != null) {
+            domain.close();
+        }
+    }
+
+    // @Ignore("TUSCANY-2398")
+    @Test
+    public void testDocLitBareWsdl() throws Exception {
+        AClientService client = domain.getService(AClientService.class, "AClientComponent");
+        String name = "Pandu";
+        String resp = client.getGreetingsForward(name);
+        Assert.assertEquals("Hello " + name, resp);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
new file mode 100644
index 0000000000..c22d00140e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
@@ -0,0 +1,484 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
new file mode 100644
index 0000000000..f8aaad3dac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
@@ -0,0 +1,776 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
new file mode 100644
index 0000000000..079e1cdfff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
@@ -0,0 +1,1439 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.net.URL;
+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
+    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(new URL("http://tuscany.apache.org/home.html"));
+        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(new URL("http://tuscany.apache.org/home.html"));
+        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 = "<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 = "<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.5.1/itest/databindings/jaxb-top-down/pom.xml b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/pom.xml
new file mode 100644
index 0000000000..784de8da24
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/pom.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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$ -->
+
+<project>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-databindings</artifactId>
+        <version>1.5.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>itest-databindings-jaxb-top-down</artifactId>
+    <version>1.5.1</version>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</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-node-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-databindings-common</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency-->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-xml</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</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>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
new file mode 100644
index 0000000000..352f805c7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 org.osoa.sca.annotations.Remotable;
+
+/**
+ * The interface for HelloService.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface HelloService {
+    String getGreetings(String name);
+    String[] getGreetingsArray(String[] names);
+    List<String> getGreetingsList(List<String> names);
+    ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
+    Map<String, String> getGreetingsMap(Map<String, String> namesMap);
+    HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
+    String getGreetingsVarArgs(String... names);
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
new file mode 100644
index 0000000000..7bd95cec95
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 HelloServiceClient.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface HelloServiceClient {
+    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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
new file mode 100644
index 0000000000..8c0fb24da9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface PrimitivesService {
+    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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
new file mode 100644
index 0000000000..3a5a81bae4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.
+ * 
+ * @version $Rev$ $Date$
+ */
+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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
new file mode 100644
index 0000000000..4be057fe68
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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;
+
+import org.osoa.sca.annotations.Remotable;
+
+
+
+/**
+ * The interface for StandardTypesService.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface StandardTypesService {
+    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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
new file mode 100644
index 0000000000..0c073cd054
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.
+ * 
+ * @version $Rev$ $Date$
+ */
+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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
new file mode 100644
index 0000000000..c4026fdb9a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 org.apache.tuscany.sca.itest.databindings.jaxb.HelloService;
+import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * An implementation of HelloServiceClient.
+ * The client forwards the request to the service component and returns the response from the service component.
+ */
+@Service(HelloServiceClient.class)
+public class HelloServiceClientImpl {
+
+    private HelloService service;
+
+    @Reference
+    public void setHelloService(HelloService 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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
new file mode 100644
index 0000000000..fc2dc64b7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 org.apache.tuscany.sca.itest.databindings.jaxb.HelloService;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * An implementation of HelloService.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(interfaces = {HelloService.class})
+public class HelloServiceImpl implements HelloService {
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+
+    public String[] getGreetingsArray(String[] names) {
+        String[] resps = new String[names.length];
+        for (int i = 0; i < names.length; ++i) {
+            resps[i] = "Hello " + names[i];
+        }
+        return resps;
+    }
+
+    public List<String> getGreetingsList(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;
+    }
+
+    public ArrayList<String> getGreetingsArrayList(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;
+    }
+
+    public Map<String, String> getGreetingsMap(Map<String, String> namesMap) {
+        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
+            entry.setValue("Hello " + entry.getKey());
+        }
+        return namesMap;
+    }
+
+    public HashMap<String, String> getGreetingsHashMap(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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
new file mode 100644
index 0000000000..ef1a907b29
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(PrimitivesServiceClient.class)
+public class PrimitivesServiceClientImpl {
+
+    private PrimitivesService service;
+    
+    @Reference
+    public void setPrimitivesService(PrimitivesService 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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
new file mode 100644
index 0000000000..e60ae41767
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.osoa.sca.annotations.Service;
+
+/**
+ * An implementation of PrimitivesService.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(interfaces={PrimitivesService.class})
+public class PrimitivesServiceImpl implements PrimitivesService {
+
+    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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
new file mode 100644
index 0000000000..8803eb262a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.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.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(StandardTypesServiceClient.class)
+public class StandardTypesServiceClientImpl implements StandardTypesServiceClient{
+
+    private StandardTypesService service;
+    
+    @Reference
+    public void setStandardTypesService(StandardTypesService 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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
new file mode 100644
index 0000000000..46569311ff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
@@ -0,0 +1,207 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.StandardTypesService;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * An implementation of StandardTypesService.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(interfaces={StandardTypesService.class})
+public class StandardTypesServiceImpl implements StandardTypesService {
+    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.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
new file mode 100644
index 0000000000..9d851455da
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
new file mode 100644
index 0000000000..926e4154aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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$ -->
+
+<wsdl:definitions name="HelloService"
+    targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+    xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+    xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+    <wsdl:types>
+        <xs:schema targetNamespace="http://util.java/"
+            version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:complexType name="arrayList">
+                <xs:complexContent>
+                    <xs:extension base="abstractList">
+                        <xs:sequence />
+                    </xs:extension>
+                </xs:complexContent>
+            </xs:complexType>
+            <xs:complexType abstract="true" name="abstractList">
+                <xs:complexContent>
+                    <xs:extension base="abstractCollection">
+                        <xs:sequence />
+                    </xs:extension>
+                </xs:complexContent>
+            </xs:complexType>
+            <xs:complexType abstract="true" name="abstractCollection">
+                <xs:sequence />
+            </xs:complexType>
+            <xs:complexType name="hashMap">
+                <xs:complexContent>
+                    <xs:extension base="abstractMap">
+                        <xs:sequence />
+                    </xs:extension>
+                </xs:complexContent>
+            </xs:complexType>
+            <xs:complexType abstract="true" name="abstractMap">
+                <xs:sequence />
+            </xs:complexType>
+        </xs:schema>
+        <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
+            version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:complexType final="#all" name="stringArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0"
+                        name="item" nillable="true" type="xs:string" />
+                </xs:sequence>
+            </xs:complexType>
+        </xs:schema>
+        <xs:schema attributeFormDefault="qualified"
+            elementFormDefault="unqualified"
+            targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+            xmlns:ns0="http://util.java/"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:element name="getGreetings">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsList">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:anyType" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsListResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:anyType" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsArrayList">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="ns0:arrayList" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsArrayListResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="ns0:arrayList" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsMap">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:anyType" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsMapResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:anyType" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsHashMap">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="ns0:hashMap" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsHashMapResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="ns0:hashMap" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsVarArgs">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsVarArgsResponse">
+                <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="getGreetings">
+        <wsdl:part name="getGreetings" element="tns:getGreetings">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part name="getGreetingsResponse"
+            element="tns:getGreetingsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsArray">
+        <wsdl:part name="getGreetingsArray"
+            element="tns:getGreetingsArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsArrayResponse">
+        <wsdl:part name="getGreetingsArrayResponse"
+            element="tns:getGreetingsArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsList">
+        <wsdl:part name="getGreetingsList"
+            element="tns:getGreetingsList">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsListResponse">
+        <wsdl:part name="getGreetingsListResponse"
+            element="tns:getGreetingsListResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsArrayList">
+        <wsdl:part name="getGreetingsArrayList"
+            element="tns:getGreetingsArrayList">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsArrayListResponse">
+        <wsdl:part name="getGreetingsArrayListResponse"
+            element="tns:getGreetingsArrayListResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsMap">
+        <wsdl:part name="getGreetingsMap"
+            element="tns:getGreetingsMap">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsMapResponse">
+        <wsdl:part name="getGreetingsMapResponse"
+            element="tns:getGreetingsMapResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsHashMap">
+        <wsdl:part name="getGreetingsHashMap"
+            element="tns:getGreetingsHashMap">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsHashMapResponse">
+        <wsdl:part name="getGreetingsHashMapResponse"
+            element="tns:getGreetingsHashMapResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsVarArgs">
+        <wsdl:part name="getGreetingsVarArgs"
+            element="tns:getGreetingsVarArgs">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsVarArgsResponse">
+        <wsdl:part name="getGreetingsVarArgsResponse"
+            element="tns:getGreetingsVarArgsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="HelloService">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetings"></wsdl:input>
+            <wsdl:output message="tns:getGreetingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsArray">
+            <wsdl:input message="tns:getGreetingsArray"></wsdl:input>
+            <wsdl:output message="tns:getGreetingsArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsList">
+            <wsdl:input message="tns:getGreetingsList"></wsdl:input>
+            <wsdl:output message="tns:getGreetingsListResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsArrayList">
+            <wsdl:input message="tns:getGreetingsArrayList">
+            </wsdl:input>
+            <wsdl:output message="tns:getGreetingsArrayListResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsMap">
+            <wsdl:input message="tns:getGreetingsMap">
+            </wsdl:input>
+            <wsdl:output message="tns:getGreetingsMapResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsHashMap">
+            <wsdl:input message="tns:getGreetingsHashMap"></wsdl:input>
+            <wsdl:output message="tns:getGreetingsHashMapResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsVarArgs">
+            <wsdl:input message="tns:getGreetingsVarArgs">
+            </wsdl:input>
+            <wsdl:output message="tns:getGreetingsVarArgsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="HelloServiceBinding" type="tns:HelloService">
+        <soap11:binding style="document"
+            transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="getGreetings">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsList">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsArrayList">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsMap">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsHashMap">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsVarArgs">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="HelloServiceService">
+        <wsdl:port name="HelloServicePort"
+            binding="tns:HelloServiceBinding">
+            <soap11:address location="http://localhost:8085/hs-ep" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
new file mode 100644
index 0000000000..afde4b7de9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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"
+           targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+           name="HelloService">
+           
+    <!-- Clients to test the service -->
+    <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
+         The service component uses interface.wsdl on the service element.
+         This client component uses interface.wsdl on the reference element. -->
+    <component name="HelloServiceClientW2WComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
+        <reference name="helloService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
+            <binding.ws uri="http://localhost:8085/hs-ep-w" requires="MTOM"/>
+        </reference>
+    </component>
+        
+    <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
+         The service component uses interface.wsdl on the service element.
+         This client component uses interface.java on the reference element. -->
+    <component name="HelloServiceClientJ2WComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
+        <reference name="helloService">
+            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/>
+            <binding.ws uri="http://localhost:8085/hs-ep-w" requires="MTOM"/>
+        </reference>
+    </component>
+        
+    <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
+         The service component uses interface.wsdl on the service element.
+         This client component uses interface.java on the reference element. -->
+    <component name="HelloServiceClientW2JComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
+        <reference name="helloService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
+            <binding.ws uri="http://localhost:8085/hs-ep-j" requires="MTOM"/>
+        </reference>
+    </component>
+        
+    <!-- Components used to implement the services -->
+    <!-- A HelloService component that uses interface.wsdl -->
+    <component name="HelloServiceWSDLComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/>
+        <service name="HelloService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
+            <binding.ws uri="http://localhost:8085/hs-ep-w" requires="MTOM"/>
+        </service>
+    </component>
+
+    <!-- A HelloService component that uses interface.java -->
+    <component name="HelloServiceJavaComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/>
+        <service name="HelloService">
+            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/>
+            <binding.ws uri="http://localhost:8085/hs-ep-j" requires="MTOM"/>
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
new file mode 100644
index 0000000000..f366783e5e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
@@ -0,0 +1,927 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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$ -->
+
+<wsdl:definitions name="PrimitivesService"
+    targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+    xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+    xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+    <wsdl:types>
+        <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
+            version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:complexType final="#all" name="shortArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0"
+                        name="item" nillable="true" type="xs:short" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType final="#all" name="intArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0"
+                        name="item" nillable="true" type="xs:int" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType final="#all" name="floatArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0"
+                        name="item" nillable="true" type="xs:float" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType final="#all" name="doubleArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0"
+                        name="item" nillable="true" type="xs:double" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType final="#all" name="longArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0"
+                        name="item" nillable="true" type="xs:long" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType final="#all" name="booleanArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0"
+                        name="item" nillable="true" type="xs:boolean" />
+                </xs:sequence>
+            </xs:complexType>
+        </xs:schema>
+        <xs:schema attributeFormDefault="qualified"
+            elementFormDefault="unqualified"
+            targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:element name="negateLongArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:long" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityByteArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:base64Binary" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateDoubleArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:double" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityFloatArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:float" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateLong">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            type="xs:long" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityIntArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:int" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateIntResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            type="xs:int" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateLongArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:long" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateInt">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            type="xs:int" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateFloatArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:float" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityDoubleArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:double" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateDouble">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            type="xs:double" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityByteArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:base64Binary" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateByte">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            type="xs:byte" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityLongArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:long" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateDoubleResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            type="xs:double" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityFloatArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:float" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateFloat">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            type="xs:float" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateShortArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:short" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateByteArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:base64Binary" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateLongResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            type="xs:long" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateShortArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:short" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateFloatArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:float" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateBoolean">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            type="xs:boolean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateShort">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            type="xs:short" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateByteArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:base64Binary" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityBooleanArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:boolean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityShortArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:short" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateBooleanResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            type="xs:boolean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateFloatResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            type="xs:float" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityBooleanArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:boolean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateBooleanArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:boolean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateDoubleArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:double" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityDoubleArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:double" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateIntArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:int" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityIntArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:int" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateByteResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            type="xs:byte" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateBooleanArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="return" nillable="true" type="xs:boolean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateShortResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            type="xs:short" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="negateIntArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:int" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityShortArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:short" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="identityLongArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0"
+                            name="arg0" nillable="true" type="xs:long" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:schema>
+    </wsdl:types>
+
+    <wsdl:message name="negateLongArrayResponse">
+        <wsdl:part name="negateLongArrayResponse"
+            element="tns:negateLongArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityByteArrayResponse">
+        <wsdl:part name="identityByteArrayResponse"
+            element="tns:identityByteArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateDoubleArray">
+        <wsdl:part name="negateDoubleArray"
+            element="tns:negateDoubleArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityFloatArray">
+        <wsdl:part name="identityFloatArray"
+            element="tns:identityFloatArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateLong">
+        <wsdl:part name="negateLong" element="tns:negateLong">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityIntArray">
+        <wsdl:part name="identityIntArray"
+            element="tns:identityIntArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateIntResponse">
+        <wsdl:part name="negateIntResponse"
+            element="tns:negateIntResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateLongArray">
+        <wsdl:part name="negateLongArray"
+            element="tns:negateLongArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateInt">
+        <wsdl:part name="negateInt" element="tns:negateInt"></wsdl:part>
+    </wsdl:message>
+
+    <wsdl:message name="negateFloatArrayResponse">
+        <wsdl:part name="negateFloatArrayResponse"
+            element="tns:negateFloatArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityDoubleArrayResponse">
+        <wsdl:part name="identityDoubleArrayResponse"
+            element="tns:identityDoubleArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateDouble">
+        <wsdl:part name="negateDouble" element="tns:negateDouble">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityByteArray">
+        <wsdl:part name="identityByteArray"
+            element="tns:identityByteArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateByte">
+        <wsdl:part name="negateByte" element="tns:negateByte">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityLongArrayResponse">
+        <wsdl:part name="identityLongArrayResponse"
+            element="tns:identityLongArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateDoubleResponse">
+        <wsdl:part name="negateDoubleResponse"
+            element="tns:negateDoubleResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityFloatArrayResponse">
+        <wsdl:part name="identityFloatArrayResponse"
+            element="tns:identityFloatArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateFloat">
+        <wsdl:part name="negateFloat" element="tns:negateFloat">
+        </wsdl:part>
+    </wsdl:message>
+
+    <wsdl:message name="negateShortArrayResponse">
+        <wsdl:part name="negateShortArrayResponse"
+            element="tns:negateShortArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateByteArrayResponse">
+        <wsdl:part name="negateByteArrayResponse"
+            element="tns:negateByteArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateLongResponse">
+        <wsdl:part name="negateLongResponse"
+            element="tns:negateLongResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateShortArray">
+        <wsdl:part name="negateShortArray"
+            element="tns:negateShortArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateFloatArray">
+        <wsdl:part name="negateFloatArray"
+            element="tns:negateFloatArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateBoolean">
+        <wsdl:part name="negateBoolean" element="tns:negateBoolean">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateShort">
+        <wsdl:part name="negateShort" element="tns:negateShort">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateByteArray">
+        <wsdl:part name="negateByteArray"
+            element="tns:negateByteArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityBooleanArray">
+        <wsdl:part name="identityBooleanArray"
+            element="tns:identityBooleanArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityShortArrayResponse">
+        <wsdl:part name="identityShortArrayResponse"
+            element="tns:identityShortArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateBooleanResponse">
+        <wsdl:part name="negateBooleanResponse"
+            element="tns:negateBooleanResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateFloatResponse">
+        <wsdl:part name="negateFloatResponse"
+            element="tns:negateFloatResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityBooleanArrayResponse">
+        <wsdl:part name="identityBooleanArrayResponse"
+            element="tns:identityBooleanArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateBooleanArray">
+        <wsdl:part name="negateBooleanArray"
+            element="tns:negateBooleanArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateDoubleArrayResponse">
+        <wsdl:part name="negateDoubleArrayResponse"
+            element="tns:negateDoubleArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityDoubleArray">
+        <wsdl:part name="identityDoubleArray"
+            element="tns:identityDoubleArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateIntArrayResponse">
+        <wsdl:part name="negateIntArrayResponse"
+            element="tns:negateIntArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityIntArrayResponse">
+        <wsdl:part name="identityIntArrayResponse"
+            element="tns:identityIntArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateByteResponse">
+        <wsdl:part name="negateByteResponse"
+            element="tns:negateByteResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateBooleanArrayResponse">
+        <wsdl:part name="negateBooleanArrayResponse"
+            element="tns:negateBooleanArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateShortResponse">
+        <wsdl:part name="negateShortResponse"
+            element="tns:negateShortResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="negateIntArray">
+        <wsdl:part name="negateIntArray" element="tns:negateIntArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityShortArray">
+        <wsdl:part name="identityShortArray"
+            element="tns:identityShortArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="identityLongArray">
+        <wsdl:part name="identityLongArray"
+            element="tns:identityLongArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="PrimitivesService">
+        <wsdl:operation name="negateBoolean">
+            <wsdl:input message="tns:negateBoolean">
+            </wsdl:input>
+            <wsdl:output message="tns:negateBooleanResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateBooleanArray">
+            <wsdl:input message="tns:negateBooleanArray"></wsdl:input>
+            <wsdl:output message="tns:negateBooleanArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityBooleanArray">
+            <wsdl:input message="tns:identityBooleanArray"></wsdl:input>
+            <wsdl:output message="tns:identityBooleanArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateByte">
+            <wsdl:input message="tns:negateByte">
+            </wsdl:input>
+            <wsdl:output message="tns:negateByteResponse"></wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateByteArray">
+            <wsdl:input message="tns:negateByteArray"></wsdl:input>
+            <wsdl:output message="tns:negateByteArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityByteArray">
+            <wsdl:input message="tns:identityByteArray"></wsdl:input>
+            <wsdl:output message="tns:identityByteArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateShort">
+            <wsdl:input message="tns:negateShort">
+            </wsdl:input>
+            <wsdl:output message="tns:negateShortResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateShortArray">
+            <wsdl:input message="tns:negateShortArray"></wsdl:input>
+            <wsdl:output message="tns:negateShortArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityShortArray">
+            <wsdl:input message="tns:identityShortArray"></wsdl:input>
+            <wsdl:output message="tns:identityShortArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateInt">
+            <wsdl:input message="tns:negateInt">
+            </wsdl:input>
+            <wsdl:output message="tns:negateIntResponse"></wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateIntArray">
+            <wsdl:input message="tns:negateIntArray"></wsdl:input>
+            <wsdl:output message="tns:negateIntArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityIntArray">
+            <wsdl:input message="tns:identityIntArray"></wsdl:input>
+            <wsdl:output message="tns:identityIntArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateLong">
+            <wsdl:input message="tns:negateLong">
+            </wsdl:input>
+            <wsdl:output message="tns:negateLongResponse"></wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateLongArray">
+            <wsdl:input message="tns:negateLongArray"></wsdl:input>
+            <wsdl:output message="tns:negateLongArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityLongArray">
+            <wsdl:input message="tns:identityLongArray"></wsdl:input>
+            <wsdl:output message="tns:identityLongArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateFloat">
+            <wsdl:input message="tns:negateFloat">
+            </wsdl:input>
+            <wsdl:output message="tns:negateFloatResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateFloatArray">
+            <wsdl:input message="tns:negateFloatArray"></wsdl:input>
+            <wsdl:output message="tns:negateFloatArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityFloatArray">
+            <wsdl:input message="tns:identityFloatArray"></wsdl:input>
+            <wsdl:output message="tns:identityFloatArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateDouble">
+            <wsdl:input message="tns:negateDouble">
+            </wsdl:input>
+            <wsdl:output message="tns:negateDoubleResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateDoubleArray">
+            <wsdl:input message="tns:negateDoubleArray"></wsdl:input>
+            <wsdl:output message="tns:negateDoubleArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityDoubleArray">
+            <wsdl:input message="tns:identityDoubleArray"></wsdl:input>
+            <wsdl:output message="tns:identityDoubleArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="PrimitivesServiceBinding"
+        type="tns:PrimitivesService">
+        <soap11:binding style="document"
+            transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="negateBoolean">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateBooleanArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityBooleanArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateByte">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateByteArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityByteArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateShort">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateShortArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityShortArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateInt">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateIntArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityIntArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateLong">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateLongArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityLongArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateFloat">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateFloatArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityFloatArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateDouble">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="negateDoubleArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="identityDoubleArray">
+            <soap11:operation />
+            <wsdl:input>
+                <soap11:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap11:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="PrimitivesServiceService">
+        <wsdl:port name="PrimitivesServicePort"
+            binding="tns:PrimitivesServiceBinding">
+            <soap11:address location="http://localhost:8085/ps-ep" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
new file mode 100644
index 0000000000..f218419f45
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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://jaxb.databindings.itest.sca.tuscany.apache.org/"
+           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.
+         The service component uses interface.wsdl on the service element.
+         This client component uses interface.wsdl on the reference element. -->
+    <component name="PrimitivesServiceClientW2WComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
+        <reference name="primitivesService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
+            <binding.ws uri="http://localhost:8085/ps-ep-w" requires="MTOM"/>
+        </reference>
+    </component>
+
+    <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
+         The service component uses interface.wsdl on the service element.
+         This client component uses interface.java on the reference element. -->
+    <component name="PrimitivesServiceClientJ2WComponent">
+        <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-w" requires="MTOM"/>
+        </reference>
+    </component>
+
+    <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
+         The service component uses interface.java on the service element.
+         This client component uses interface.wsdl on the reference element. -->
+    <component name="PrimitivesServiceClientW2JComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
+        <reference name="primitivesService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
+            <binding.ws uri="http://localhost:8085/ps-ep-j" requires="MTOM"/>
+        </reference>
+    </component>
+
+    <!-- Components used to implement the services -->
+    <!-- A PrimitivesService component that uses interface.java -->
+    <component name="PrimitivesServiceJavaComponent">
+        <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-j" requires="MTOM"/>
+        </service>
+    </component>
+    
+    <!-- A PrimitivesService component that uses interface.wsdl -->
+    <component name="PrimitivesServiceWSDLComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>
+        <service name="PrimitivesService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
+            <binding.ws uri="http://localhost:8085/ps-ep-w" requires="MTOM"/>
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
new file mode 100644
index 0000000000..59e30dc801
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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://jaxb.databindings.itest.sca.tuscany.apache.org/"
+           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.
+         The service component uses interface.wsdl on the service element.
+         This client component uses interface.wsdl on the reference element. -->
+    <component name="StandardTypesServiceClientW2WComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
+        <reference name="standardTypesService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
+            <binding.ws uri="http://localhost:8085/sts-ep-w" requires="MTOM"/>
+        </reference>
+    </component>
+
+    <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
+         The service component uses interface.wsdl on the service element.
+         This client component uses interface.java on the reference element. -->
+    <component name="StandardTypesServiceClientJ2WComponent">
+        <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-w" requires="MTOM"/>
+        </reference>
+    </component>
+
+    <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
+         The service component uses interface.java on the service element.
+         This client component uses interface.wsdl on the reference element. -->
+    <component name="StandardTypesServiceClientW2JComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
+        <reference name="standardTypesService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
+            <binding.ws uri="http://localhost:8085/sts-ep-j" requires="MTOM"/>
+        </reference>
+    </component>
+
+    <!-- Components used to implement the services -->
+    <!-- A StandardTypesService component. -->
+    <component name="StandardTypesServiceJavaComponent">
+        <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-j" requires="MTOM"/>
+        </service>
+    </component>
+
+    <!-- A StandardTypesService component. -->
+    <component name="StandardTypesServiceWSDLComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>
+        <service name="StandardTypesService">
+            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
+            <binding.ws uri="http://localhost:8085/sts-ep-w" requires="MTOM"/>
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
new file mode 100644
index 0000000000..5bfd1ea277
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
@@ -0,0 +1,1155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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$ -->
+
+<wsdl:definitions name="StandardTypesService"
+	targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+	xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+	xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+	<wsdl:types>
+		<xs:schema targetNamespace="http://jaxb.dev.java.net/array"
+			version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+			<xs:complexType final="#all" name="anyTypeArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:anyType" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType final="#all" name="base64BinaryArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:base64Binary" />
+				</xs:sequence>
+			</xs:complexType>
+		</xs:schema>
+		<xs:schema targetNamespace="http://jaxb.dev.java.net/array"
+			version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+			<xs:complexType final="#all" name="dateTimeArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:dateTime" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType final="#all" name="durationArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:duration" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType final="#all" name="integerArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:integer" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType final="#all" name="anySimpleTypeArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:anySimpleType" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType final="#all" name="QNameArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:QName" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType final="#all" name="decimalArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:decimal" />
+				</xs:sequence>
+			</xs:complexType>
+
+			<xs:complexType final="#all" name="base64BinaryArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:base64Binary" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType final="#all" name="stringArray">
+				<xs:sequence>
+					<xs:element maxOccurs="unbounded" minOccurs="0"
+						name="item" nillable="true" type="xs:string" />
+				</xs:sequence>
+			</xs:complexType>
+		</xs:schema>
+		<xs:schema attributeFormDefault="qualified"
+			elementFormDefault="unqualified"
+			targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
+			xmlns:ns0="http://activation.javax/"
+			xmlns:xs="http://www.w3.org/2001/XMLSchema">
+			<xs:element name="getNewBigDecimalArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:decimal" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewImageArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewBigDecimal">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:decimal" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewURIArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewObjectArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:anyType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDataHandler">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDateResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewBigInteger">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:integer" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDateArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewBigIntegerArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:integer" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewQNameArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:QName" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewURIResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewUUIDArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewCalendarArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewXMLGregorianCalendarArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:anySimpleType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewCalendarResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewCalendar">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewCalendarArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewImageArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewObjectResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:anyType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDurationArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:duration" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element
+				name="getNewXMLGregorianCalendarArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:anySimpleType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewSource">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewObjectArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:anyType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewUUIDResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewBigIntegerResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:integer" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewQNameArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:QName" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewUUIDArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewBigDecimalResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:decimal" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDateArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewURIArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDurationArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:duration" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewObject">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:anyType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDataHandlerResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewQName">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:QName" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDate">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:dateTime" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewUUID">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewXMLGregorianCalendarResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:anySimpleType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewBigIntegerArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:integer" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewSourceArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewImage">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewSourceArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewXMLGregorianCalendar">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:anySimpleType" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewQNameResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:QName" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDataHandlerArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewBigDecimalArrayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="return" nillable="true" type="xs:decimal" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDuration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:duration" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDataHandlerArray">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element maxOccurs="unbounded" minOccurs="0"
+							name="arg0" nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewImageResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewSourceResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:base64Binary" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewDurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="return"
+							nillable="true" type="xs:duration" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="getNewURI">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="arg0"
+							nillable="true" type="xs:string" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="getNewBigDecimalArray">
+		<wsdl:part name="getNewBigDecimalArray"
+			element="tns:getNewBigDecimalArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewImageArrayResponse">
+
+		<wsdl:part name="getNewImageArrayResponse"
+			element="tns:getNewImageArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewBigDecimal">
+		<wsdl:part name="getNewBigDecimal"
+			element="tns:getNewBigDecimal">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewURIArray">
+		<wsdl:part name="getNewURIArray" element="tns:getNewURIArray">
+
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewObjectArray">
+		<wsdl:part name="getNewObjectArray"
+			element="tns:getNewObjectArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDataHandler">
+		<wsdl:part name="getNewDataHandler"
+			element="tns:getNewDataHandler">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDateResponse">
+		<wsdl:part name="getNewDateResponse"
+			element="tns:getNewDateResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewBigInteger">
+		<wsdl:part name="getNewBigInteger"
+			element="tns:getNewBigInteger">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDateArrayResponse">
+		<wsdl:part name="getNewDateArrayResponse"
+			element="tns:getNewDateArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewBigIntegerArray">
+		<wsdl:part name="getNewBigIntegerArray"
+			element="tns:getNewBigIntegerArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewQNameArrayResponse">
+		<wsdl:part name="getNewQNameArrayResponse"
+			element="tns:getNewQNameArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewURIResponse">
+		<wsdl:part name="getNewURIResponse"
+			element="tns:getNewURIResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewUUIDArrayResponse">
+		<wsdl:part name="getNewUUIDArrayResponse"
+			element="tns:getNewUUIDArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewCalendarArrayResponse">
+		<wsdl:part name="getNewCalendarArrayResponse"
+			element="tns:getNewCalendarArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewXMLGregorianCalendarArray">
+		<wsdl:part name="getNewXMLGregorianCalendarArray"
+			element="tns:getNewXMLGregorianCalendarArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewCalendarResponse">
+		<wsdl:part name="getNewCalendarResponse"
+			element="tns:getNewCalendarResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewCalendar">
+		<wsdl:part name="getNewCalendar" element="tns:getNewCalendar">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewCalendarArray">
+		<wsdl:part name="getNewCalendarArray"
+			element="tns:getNewCalendarArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewImageArray">
+		<wsdl:part name="getNewImageArray"
+			element="tns:getNewImageArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewObjectResponse">
+		<wsdl:part name="getNewObjectResponse"
+			element="tns:getNewObjectResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDurationArray">
+		<wsdl:part name="getNewDurationArray"
+			element="tns:getNewDurationArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewXMLGregorianCalendarArrayResponse">
+		<wsdl:part name="getNewXMLGregorianCalendarArrayResponse"
+			element="tns:getNewXMLGregorianCalendarArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewSource">
+		<wsdl:part name="getNewSource" element="tns:getNewSource">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewObjectArrayResponse">
+		<wsdl:part name="getNewObjectArrayResponse"
+			element="tns:getNewObjectArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewUUIDResponse">
+		<wsdl:part name="getNewUUIDResponse"
+			element="tns:getNewUUIDResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewBigIntegerResponse">
+		<wsdl:part name="getNewBigIntegerResponse"
+			element="tns:getNewBigIntegerResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewQNameArray">
+		<wsdl:part name="getNewQNameArray"
+			element="tns:getNewQNameArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewUUIDArray">
+		<wsdl:part name="getNewUUIDArray"
+			element="tns:getNewUUIDArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewBigDecimalResponse">
+		<wsdl:part name="getNewBigDecimalResponse"
+			element="tns:getNewBigDecimalResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDateArray">
+		<wsdl:part name="getNewDateArray"
+			element="tns:getNewDateArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewURIArrayResponse">
+		<wsdl:part name="getNewURIArrayResponse"
+			element="tns:getNewURIArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDurationArrayResponse">
+		<wsdl:part name="getNewDurationArrayResponse"
+			element="tns:getNewDurationArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewObject">
+		<wsdl:part name="getNewObject" element="tns:getNewObject">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDataHandlerResponse">
+		<wsdl:part name="getNewDataHandlerResponse"
+			element="tns:getNewDataHandlerResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewQName">
+		<wsdl:part name="getNewQName" element="tns:getNewQName">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDate">
+		<wsdl:part name="getNewDate" element="tns:getNewDate">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewUUID">
+		<wsdl:part name="getNewUUID" element="tns:getNewUUID">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewXMLGregorianCalendarResponse">
+		<wsdl:part name="getNewXMLGregorianCalendarResponse"
+			element="tns:getNewXMLGregorianCalendarResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewBigIntegerArrayResponse">
+		<wsdl:part name="getNewBigIntegerArrayResponse"
+			element="tns:getNewBigIntegerArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewSourceArray">
+		<wsdl:part name="getNewSourceArray"
+			element="tns:getNewSourceArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewImage">
+		<wsdl:part name="getNewImage" element="tns:getNewImage">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewSourceArrayResponse">
+		<wsdl:part name="getNewSourceArrayResponse"
+			element="tns:getNewSourceArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewXMLGregorianCalendar">
+		<wsdl:part name="getNewXMLGregorianCalendar"
+			element="tns:getNewXMLGregorianCalendar">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewQNameResponse">
+		<wsdl:part name="getNewQNameResponse"
+			element="tns:getNewQNameResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDataHandlerArrayResponse">
+		<wsdl:part name="getNewDataHandlerArrayResponse"
+			element="tns:getNewDataHandlerArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewBigDecimalArrayResponse">
+		<wsdl:part name="getNewBigDecimalArrayResponse"
+			element="tns:getNewBigDecimalArrayResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDuration">
+		<wsdl:part name="getNewDuration" element="tns:getNewDuration">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDataHandlerArray">
+		<wsdl:part name="getNewDataHandlerArray"
+			element="tns:getNewDataHandlerArray">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewImageResponse">
+		<wsdl:part name="getNewImageResponse"
+			element="tns:getNewImageResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewSourceResponse">
+		<wsdl:part name="getNewSourceResponse"
+			element="tns:getNewSourceResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewDurationResponse">
+		<wsdl:part name="getNewDurationResponse"
+			element="tns:getNewDurationResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="getNewURI">
+		<wsdl:part name="getNewURI" element="tns:getNewURI"></wsdl:part>
+	</wsdl:message>
+	<wsdl:portType name="StandardTypesService">
+		<wsdl:operation name="getNewObject">
+			<wsdl:input message="tns:getNewObject"></wsdl:input>
+			<wsdl:output message="tns:getNewObjectResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewImage">
+			<wsdl:input message="tns:getNewImage"></wsdl:input>
+			<wsdl:output message="tns:getNewImageResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewSource">
+			<wsdl:input message="tns:getNewSource"></wsdl:input>
+			<wsdl:output message="tns:getNewSourceResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigInteger">
+			<wsdl:input message="tns:getNewBigInteger"></wsdl:input>
+			<wsdl:output message="tns:getNewBigIntegerResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigIntegerArray">
+			<wsdl:input message="tns:getNewBigIntegerArray">
+			</wsdl:input>
+			<wsdl:output message="tns:getNewBigIntegerArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigDecimal">
+			<wsdl:input message="tns:getNewBigDecimal"></wsdl:input>
+			<wsdl:output message="tns:getNewBigDecimalResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigDecimalArray">
+			<wsdl:input message="tns:getNewBigDecimalArray">
+			</wsdl:input>
+			<wsdl:output message="tns:getNewBigDecimalArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewCalendar">
+			<wsdl:input message="tns:getNewCalendar"></wsdl:input>
+			<wsdl:output message="tns:getNewCalendarResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewCalendarArray">
+			<wsdl:input message="tns:getNewCalendarArray"></wsdl:input>
+			<wsdl:output message="tns:getNewCalendarArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDate">
+			<wsdl:input message="tns:getNewDate"></wsdl:input>
+			<wsdl:output message="tns:getNewDateResponse"></wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDateArray">
+			<wsdl:input message="tns:getNewDateArray"></wsdl:input>
+			<wsdl:output message="tns:getNewDateArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewQName">
+			<wsdl:input message="tns:getNewQName"></wsdl:input>
+			<wsdl:output message="tns:getNewQNameResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewQNameArray">
+			<wsdl:input message="tns:getNewQNameArray"></wsdl:input>
+			<wsdl:output message="tns:getNewQNameArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewURI">
+			<wsdl:input message="tns:getNewURI"></wsdl:input>
+			<wsdl:output message="tns:getNewURIResponse"></wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewURIArray">
+			<wsdl:input message="tns:getNewURIArray"></wsdl:input>
+			<wsdl:output message="tns:getNewURIArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewXMLGregorianCalendar">
+			<wsdl:input message="tns:getNewXMLGregorianCalendar">
+			</wsdl:input>
+			<wsdl:output
+				message="tns:getNewXMLGregorianCalendarResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewXMLGregorianCalendarArray">
+			<wsdl:input message="tns:getNewXMLGregorianCalendarArray">
+			</wsdl:input>
+			<wsdl:output
+				message="tns:getNewXMLGregorianCalendarArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDuration">
+			<wsdl:input message="tns:getNewDuration"></wsdl:input>
+			<wsdl:output message="tns:getNewDurationResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDurationArray">
+			<wsdl:input message="tns:getNewDurationArray"></wsdl:input>
+			<wsdl:output message="tns:getNewDurationArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewObjectArray">
+			<wsdl:input message="tns:getNewObjectArray"></wsdl:input>
+			<wsdl:output message="tns:getNewObjectArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewImageArray">
+			<wsdl:input message="tns:getNewImageArray"></wsdl:input>
+			<wsdl:output message="tns:getNewImageArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDataHandler">
+			<wsdl:input message="tns:getNewDataHandler"></wsdl:input>
+			<wsdl:output message="tns:getNewDataHandlerResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDataHandlerArray">
+			<wsdl:input message="tns:getNewDataHandlerArray">
+			</wsdl:input>
+			<wsdl:output message="tns:getNewDataHandlerArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewSourceArray">
+			<wsdl:input message="tns:getNewSourceArray"></wsdl:input>
+			<wsdl:output message="tns:getNewSourceArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewUUID">
+			<wsdl:input message="tns:getNewUUID"></wsdl:input>
+			<wsdl:output message="tns:getNewUUIDResponse"></wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewUUIDArray">
+			<wsdl:input message="tns:getNewUUIDArray"></wsdl:input>
+			<wsdl:output message="tns:getNewUUIDArrayResponse">
+			</wsdl:output>
+		</wsdl:operation>
+
+	</wsdl:portType>
+	<wsdl:binding name="StandardTypesServiceBinding"
+		type="tns:StandardTypesService">
+		<soap11:binding style="document"
+			transport="http://schemas.xmlsoap.org/soap/http" />
+		<wsdl:operation name="getNewObject">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewImage">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewSource">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigInteger">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigIntegerArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigDecimal">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewBigDecimalArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewCalendar">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewCalendarArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDate">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDateArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewQName">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewQNameArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewURI">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewURIArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewXMLGregorianCalendar">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewXMLGregorianCalendarArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDuration">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDurationArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewObjectArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewImageArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDataHandler">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewDataHandlerArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewSourceArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewUUID">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="getNewUUIDArray">
+			<soap11:operation />
+			<wsdl:input>
+				<soap11:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap11:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="StandardTypesServiceService">
+		<wsdl:port name="StandardTypesServicePort"
+			binding="tns:StandardTypesServiceBinding">
+			<soap11:address location="http://localhost:8085/sts-ep"/>
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
new file mode 100644
index 0000000000..7bb63fff1e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.topdown;
+
+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.itest.databindings.jaxb.HelloServiceClient;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.Ignore;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DatabindingTestCase {
+
+    private static SCAClient client;
+    private static SCANode node;
+
+    /**
+     * Runs once before running the tests
+     */
+    @BeforeClass
+    public static void setUp() throws Exception {
+        try {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null);
+        node.start();
+        client = (SCAClient)node;
+        }catch(Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Runs once after running the tests
+     */
+    @AfterClass
+    public static void tearDown() {
+        node.stop();
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetings.
+     */
+    @Test
+    public void testW2W() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        performTest(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsArray.
+     */
+    @Test
+    public void testW2WArray() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        performTestArray(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsList.
+     */
+    @Test
+    public void testW2WList() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        performTestList(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsArrayList.
+     */
+    @Test
+    public void testW2WArrayList() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        performTestArrayList(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsMap.
+     */
+    @Test
+    public void testW2WMap() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        performTestMap(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsHashMap.
+     */
+    @Test
+    public void testW2WHashMap() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        performTestHashMap(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsVarArgs.
+     */
+    @Test
+    public void testW2WVarArgs() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        performTestVarArgs(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetings.
+     */
+    @Test
+    public void testJ2W() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        performTest(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsArray.
+     */
+    @Test
+    public void testJ2WArray() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        performTestArray(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsList.
+     */
+    @Test
+    public void testJ2WList() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        performTestList(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsArrayList.
+     */
+    @Test
+    public void testJ2WArrayList() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        performTestArrayList(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsMap.
+     */
+    @Test
+    public void testJ2WMap() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        performTestMap(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsHashMap.
+     */
+    @Test
+    public void testJ2WHashMap() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        performTestHashMap(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsVarArgs.
+     */
+    @Test
+    public void testJ2WVarArgs() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        performTestVarArgs(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetings.
+     */
+    @Test
+    public void testW2J() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        performTest(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsArray.
+     */
+    @Test
+    public void testW2JArray() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        performTestArray(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsList.
+     */
+    @Test
+    public void testW2JList() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        performTestList(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsArrayList.
+     */
+    @Test
+    public void testW2JArrayList() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        performTestArrayList(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsMap.
+     */
+    @Test
+    public void testW2JMap() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        performTestMap(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsHashMap.
+     */
+    @Test
+    public void testW2JHashMap() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        performTestHashMap(helloServiceClient);
+    }
+
+    /**
+     * Invokes the HelloService service using WS binding.
+     * Service method invoked is getGreetingsVarArgs.
+     */
+    @Test
+    public void testW2JVarArgs() throws Exception {
+        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        performTestVarArgs(helloServiceClient);
+    }
+
+    private void performTest(HelloServiceClient helloServiceClient) {
+        String name = "Pandu";
+        String resp = helloServiceClient.getGreetingsForward(name);
+        Assert.assertEquals("Hello "+name, resp);
+    }
+
+    private void performTestArray(HelloServiceClient helloServiceClient) {
+        String[] names = {"Me", "Pandu"};
+        String[] resps = helloServiceClient.getGreetingsArrayForward(names);
+        for(int i = 0; i < names.length; ++i) {
+            Assert.assertEquals("Hello "+names[i], resps[i]);
+        }
+    }
+
+    private void performTestList(HelloServiceClient helloServiceClient) {
+        List<String> namesList = new ArrayList<String>();
+        namesList.add("Me");
+        namesList.add("Pandu");
+        namesList.add("Chinnipandu");
+        List<String> respList = helloServiceClient.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(HelloServiceClient helloServiceClient) {
+        ArrayList<String> namesList = new ArrayList<String>();
+        namesList.add("Me");
+        namesList.add("Pandu");
+        namesList.add("Chinnipandu");
+        ArrayList<String> respList = helloServiceClient.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(HelloServiceClient helloServiceClient) {
+        Map<String, String> namesMap = new HashMap<String, String>();
+        namesMap.put("Me", null);
+        namesMap.put("Pandu", null);
+        namesMap.put("Chinnipandu", null);
+        Map<String, String> respMap = helloServiceClient.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(HelloServiceClient helloServiceClient) {
+        HashMap<String, String> namesMap = new HashMap<String, String>();
+        namesMap.put("Me", null);
+        namesMap.put("Pandu", null);
+        namesMap.put("Chinnipandu", null);
+        Map<String, String> respMap = helloServiceClient.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(HelloServiceClient helloServiceClient) {
+        String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3.
+        String expected = "Hello Me You Pandu";
+        String actual = helloServiceClient.getGreetingsVarArgsForward(names[0], names[1], names[2]);
+        Assert.assertEquals(expected, actual);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
new file mode 100644
index 0000000000..eaf54b0f1b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
@@ -0,0 +1,849 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.topdown;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.Ignore;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class PrimitivesDatabindingTestCase {
+
+    private static SCAClient domain;
+    private static SCANode node;
+
+    /**
+     * Runs before each test method
+     */
+    @BeforeClass
+    public static void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/primitivesservice.composite", null);
+        node.start();
+        domain = (SCAClient)node;
+    }
+
+    /**
+     * Runs after each test method
+     */
+    @AfterClass
+    public static void tearDown() {
+        node.stop();
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateBoolean.
+     */
+    @Test
+    public void testW2WNegateBoolean() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateBoolean(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateBooleanArray.
+     */
+    @Test
+    public void testW2WNegateBooleanArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateBooleanArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for boolean array.
+     */
+    @Test
+    public void testW2WPassByValueBooleanArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateByte.
+     */
+    @Test
+    public void testW2WNegateByte() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateByte(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateByteArray.
+     */
+    @Test
+    public void testW2WNegateByteArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateByteArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for byte array.
+     */
+    @Test
+    public void testW2WPassByValueByteArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateShort.
+     */
+    @Test
+    public void testW2WNegateShort() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateShort(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateShortArray.
+     */
+    @Test
+    public void testW2WNegateShortArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateShortArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for short array.
+     */
+    @Test
+    public void testW2WPassByValueShortArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateInt.
+     */
+    @Test
+    public void testW2WNegateInt() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateInt(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateIntArray.
+     */
+    @Test
+    public void testW2WNegateIntArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateIntArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for int array.
+     */
+    @Test
+    public void testW2WPassByValueIntArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateLong.
+     */
+    @Test
+    public void testW2WNegateLong() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateLong(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateLongArray.
+     */
+    @Test
+    public void testW2WNegateLongArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateLongArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for long array.
+     */
+    @Test
+    public void testW2WPassByValueLongArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateFloat.
+     */
+    @Test
+    public void testW2WNegateFloat() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateFloat(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateFloatArray.
+     */
+    @Test
+    public void testW2WNegateFloatArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateFloatArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for float array.
+     */
+    @Test
+    public void testW2WPassByValueFloatArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateDouble.
+     */
+    @Test
+    public void testW2WNegateDouble() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateDouble(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateDoubleArray.
+     */
+    @Test
+    public void testW2WNegateDoubleArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        performTestNegateDoubleArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for double array.
+     */
+    @Test
+    public void testW2WPassByValueDoubleArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateBoolean.
+     */
+    @Test
+    public void testJ2WNegateBoolean() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateBoolean(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateBooleanArray.
+     */
+    @Test
+    public void testJ2WNegateBooleanArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateBooleanArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for boolean array.
+     */
+    @Test
+    public void testJ2WPassByValueBooleanArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateByte.
+     */
+    @Test
+    public void testJ2WNegateByte() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateByte(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateByteArray.
+     */
+    @Test
+    public void testJ2WNegateByteArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateByteArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for byte array.
+     */
+    @Test
+    public void testJ2WPassByValueByteArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateShort.
+     */
+    @Test
+    public void testJ2WNegateShort() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateShort(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateShortArray.
+     */
+    @Test
+    public void testJ2WNegateShortArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateShortArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for short array.
+     */
+    @Test
+    public void testJ2WPassByValueShortArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateInt.
+     */
+    @Test
+    public void testJ2WNegateInt() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateInt(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateIntArray.
+     */
+    @Test
+    public void testJ2WNegateIntArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateIntArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for int array.
+     */
+    @Test
+    public void testJ2WPassByValueIntArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateLong.
+     */
+    @Test
+    public void testJ2WNegateLong() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateLong(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateLongArray.
+     */
+    @Test
+    public void testJ2WNegateLongArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateLongArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for long array.
+     */
+    @Test
+    public void testJ2WPassByValueLongArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateFloat.
+     */
+    @Test
+    public void testJ2WNegateFloat() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateFloat(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateFloatArray.
+     */
+    @Test
+    public void testJ2WNegateFloatArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateFloatArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for float array.
+     */
+    @Test
+    public void testJ2WPassByValueFloatArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateDouble.
+     */
+    @Test
+    public void testJ2WNegateDouble() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateDouble(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateDoubleArray.
+     */
+    @Test
+    public void testJ2WNegateDoubleArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        performTestNegateDoubleArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for double array.
+     */
+    @Test
+    public void testJ2WPassByValueDoubleArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateBoolean.
+     */
+    @Test
+    public void testW2JNegateBoolean() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateBoolean(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateBooleanArray.
+     */
+    @Test
+    public void testW2JNegateBooleanArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateBooleanArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for boolean array.
+     */
+    @Test
+    public void testW2JPassByValueBooleanArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateByte.
+     */
+    @Test
+    public void testW2JNegateByte() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateByte(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateByteArray.
+     */
+    @Test
+    public void testW2JNegateByteArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateByteArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for byte array.
+     */
+    @Test
+    public void testW2JPassByValueByteArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateShort.
+     */
+    @Test
+    public void testW2JNegateShort() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateShort(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateShortArray.
+     */
+    @Test
+    public void testW2JNegateShortArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateShortArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for short array.
+     */
+    @Test
+    public void testW2JPassByValueShortArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateInt.
+     */
+    @Test
+    public void testW2JNegateInt() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateInt(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateIntArray.
+     */
+    @Test
+    public void testW2JNegateIntArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateIntArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for int array.
+     */
+    @Test
+    public void testW2JPassByValueIntArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateLong.
+     */
+    @Test
+    public void testW2JNegateLong() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateLong(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateLongArray.
+     */
+    @Test
+    public void testW2JNegateLongArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateLongArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for long array.
+     */
+    @Test
+    public void testW2JPassByValueLongArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateFloat.
+     */
+    @Test
+    public void testW2JNegateFloat() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateFloat(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateFloatArray.
+     */
+    @Test
+    public void testW2JNegateFloatArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateFloatArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for float array.
+     */
+    @Test
+    public void testW2JPassByValueFloatArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateDouble.
+     */
+    @Test
+    public void testW2JNegateDouble() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateDouble(primitivesServiceClient);
+    }
+
+    /**
+     * Invokes the PrimitivesService service using WS binding.
+     * Service method invoked is negateDoubleArray.
+     */
+    @Test
+    public void testW2JNegateDoubleArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        performTestNegateDoubleArray(primitivesServiceClient);
+    }
+
+    /**
+     * Test the pass-by-value semantics of a remotable service with WS binding.
+     * Test for double array.
+     */
+    @Test
+    public void testW2JPassByValueDoubleArray() throws Exception {
+        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
+    }
+
+    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.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
new file mode 100644
index 0000000000..4713179267
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
@@ -0,0 +1,1446 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.topdown;
+
+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.net.URL;
+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.itest.databindings.jaxb.StandardTypesServiceClient;
+import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.xml.sax.InputSource;
+import org.junit.Ignore;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class StandardTypesDatabindingTestCase {
+
+    private static SCAClient domain;
+    private static SCANode node;
+
+    /**
+     * Runs once before the tests
+     */
+    @BeforeClass
+    public static void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/standard-types-service.composite", null);
+        node.start();
+        domain = (SCAClient)node;
+    }
+
+    /**
+     * Runs once after the tests
+     */
+    @AfterClass
+    public static void tearDown() {
+        node.stop();
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigInteger.
+     */
+    @Test
+    public void testW2WNewBigInteger() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewBigInteger(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigIntegerArray.
+     */
+    @Test
+    public void testW2WNewBigIntegerArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewBigIntegerArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigDecimal.
+     */
+    @Test
+    public void testW2WNewBigDecimal() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewBigDecimal(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigDecimalArray.
+     */
+    @Test
+    public void testW2WNewBigDecimalArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewBigDecimalArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewCalendar.
+     */
+    @Test
+    public void testW2WNewCalendar() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewCalendar(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewCalendarArray.
+     */
+    @Test
+    public void testW2WNewCalendarArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewCalendarArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDate.
+     */
+    @Test
+    public void testW2WNewDate() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewDate(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDateArray.
+     */
+    @Test
+    public void testW2WNewDateArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewDateArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewQName.
+     */
+    @Test
+    public void testW2WNewQName() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewQName(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewQNameArray.
+     */
+    @Test
+    public void testW2WNewQNameArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewQNameArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewURI.
+     */
+    @Test
+    public void testW2WNewURI() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewURI(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewURIArray.
+     */
+    @Test
+    public void testW2WNewURIArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewURIArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewXMLGregorianCalendar.
+     */
+    @Test
+    public void testW2WNewXMLGregorianCalendar() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewXMLGregorianCalendar(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewXMLGregorianCalendarArray.
+     */
+    @Test
+    public void testW2WNewXMLGregorianCalendarArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewXMLGregorianCalendarArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDuration.
+     */
+    @Test
+    public void testW2WNewDuration() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewDuration(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDurationArray.
+     */
+    @Test
+    public void testW2WNewDurationArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewDurationArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewObject.
+     */
+    @Test
+    public void testW2WNewObject() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewObject(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewObjectArray.
+     */
+    @Test
+    public void testW2WNewObjectArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewObjectArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewImage.
+     */
+    @Test
+    public void testW2WNewImage() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewImage(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewImageArray.
+     */
+    @Test
+    public void testW2WNewImageArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewImageArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDataHandler.
+     */
+    @Test
+    public void testW2WNewDataHandler() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewDataHandler(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDataHandlerArray.
+     */
+    @Test
+    public void testW2WNewDataHandlerArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        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 testW2WNewSource() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewSource(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewSourceArray.
+     */
+    @Test
+    @Ignore("TUSCANY-2452")
+    public void testW2WNewSourceArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewSourceArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewUUID.
+     */
+    @Test
+    public void testW2WNewUUID() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewUUID(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewUUIDArray.
+     */
+    @Test
+    public void testW2WNewUUIDArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+        performTestNewUUIDArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigInteger.
+     */
+    @Test
+    public void testJ2WNewBigInteger() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewBigInteger(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigIntegerArray.
+     */
+    @Test
+    public void testJ2WNewBigIntegerArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewBigIntegerArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigDecimal.
+     */
+    @Test
+    public void testJ2WNewBigDecimal() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewBigDecimal(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigDecimalArray.
+     */
+    @Test
+    public void testJ2WNewBigDecimalArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewBigDecimalArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewCalendar.
+     */
+    @Test
+    public void testJ2WNewCalendar() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewCalendar(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewCalendarArray.
+     */
+    @Test
+    public void testJ2WNewCalendarArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewCalendarArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDate.
+     */
+    @Test
+    public void testJ2WNewDate() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewDate(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDateArray.
+     */
+    @Test
+    public void testJ2WNewDateArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewDateArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewQName.
+     */
+    @Test
+    public void testJ2WNewQName() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewQName(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewQNameArray.
+     */
+    @Test
+    public void testJ2WNewQNameArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewQNameArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewURI.
+     */
+    @Test
+    public void testJ2WNewURI() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewURI(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewURIArray.
+     */
+    @Test
+    public void testJ2WNewURIArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewURIArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewXMLGregorianCalendar.
+     */
+    @Test
+    public void testJ2WNewXMLGregorianCalendar() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewXMLGregorianCalendar(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewXMLGregorianCalendarArray.
+     */
+    @Test
+    public void testJ2WNewXMLGregorianCalendarArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewXMLGregorianCalendarArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDuration.
+     */
+    @Test
+    public void testJ2WNewDuration() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewDuration(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDurationArray.
+     */
+    @Test
+    public void testJ2WNewDurationArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewDurationArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewObject.
+     */
+    @Test
+    public void testJ2WNewObject() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewObject(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewObjectArray.
+     */
+    @Test
+    public void testJ2WNewObjectArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewObjectArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewImage.
+     */
+    @Test
+    public void testJ2WNewImage() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewImage(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewImageArray.
+     */
+    @Test
+    public void testJ2WNewImageArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewImageArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDataHandler.
+     */
+    @Test
+    public void testJ2WNewDataHandler() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewDataHandler(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDataHandlerArray.
+     */
+    @Test
+    public void testJ2WNewDataHandlerArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        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 testJ2WNewSource() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewSource(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewSourceArray.
+     */
+    @Test
+    @Ignore("TUSCANY-2452")
+    public void testJ2WNewSourceArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewSourceArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewUUID.
+     */
+    @Test
+    public void testJ2WNewUUID() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewUUID(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewUUIDArray.
+     */
+    @Test
+    public void testJ2WNewUUIDArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+        performTestNewUUIDArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigInteger.
+     */
+    @Test
+    public void testW2JNewBigInteger() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewBigInteger(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigIntegerArray.
+     */
+    @Test
+    public void testW2JNewBigIntegerArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewBigIntegerArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigDecimal.
+     */
+    @Test
+    public void testW2JNewBigDecimal() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewBigDecimal(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewBigDecimalArray.
+     */
+    @Test
+    public void testW2JNewBigDecimalArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewBigDecimalArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewCalendar.
+     */
+    @Test
+    public void testW2JNewCalendar() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewCalendar(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewCalendarArray.
+     */
+    @Test
+    public void testW2JNewCalendarArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewCalendarArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDate.
+     */
+    @Test
+    public void testW2JNewDate() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewDate(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDateArray.
+     */
+    @Test
+    public void testW2JNewDateArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewDateArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewQName.
+     */
+    @Test
+    public void testW2JNewQName() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewQName(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewQNameArray.
+     */
+    @Test
+    public void testW2JNewQNameArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewQNameArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewURI.
+     */
+    @Test
+    public void testW2JNewURI() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewURI(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewURIArray.
+     */
+    @Test
+    public void testW2JNewURIArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewURIArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewXMLGregorianCalendar.
+     */
+    @Test
+    public void testW2JNewXMLGregorianCalendar() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewXMLGregorianCalendar(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewXMLGregorianCalendarArray.
+     */
+    @Test
+    public void testW2JNewXMLGregorianCalendarArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewXMLGregorianCalendarArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDuration.
+     */
+    @Test
+    public void testW2JNewDuration() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewDuration(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDurationArray.
+     */
+    @Test
+    public void testW2JNewDurationArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewDurationArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewObject.
+     */
+    @Test
+    public void testW2JNewObject() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewObject(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewObjectArray.
+     */
+    @Test
+    public void testW2JNewObjectArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewObjectArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewImage.
+     */
+    @Test
+    public void testW2JNewImage() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewImage(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewImageArray.
+     */
+    @Test
+    public void testW2JNewImageArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewImageArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDataHandler.
+     */
+    @Test
+    public void testW2JNewDataHandler() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewDataHandler(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewDataHandlerArray.
+     */
+    @Test
+    public void testW2JNewDataHandlerArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        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 testW2JNewSource() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewSource(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewSourceArray.
+     */
+    @Test
+    @Ignore("TUSCANY-2452")
+    public void testW2JNewSourceArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewSourceArray(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewUUID.
+     */
+    @Test
+    public void testW2JNewUUID() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        performTestNewUUID(serviceClient);
+    }
+
+    /**
+     * Invokes the StandardTypesService service using WS binding.
+     * Service method invoked is getNewUUIDArray.
+     */
+    @Test
+    public void testW2JNewUUIDArray() throws Exception {
+        StandardTypesServiceClient serviceClient =
+            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+        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(new URL("http://tuscany.apache.org/home.html"));
+        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(new URL("http://tuscany.apache.org/home.html"));
+        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 = "<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 = "<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.5.1/itest/databindings/jaxbgen/pom.xml b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/pom.xml
new file mode 100644
index 0000000000..b1f71c57fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/pom.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>itest-databindings-jaxb</artifactId>
+    <version>1.5.1</version>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA iTest JAXB Databinding</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.5.1</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.5.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
new file mode 100644
index 0000000000..8381a164ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite
new file mode 100644
index 0000000000..ae0740e6fe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    *

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    *

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/databindings/pom.xml b/tags/java/sca/1.5.1/itest/databindings/pom.xml
new file mode 100644
index 0000000000..54c1623e32
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</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>jaxb-top-down</module>
+    <module>interop</module>
+  </modules>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/databindings/readme.html b/tags/java/sca/1.5.1/itest/databindings/readme.html
new file mode 100644
index 0000000000..24a44e4ed7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/readme.html
@@ -0,0 +1,157 @@
+<!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.5.1/itest/databindings/sdogen/pom.xml b/tags/java/sca/1.5.1/itest/databindings/sdogen/pom.xml
new file mode 100644
index 0000000000..2fde742fd8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/sdogen/pom.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>itest-databindings-sdo</artifactId>
+    <version>1.5.1</version>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA iTest SDO Databinding</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.1</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.5.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/tags/java/sca/1.5.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml
new file mode 100644
index 0000000000..3f9926604d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/tags/java/sca/1.5.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
new file mode 100644
index 0000000000..9494d70f96
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/distro-license-check/pom.xml b/tags/java/sca/1.5.1/itest/distro-license-check/pom.xml
new file mode 100644
index 0000000000..aeea6fff2a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/distro-license-check/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-distro-license-check</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution License Check</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution</artifactId>
+            <version>1.5.1</version>
+            <type>zip</type>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java b/tags/java/sca/1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
new file mode 100644
index 0000000000..aeddae245c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
@@ -0,0 +1,160 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package itest;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import junit.framework.TestCase;
+
+public class LicenseTestCase extends TestCase {
+
+    // TODO: turn this in to a maven plugin that can be run from the module that builds the archive
+    
+    public void testCreateComponent() throws ZipException, IOException {
+
+        File archive = new File("..\\..\\distribution\\target\\apache-tuscany-sca-1.5.1.zip");
+        ZipFile zf = new ZipFile(archive);
+        try {
+
+            String licenstText = getLicenseText(zf);
+            List<String> jarsInArchive = getJarsInDistro(zf);
+
+            List<String> jarsNotInLicense = getJarsNotInLicense(licenstText, jarsInArchive);
+            if (jarsNotInLicense.size() > 0) {
+                System.out.println("jarsNotInLicense: " + jarsNotInLicense);
+            }
+
+            List<String> jarsNotInArchive = getJarsNotInArchive(licenstText, jarsInArchive);
+            if (jarsNotInArchive.size() > 0) {
+                System.out.println("jarsNotInArchive: " + jarsNotInArchive);
+            }
+            
+            assertTrue("License errors, check log for details", jarsNotInArchive.size()==0 && jarsNotInLicense.size()==0);
+
+        } finally {
+            zf.close();
+        }
+    }
+
+    private List<String> getJarsNotInLicense(String licenstText, List<String> jarsInArchive) {
+        List<String> jarsNotInLicense = new ArrayList<String>();
+        for (String jarName : jarsInArchive) {
+            if (!licenseHasJar(licenstText, jarName)) {
+                jarsNotInLicense.add(jarName);
+            }
+        }
+        return jarsNotInLicense;
+    }
+
+    private List<String> getJarsNotInArchive(String licenstText, List<String> jarsInArchive) throws IOException {
+        List<String> jarsNotInArchive = new ArrayList<String>();
+        BufferedReader reader = new BufferedReader(new StringReader(licenstText));
+        String line = null;
+        while ((line = reader.readLine()) != null) {
+            line = line.trim();
+            if (line.contains(".jar")) {
+                StringTokenizer st = new StringTokenizer(line);
+                while (st.hasMoreTokens()) {
+                    String s = st.nextToken();
+                    if (s.contains(".jar")) {
+                        if (s.startsWith("(")) {
+                            s = s.substring(1);
+                        }
+                        if (s.endsWith(",") || s.endsWith(":")) {
+                            s = s.substring(0, s.length()-1);
+                        }
+                        if (s.endsWith(")")) {
+                            s = s.substring(0, s.length()-1);
+                        }
+                        if (!jarsInArchive.contains(s) && !s.startsWith("tuscany-")) {
+                            jarsNotInArchive.add(s);
+                        }
+                    }
+                }
+            }
+        }
+        return jarsNotInArchive;
+    }
+
+    private boolean licenseHasJar(String licenstText, String jarName) {
+        // TODO: be good to make these configurable, maybe system props that can
+        // be configured in the pom.xml?
+        if (jarName.startsWith("tuscany-")) {
+            return true;
+        } else if (jarName.startsWith("demo-bigbank")) {
+            return true;
+        } else if (jarName.startsWith("tutorial-")) {
+            return true;
+        } else if (jarName.startsWith("sample-")) {
+            return true;
+        } else {
+            return licenstText.indexOf(jarName) > -1;
+        }
+    }
+
+    private String getLicenseText(ZipFile zf) throws IOException {
+        ZipEntry ze = zf.getEntry("tuscany-sca-1.5.1/LICENSE");
+        InputStream in = zf.getInputStream(ze);
+        String l = readLICENSE(in);
+        return l;
+    }
+
+    private List<String> getJarsInDistro(ZipFile zf) {
+        ZipEntry ze;
+        List<String> jarsInArchive = new ArrayList<String>();
+        for (Enumeration<? extends ZipEntry> e = zf.entries(); e.hasMoreElements();) {
+            ze = e.nextElement();
+            String name = ze.getName();
+            if (name.endsWith(".jar")) {
+                if (name.lastIndexOf('/') > -1){
+                    name = name.substring(name.lastIndexOf('/')+1);
+                }
+                jarsInArchive.add(name);
+            }
+        }
+        System.out.println("jarsInArchive: " + jarsInArchive.size());
+        return jarsInArchive;
+    }
+
+    private static String readLICENSE(InputStream in) throws java.io.IOException {
+        StringBuffer fileData = new StringBuffer();
+        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+        char[] buf = new char[16384];
+        int numRead = 0;
+        while ((numRead = reader.read(buf)) != -1) {
+            String readData = String.valueOf(buf, 0, numRead);
+            fileData.append(readData);
+            buf = new char[16384];
+        }
+        reader.close();
+        return fileData.toString();
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/domain/pom.xml b/tags/java/sca/1.5.1/itest/domain/pom.xml
new file mode 100644
index 0000000000..b425e89a99
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domain</artifactId>
+    <name>Apache Tuscany SCA Domain Integration Tests</name>
+
+    <dependencies>
+            
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>    
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher</artifactId>
+            <version>1.5.1</version>
+        </dependency>    
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-workspace-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>                                        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.5.1</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-monitor</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>            
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>   
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddService.java
new file mode 100644
index 0000000000..797ebb4024
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddService.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddServiceImpl.java
new file mode 100644
index 0000000000..1a63d4ff77
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddServiceImpl.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
new file mode 100644
index 0000000000..93486d915e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 AddServiceUpdateImpl implements AddService {

+

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

+        System.out.println("AddService Update - add " + n1 + " and " + n2);

+        return n1 + n2;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/CalculatorService.java
new file mode 100644
index 0000000000..2718ab8772
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/CalculatorService.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 Calculator service interface.

+ */

+@Remotable

+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.5.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..3cb255843f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
@@ -0,0 +1,74 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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[1].add(addService[0].add(n1, n2), 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.5.1/itest/domain/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/DivideService.java
new file mode 100644
index 0000000000..ef6a8b375b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/DivideService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java
new file mode 100644
index 0000000000..8c33862f6d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/MultiplyService.java
new file mode 100644
index 0000000000..db568cc762
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/MultiplyService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..c7fbc73c00
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/SubtractService.java
new file mode 100644
index 0000000000..615320e670
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/SubtractService.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
new file mode 100644
index 0000000000..abf2777c7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/domain/src/main/resources/contributionA/Calculator.composite b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionA/Calculator.composite
new file mode 100644
index 0000000000..534e1a29af
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionA/Calculator.composite
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"/>

+        <service name="CalculatorService">

+            <binding.sca/>

+        </service>		

+        <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.5.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..1b1c0291e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
new file mode 100644
index 0000000000..bdb89803d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="CalculatorServiceComponentB">

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

+        <reference name="addService" target="AddServiceComponentB" />     

+        <reference name="subtractService" target="SubtractServiceComponentC" />

+        <reference name="multiplyService" target="MultiplyServiceComponentB"/>     

+        <reference name="divideService" target="DivideServiceComponentB" />

+    </component>

+

+    <component name="MultiplyServiceComponentB">

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

+    </component>   

+    

+    <component name="DivideServiceComponentB">

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

+    </component>

+    

+    <component name="AddServiceComponentB">

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

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
new file mode 100644
index 0000000000..c5af8dd3cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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/>

+        </service>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite
new file mode 100644
index 0000000000..df00387b23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://dependent"

+           xmlns:dependent="http://dependent"

+           name="CalculatorB">

+               

+    <component name="AddServiceComponentB">

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

+        <service name="AddService">

+            <binding.ws uri="http://localhost:8085/AddServiceComponentB"/>

+        </service>

+    </component>

+    

+    <component name="SubtractServiceComponentB">

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

+    </component>    

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8264a8243f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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://dependent"

+              xmlns:sample="http://dependent">

+   <export namespace="http://dependent"/>

+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
new file mode 100644
index 0000000000..92d069c6c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://primary"

+           xmlns:primary="http://primary"

+           xmlns:dependent="http://dependent"

+           name="CalculatorA">

+           

+    <include name="dependent:CalculatorB"/>

+

+    <component name="CalculatorServiceComponentA">

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

+        <service name="CalculatorService">

+            <binding.sca/>

+        </service>		

+        <reference name="addService" multiplicity="0..n" target="AddServiceComponentA AddServiceComponentB AddServiceComponentC">

+          <binding.sca/>

+          <binding.ws/>

+        </reference>

+        <reference name="subtractService" target="SubtractServiceComponentB" />

+        <reference name="multiplyService" target="MultiplyServiceComponentA" />     

+        <reference name="divideService" target="DivideServiceComponentA" />

+    </component>  

+

+    <component name="AddServiceComponentA">

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

+        <service name="AddService">

+            <binding.sca/>

+        </service>

+    </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.5.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..e53c14a651
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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://primary"

+              xmlns:sample="http://primary">

+   <deployable composite="sample:CalculatorA"/>

+   <import namespace="http://dependent"/>

+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/tags/java/sca/1.5.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
new file mode 100644
index 0000000000..98f13df774
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
@@ -0,0 +1,279 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.itest.domain;
+
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+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.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import calculator.CalculatorService;
+
+/**
+ * Runs a distributed domain in a single VM by using and in memory 
+ * implementation of the distributed domain
+ */
+public class ContributionSPIsTestCase {
+    
+     final static Logger logger = Logger.getLogger(ContributionSPIsTestCase.class.getName());
+    
+    private static ModelFactoryExtensionPoint modelFactories;
+    private static WorkspaceFactory workspaceFactory;  
+    private static XMLOutputFactory outputFactory;    
+    
+    private static ModelResolverExtensionPoint modelResolvers;
+    
+    private static URLArtifactProcessorExtensionPoint urlProcessors;
+    private static URLArtifactProcessor<Contribution> contributionProcessor;
+    
+    private static Workspace workspace;
+    
+    private static List<String> problems = new ArrayList<String>();
+    private static ContributionDependencyBuilder dependencyBuilder;
+    
+    @BeforeClass
+    public static void init() throws Exception {
+
+        try {
+            // Bootstrap a runtime to get a populated registry
+            // FIXME needs to be tidied so we can get the registry without all of the other configuration
+            //       that is being repeated below
+            ReallySmallRuntime runtime = new ReallySmallRuntime(Thread.currentThread().getContextClassLoader());
+            runtime.start();
+            ExtensionPointRegistry registry = runtime.getExtensionPointRegistry();
+            
+            // Create model factories
+            modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
+            outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
+            outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
+            workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class);
+            
+            // Create model resolvers
+            modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class);
+
+            // Create artifact processors
+            urlProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
+                 
+            // Create contribution processor
+            contributionProcessor = urlProcessors.getProcessor(Contribution.class);
+            
+            // Create workspace model to hold contribution information
+            workspace = workspaceFactory.createWorkspace();
+            
+            MonitorFactory monitorFactory = registry.getExtensionPoint(MonitorFactory.class);
+            Monitor monitor = monitorFactory.createMonitor();
+            dependencyBuilder = new ContributionDependencyBuilderImpl(monitor);  
+            
+        } catch(Exception ex){
+            ex.printStackTrace();
+        } 
+        
+   }
+
+    @Test
+    public void testReadDependentContributions() throws Exception { 
+        try {            
+            // ====================================================================
+            // The contribution management phase. I.e. where a use is adding contributions
+            // prior to selecting a composite to run
+            
+            // Load a contribution
+            // Note that this contribution is added before the contribution that it depends on
+            // as the contribution processing doesn't start until both have been added
+            URI uri = URI.create("contributionPrimary");
+            File file = new File("./src/main/resources/contributionPrimary");
+            URL url = file.toURI().toURL();
+            Contribution contribution = (Contribution)contributionProcessor.read(null,uri, url);
+            workspace.getContributions().add(contribution);
+            System.out.println("Added contributionPrimary");
+            
+            // Load another contribution  
+            uri = URI.create("contributionDependent");
+            file = new File("./src/main/resources/contributionDependent");
+            url = file.toURI().toURL();      
+            contribution = (Contribution)contributionProcessor.read(null,uri, url);        
+            workspace.getContributions().add(contribution);
+            System.out.println("Added contributionDependent");
+              
+            // Choose a deployables as though a user had chosen it
+            List<Composite> deployables = workspace.getContributions().get(0).getDeployables();
+            QName chosenDeployableName = deployables.get(0).getName();
+            System.out.println("Composite chosen to deploy = " + chosenDeployableName);
+
+                  
+            // List the dependency problems
+            for (int i = 0, n = problems.size(); i < n ; i++) {
+                System.out.println("Problem: "+ problems.get(i));
+            }
+            
+            // ====================================================================
+            // process the first chosen composite ready for a node to run the composite
+             
+            // find the contribution that holds our chosen composite and all its dependencies 
+            // we are using the first deployable composite from the first contribution 
+            // so we really know this here really but lets find it anyway
+            List<Contribution> contributionsToDeploy = null;
+            String chosenDeployableLocation = null;
+            for (Contribution tmpContribution : workspace.getContributions()){
+                for (Composite deployable : tmpContribution.getDeployables()){
+                    if (deployable.getName().equals(chosenDeployableName)){
+                        contributionsToDeploy = dependencyBuilder.buildContributionDependencies(tmpContribution, workspace);
+                    }
+                }
+            }
+            
+            // load all the contributions in the dependency chain to find the chosen 
+            // composite
+            List<Contribution> loadedContributions = new ArrayList<Contribution>();
+            for (Contribution tmpContribution : contributionsToDeploy){
+                Contribution loadedContribution = contribution(loadedContributions, tmpContribution.getURI(), tmpContribution.getLocation());
+                loadedContributions.add(loadedContribution);
+                
+                // find the chosen composite artifact location
+                for ( Artifact artifact :loadedContribution.getArtifacts()){
+                    if ( artifact.getURI().endsWith(".composite")){
+                        Composite model = (Composite)artifact.getModel();
+                        if (model.getName().equals(chosenDeployableName)){
+                            chosenDeployableLocation = artifact.getLocation();
+                        }
+                    }
+                }                
+            }            
+            
+            System.out.println("Composite chosen to deploy location = " + chosenDeployableLocation);
+            for (Contribution dependency : contributionsToDeploy){
+                System.out.println("Composite chosen to deploy dependency chain = " + dependency.getURI());
+            }
+            
+/* At this point if there is more than one composite in the domain
+ * we would build the domain to configure all the endpoint URIs
+ * and then pass the individual composites off to the separate
+ * nodes that are going to run the
+ * TODO - I've skipped this part for clarity at the moment
+ *             
+            // create a domain level composite
+            Composite domainComposite = assemblyFactory.createComposite();
+            domainComposite.setName(new QName(Constants.SCA10_TUSCANY_NS, "domain"));
+            
+            // etc.
+ */
+           
+          
+            
+            // ====================================================================
+            // run the chosen composite   
+            SCAContribution [] contributions = new SCAContribution[contributionsToDeploy.size()];
+            for (int i = 0; i < contributionsToDeploy.size(); i++) {
+                contributions[i] = new SCAContribution(contributionsToDeploy.get(i).getURI(), contributionsToDeploy.get(i).getLocation()); 
+            }
+                   
+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+            
+            SCANode node = nodeFactory.createSCANode(chosenDeployableLocation, contributions);
+            
+            node.start();
+            SCAClient client = (SCAClient)node;
+            CalculatorService calculatorService = 
+                client.getService(CalculatorService.class, "CalculatorServiceComponentA");
+            
+            System.out.println("Add 2.0 + 3.0 + 3.0 = " + calculatorService.add(2.0, 3.0));
+
+/*
+            AssemblyInspector assemblyInspector = new AssemblyInspector();
+            System.out.println(assemblyInspector.assemblyAsString(node));
+*/
+            
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            Assert.fail();
+        }             
+    }
+    
+    
+    private Contribution contribution(List<Contribution> contributions, String contributionURI, String contributionLocation) throws ContributionReadException {
+        try {
+            URI uri = URI.create(contributionURI);
+            URL location = locationURL(contributionLocation);
+            Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
+            
+            ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
+            contributionProcessor.resolve(contribution, modelResolver);
+            
+            return contribution;
+
+        } catch (ContributionReadException e) {
+            throw e;
+        } catch (ContributionResolveException e) {
+            throw new ContributionReadException(e);
+        } catch (MalformedURLException e) {
+            throw new ContributionReadException(e);
+        }
+    }
+    
+    private static URL locationURL(String location) throws MalformedURLException {
+        URI uri = URI.create(location);
+        String scheme = uri.getScheme();
+        if (scheme == null) {
+            File file = new File(location);
+            return file.toURI().toURL();
+        } else if (scheme.equals("file")) {
+            File file = new File(location.substring(5));
+            return file.toURI().toURL();
+        } else {
+            return uri.toURL();
+        }
+    }
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/client/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/pom.xml
new file mode 100644
index 0000000000..8c00b6ec06
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-basic</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-basic-client</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Basic Client Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-basic-tours</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java
new file mode 100644
index 0000000000..64a1487f72
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java
@@ -0,0 +1,47 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.client;

+

+import java.math.BigDecimal;

+

+import com.tuscanyscatours.Bookings;

+import com.tuscanyscatours.Checkout;

+

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

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

+

+@Service(Runnable.class)

+public class TestClient {

+    @Reference

+    protected Bookings bookings;

+

+    @Reference

+    protected Checkout checkout;

+

+    public TestClient() {

+    }

+

+    public void run() {

+        String bookingCode = bookings.newBooking("FS1APR4", 1);

+        System.out.println("Booking code is " + bookingCode);

+

+        checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..0e2af2345d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:client="http://client.scatours/">

+    <!--export namespace="http://client.scatours/" /-->

+    <import.java package="com.tuscanyscatours" />

+    <deployable composite="client:Client" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/client.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/client.composite
new file mode 100644
index 0000000000..05c2755114
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/client.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.scatours/"

+    name="Client">

+

+    <component name="TestClient">

+        <implementation.java class="scatours.client.TestClient" />

+        <reference name="bookings" target="TripBooking/Bookings" />

+        <reference name="checkout" target="ShoppingCart/Checkout" />

+     </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/pom.xml
new file mode 100644
index 0000000000..c11131edbe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-basic</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Basic</name>
+
+    <packaging>pom</packaging>
+    <build>
+        <defaultGoal>install</defaultGoal>
+    </build>
+    <modules>
+        <module>trips</module>
+        <module>tours</module>
+        <module>client</module>
+        <module>runtest</module>
+    </modules>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/pom.xml
new file mode 100644
index 0000000000..593c13fef4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-basic</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-basic-runtest</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Basic Run Test</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-basic-trips</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-basic-tours</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-basic-client</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <reportFormat>brief</reportFormat>
+                    <useFile>false</useFile>
+                    <forkMode>once</forkMode>
+                    <argLine>-ea -Xmx256m</argLine>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java
new file mode 100644
index 0000000000..46e5ab03af
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java
@@ -0,0 +1,345 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package domainmgr;

+

+import java.io.BufferedReader;

+import java.io.File;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.io.OutputStream;

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.Test;

+

+/**

+ * Starts the Romain Manager with a test configuration, then starts

+ * a test node that reads a deployed composite.  The domain manager

+ * should read and configure the composite and send it to the node

+ * without detecting or reporting any errors.

+ */

+public class DomainManagerBasicTestCase {

+

+    private String home = System.getProperty("java.home");

+    private String classpath = System.getProperty("java.class.path");

+    //private Runtime runtime = Runtime.getRuntime();

+    private BufferedReader domainErrReader;

+    private BufferedReader domainOutReader;

+

+    @Test

+    public void test() throws Exception {

+

+        Process domainMgr = null;

+        TestNode tripsNode = null;

+        TestNode toursNode = null;

+

+        try {

+            // Start the domain manager process in its own working directory of

+            // "target/test-classes/domain/" to ensure no interference with the

+            // node processes.  The predefined domain config is copied by mvn

+            // from the "src/test/resources/domain/" directory.

+            System.out.println("Starting domain manager");

+            String[] domainCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"};

+            String userdir = System.getProperty("user.dir");

+            domainMgr = Runtime.getRuntime().exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/"));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the domain manager process.

+            InputStream domainErr = domainMgr.getErrorStream();

+            domainErrReader = new BufferedReader(new InputStreamReader(domainErr));

+            InputStream domainOut = domainMgr.getInputStream();

+            domainOutReader = new BufferedReader(new InputStreamReader(domainOut));

+            OutputStream domainIn = domainMgr.getOutputStream();

+

+            // Read startup log output from the domain manager process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // domain manager started successfully

+                    System.out.println("Domain manager started successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+            

+            // Start the test nodes.  Each node runs in its own "target" directory

+            // to ensure no interference with other processes.

+            tripsNode = new TestNode("TripsNode", userdir + "/../trips/target/");

+            tripsNode.start();

+            toursNode = new TestNode("ToursNode", userdir + "/../tours/target/");

+            toursNode.start();

+            

+            // Start the client node.  This runs in the current process so that

+            // we can use the SCAClient API to invoke its services.  The current

+            // working directory is "runtest" which means there is no interference

+            // other processes.

+            SCANode clientNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode");

+            checkDomainErr();

+            checkDomainOut();

+            clientNode.start();

+

+            // Run the client test code.

+            Runnable client = ((SCAClient)clientNode).getService(Runnable.class, "TestClient/Runnable");

+            client.run();

+            tripsNode.checkNodeErr();

+            tripsNode.checkNodeOut();

+            toursNode.checkNodeErr();

+            toursNode.checkNodeOut();

+            

+            // Stop the client node.

+            clientNode.stop();

+

+            // Stop the test nodes.

+            toursNode.stopNode();

+            tripsNode.stopNode();

+

+            // Stop the domain manager by sending 'q' to stdin.

+            System.out.println("Stopping domain manager");

+            domainIn.write('q');

+            domainIn.flush();

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before shutdown completed

+                    throw new IllegalStateException("Error stopping Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // shutdown error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: SCA Domain Manager is now stopped.")) {

+                    // domain manager stopped successfully

+                    System.out.println("Domain manager stopped successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+

+            // Wait for domain manager process to end, and check its exit value.

+            int value = domainMgr.waitFor();

+            if (value != 0) {

+                throw new IllegalStateException("Domain Manager process exit value " + value);

+            }

+

+        } catch (Exception ex) {

+

+            // Error found, so destroy the test node processes and the domain

+            // manager process so that the test case exits cleanly.

+            if (tripsNode != null) {

+                tripsNode.destroyNode();

+            }

+            if (toursNode != null) {

+                toursNode.destroyNode();

+            }

+            if (domainMgr != null) {

+                System.out.println("Destroying domain");

+                try {

+                    domainMgr.destroy();

+                } catch (Exception e) {

+                }

+            }

+

+            // Report the test error.

+            throw ex;

+        }

+    }

+

+    /*

+     * Check stderr for the domain manager process.  Called periodically

+     * to ensure that anything written to stderr is displayed in the test log

+     * and abort execution if the domain manager has logged any errors.

+     */

+    private void checkDomainErr() throws Exception {

+        while (domainErrReader.ready()) {

+            String line = domainErrReader.readLine();

+            System.out.println("DomainMgr.e: " + line);

+            if (line.contains("SEVERE:")) {

+                throw new IllegalStateException("Domain manager reported error: " + line);

+            }

+        }

+    }

+

+    /*

+     * Check stdout for the domain manager process.  Called periodically

+     * to ensure that anything written to stdout is displayed in the test log. 

+     */

+    private void checkDomainOut() throws Exception {

+        while (domainOutReader.ready()) {

+            String line = domainOutReader.readLine();

+            System.out.println("DomainMgr.o: " + line);

+        }

+    }

+

+    /*

+     * Internal class representing a test node.

+     */

+    private class TestNode {

+

+        String nodeName;

+        String nodeDir;

+        BufferedReader nodeErrReader;

+        BufferedReader nodeOutReader;

+        OutputStream nodeIn;

+        Process nodeProcess;

+

+        TestNode(String nodeName, String nodeDir) {

+            this.nodeName = nodeName;

+            this.nodeDir = nodeDir;

+        }

+

+        /*

+         * Start the test node.

+         */

+        void start() throws Exception {

+            System.out.println("Starting node " + nodeName);

+            String[] nodeCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.NodeLauncher",

+                "http://localhost:9990/node-config/" + nodeName};

+            nodeProcess = Runtime.getRuntime().exec(nodeCommand, null, new File(nodeDir));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the test node process.

+            InputStream nodeErr = nodeProcess.getErrorStream();

+            nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr));

+            InputStream nodeOut = nodeProcess.getInputStream();

+            nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut));

+            nodeIn = nodeProcess.getOutputStream();

+

+            // Read startup log output from the test node process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                checkDomainErr();

+                checkDomainOut();

+                checkNodeOut();

+                String line = nodeErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting node " + nodeName);

+                }

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by test node process

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // test node started successfully

+                    System.out.println("Node " + nodeName + " started successfully");

+                    break;

+                }

+            }

+            checkDomainErr();

+            checkDomainOut();

+            checkNodeOut();

+        }

+

+        /*

+         * Check stderr for the test node process.  Called periodically to

+         * ensure that anything written to stderr is displayed in the test log

+         * and abort execution if the test node has logged any errors.

+         */

+        void checkNodeErr() throws Exception {

+            while (nodeErrReader.ready()) {

+                String line = nodeErrReader.readLine();

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+            }

+        }

+

+        /*

+         * Check stdout for the test node process.  Called periodically to

+         * ensure that anything written to stdout is displayed in the test log.

+         */

+        void checkNodeOut() throws Exception {

+            while (nodeOutReader.ready()) {

+                String line = nodeOutReader.readLine();

+                System.out.println(nodeName + ".o: " + line);

+            }

+        }

+

+        /*

+         * Stop the test node process.

+         */

+        void stopNode() throws Exception {

+            System.out.println("Stopping node " + nodeName);

+            nodeIn.write('q');

+            nodeIn.flush();

+            while (true) {

+                checkNodeOut();

+                String line = nodeErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before shutdown completed

+                    throw new IllegalStateException("Error stopping node " + nodeName);

+                }

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // shutdown error logged by test node process

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+                if (line.contains("INFO: SCA Node is now stopped.")) {

+                    // test node stopped successfully

+                    System.out.println("Node " + nodeName + " stopped successfully");

+                    break;

+                }

+            }

+            checkNodeOut();

+

+            // Wait for test node process to end, and check its exit value.

+            int value = nodeProcess.waitFor();

+            if (value != 0) {

+                throw new IllegalStateException("Node " + nodeName + " exit value " + value);

+            }

+        }

+

+        /*

+         * Destroy the test node process.

+         */

+        void destroyNode() {

+            if (nodeProcess != null) {

+                System.out.println("Destroying node " + nodeName);

+                try {

+                    nodeProcess.destroy();

+                } catch (Exception e) {

+                }

+            }

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite
new file mode 100644
index 0000000000..42109ef963
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="cloud"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:TripsNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud"/>
+    <include name="ns2:ToursNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud"/>
+    <include name="ns2:ClientNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud"/>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite
new file mode 100644
index 0000000000..5f5fe2fc96
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://client.scatours/"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="ClientNode">
+    <component name="ClientNode">
+        <t:implementation.node uri="client" composite="c:Client" />
+        <service name="Node">
+            <binding.sca uri="http://localhost:8081" />
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite
new file mode 100644
index 0000000000..4f75d7cba2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://tuscanyscatours.com/"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="ToursNode">
+    <component name="ToursNode">
+        <t:implementation.node uri="tuscanyscatours" composite="c:Tours" />
+        <service name="Node">
+            <binding.sca uri="http://localhost:8082" />
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite
new file mode 100644
index 0000000000..4254b0d6fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://goodvaluetrips.com/"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="TripsNode">
+    <component name="TripsNode">
+        <t:implementation.node uri="goodvaluetrips" composite="c:Trips" />
+        <service name="Node">
+             <binding.sca uri="http://localhost:8083" />
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite
new file mode 100644
index 0000000000..4141457795
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="domain"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:Trips"
+           uri="goodvaluetrips"
+           xmlns:ns2="http://goodvaluetrips.com/"/>
+    <include name="ns2:Tours"
+           uri="tuscanyscatours"
+           xmlns:ns2="http://tuscanyscatours.com/"/>
+    <include name="ns2:Client"
+           uri="client"
+           xmlns:ns2="http://client.scatours/"/>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml
new file mode 100644
index 0000000000..075c3b8693
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:./cloud"
+           uri="http://tuscany.apache.org/cloud"/>
+    <contribution location="file:../../../../trips/target/itest-domainmgr-basic-trips.jar"
+           uri="goodvaluetrips"/>
+    <contribution location="file:../../../../tours/target/itest-domainmgr-basic-tours.jar"
+           uri="tuscanyscatours"/>
+    <contribution location="file:../../../../client/target/itest-domainmgr-basic-client.jar"
+           uri="client"/>
+</workspace>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/pom.xml
new file mode 100644
index 0000000000..2f4fb8391e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-basic</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-basic-tours</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Basic Tours Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java
new file mode 100644
index 0000000000..365a210368
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.goodvaluetrips;

+

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

+

+@Remotable

+public interface Trips {

+    String checkAvailability(String trip, int people);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java
new file mode 100644
index 0000000000..9d54d46bb6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.tuscanyscatours;

+

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

+

+@Remotable

+public interface Bookings {

+    String newBooking(String trip, int people);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java
new file mode 100644
index 0000000000..29c84d2bc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.tuscanyscatours;

+

+import java.math.BigDecimal;

+

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

+

+@Remotable

+public interface Checkout {

+    void makePayment(BigDecimal amount, String cardInfo);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
new file mode 100644
index 0000000000..db551501e1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
@@ -0,0 +1,40 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.tuscanyscatours;

+

+import java.math.BigDecimal;

+import java.util.ArrayList;

+import java.util.List;

+

+public class ShoppingCart implements Checkout, Updates {

+	private static List<String> bookedTrips = new ArrayList<String>();

+	

+    public void makePayment(BigDecimal amount, String cardInfo) {

+    	System.out.print("Charged $" + amount + " to card " + cardInfo + " for " +

+                         (bookedTrips.size() > 1 ? "trips" : "trip"));

+    	for (String trip : bookedTrips){

+    		System.out.print(" " + trip);

+    	}

+    	System.out.println();

+    	bookedTrips.clear();

+    }

+    public void addTrip(String resCode) {

+        bookedTrips.add(resCode);

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java
new file mode 100644
index 0000000000..e64d60545e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.tuscanyscatours;

+

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

+

+public class TripBooking implements Bookings {

+    @Reference

+    protected com.goodvaluetrips.Trips mytrips;

+

+    @Reference

+    protected Updates cart;

+ 

+    public String newBooking(String trip, int people) {

+        String resCode = mytrips.checkAvailability(trip, people);

+        cart.addTrip(resCode);

+        return "GV" + resCode;

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java
new file mode 100644
index 0000000000..e33b0399cb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.tuscanyscatours;

+

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

+

+@Remotable

+public interface Updates {

+    void addTrip(String resCode);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b6ef1acafa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:tst="http://tuscanyscatours.com/">

+    <!--export namespace="http://tuscanyscatours.com/" /-->

+    <export.java package="com.tuscanyscatours" />

+    <deployable composite="tst:Tours" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/tours.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/tours.composite
new file mode 100644
index 0000000000..f166a1635d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/tours.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://tuscanyscatours.com/"

+    name="Tours">

+

+    <component name="TripBooking">

+        <implementation.java class="com.tuscanyscatours.TripBooking" />

+        <service name="Bookings">

+            <interface.java interface="com.tuscanyscatours.Bookings" />

+        </service>

+        <reference name="mytrips" target="TripProvider/Trips">

+            <interface.java interface="com.goodvaluetrips.Trips" />

+        </reference>

+        <reference name="cart" target="ShoppingCart/Updates">

+            <interface.java interface="com.tuscanyscatours.Updates" />

+        </reference>

+    </component>

+

+    <component name="ShoppingCart">

+        <implementation.java class="com.tuscanyscatours.ShoppingCart"/>

+        <service name="Checkout">

+            <interface.java interface="com.tuscanyscatours.Checkout" />

+        </service>

+        <service name="Updates">

+            <interface.java interface="com.tuscanyscatours.Updates" />

+        </service>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/pom.xml
new file mode 100644
index 0000000000..e5ec95b678
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-basic</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-basic-trips</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Basic Trips Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java
new file mode 100644
index 0000000000..d30046aaef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.goodvaluetrips;

+

+public class TripProvider implements Trips {

+    public String checkAvailability(String trip, int people) {

+        // call non-SCA code to reserve trip and return booking code

+        return "6R98Y";

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java
new file mode 100644
index 0000000000..365a210368
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.goodvaluetrips;

+

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

+

+@Remotable

+public interface Trips {

+    String checkAvailability(String trip, int people);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..c42834be8a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:gvt="http://goodvaluetrips.com/">

+    <!--export namespace="http://goodvaluetrips.com/" /-->

+    <deployable composite="gvt:Trips" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/trips.composite b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/trips.composite
new file mode 100644
index 0000000000..ab173e5ef7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/trips.composite
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://goodvaluetrips.com/"

+    name="Trips">

+

+    <component name="TripProvider">

+        <implementation.java class="com.goodvaluetrips.TripProvider" />

+        <service name="Trips">

+            <interface.java interface="com.goodvaluetrips.Trips" />

+        </service>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/client/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/pom.xml
new file mode 100644
index 0000000000..986b4d1215
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-callback</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-callback-client</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Callback Client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java
new file mode 100644
index 0000000000..9937ea0b1e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java
@@ -0,0 +1,52 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbackclient;

+

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

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

+

+/**

+ * Demonstrates a component-to-component callback invocation

+ */

+@Service(TestService.class)

+public class MyClientImpl implements TestService {

+

+    private MyService myService;

+    private static String result;

+

+    @Reference

+    protected void setMyService(MyService myService) {

+        this.myService = myService;

+    }

+

+    public void runTest() {

+        System.out.println("MyClientImpl.runTest");

+        myService.someMethod("-> someMethod");

+    }

+

+    public String getResult() {

+        System.out.println("MyClientImpl.getResult");

+        return MyClientImpl.result;

+    }

+

+    public void receiveResult(String result) {

+        System.out.println("MyClientImpl.receiveResult: result=" + result);

+        MyClientImpl.result = result;

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java
new file mode 100644
index 0000000000..f22534e531
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java
@@ -0,0 +1,34 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbackclient;

+

+import org.osoa.sca.annotations.Callback;

+import org.osoa.sca.annotations.OneWay;

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

+

+/**

+ * This service that will be invoked in a non-blocking fashion

+ */

+@Remotable

+@Callback(MyServiceCallback.class)

+public interface MyService {

+

+    @OneWay

+    void someMethod(String arg);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java
new file mode 100644
index 0000000000..412b3c7584
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbackclient;

+

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

+

+/**

+ * The callback interface for {@link MyService}.

+ */

+@Remotable

+public interface MyServiceCallback {

+

+    void receiveResult(String result);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java
new file mode 100644
index 0000000000..0ec6acf2d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbackclient;

+

+/**

+ * Test driver interface

+ */

+public interface TestService {

+

+    void runTest();

+

+    String getResult();

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..1c37dd00b0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:cb="http://simplecallback">

+    <deployable composite="cb:client" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/client.composite b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/client.composite
new file mode 100644
index 0000000000..33842c3853
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/client.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://simplecallback"

+	name="client">

+

+    <component name="MyClientComponent">

+        <implementation.java class="callbackclient.MyClientImpl" />

+        <reference name="myService" target="MyServiceComponent/MyService" />

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/callback/pom.xml
new file mode 100644
index 0000000000..0ea0cd46c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-callback</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Callback</name>
+
+    <packaging>pom</packaging>
+    <build>
+        <defaultGoal>install</defaultGoal>
+    </build>
+    <modules>
+        <module>service</module>
+        <module>client</module>
+        <module>runtest</module>
+    </modules>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/pom.xml
new file mode 100644
index 0000000000..99177f8c43
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/pom.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-callback</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-callback-runtest</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Callback Run Test</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-callback-service</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-callback-client</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <reportFormat>brief</reportFormat>
+                    <useFile>false</useFile>
+                    <forkMode>once</forkMode>
+                    <argLine>-ea -Xmx256m</argLine>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java
new file mode 100644
index 0000000000..6cd580676c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbacktest;

+

+/**

+ * Test driver interface

+ */

+public interface TestService {

+

+    void runTest();

+

+    String getResult();

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java
new file mode 100644
index 0000000000..71d165449d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java
@@ -0,0 +1,358 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package domainmgr;

+

+import java.io.BufferedReader;

+import java.io.File;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.io.OutputStream;

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.Test;

+import callbacktest.TestService;

+

+import static org.junit.Assert.*;

+

+/**

+ * Starts the Romain Manager with a test configuration, then starts

+ * a test node that reads a deployed composite.  The domain manager

+ * should read and configure the composite and send it to the node

+ * without detecting or reporting any errors.

+ */

+public class DomainManagerCallbackTestCase {

+

+    private String home = System.getProperty("java.home");

+    private String classpath = System.getProperty("java.class.path");

+    private Runtime runtime = Runtime.getRuntime();

+    private BufferedReader domainErrReader;

+    private BufferedReader domainOutReader;

+

+    @Test

+    public void test() throws Exception {

+

+        Process domainMgr = null;

+        TestNode otherNode = null;

+

+        try {

+            // Start the domain manager process in its own working directory of

+            // "target/test-classes/domain/" to ensure no interference with the

+            // node processes.  The predefined domain config is copied by mvn

+            // from the "src/test/resources/domain/" directory.

+            System.out.println("Starting domain manager");

+            String[] domainCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"};

+            String userdir = System.getProperty("user.dir");

+            domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/"));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the domain manager process.

+            InputStream domainErr = domainMgr.getErrorStream();

+            domainErrReader = new BufferedReader(new InputStreamReader(domainErr));

+            InputStream domainOut = domainMgr.getInputStream();

+            domainOutReader = new BufferedReader(new InputStreamReader(domainOut));

+            OutputStream domainIn = domainMgr.getOutputStream();

+

+            // Read startup log output from the domain manager process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // domain manager started successfully

+                    System.out.println("Domain manager started successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+            

+            // Start the test nodes.  Each node runs in its own "target" directory

+            // to ensure no interference with other processes.

+            otherNode = new TestNode("ServiceNode", userdir + "/../service/target/");

+            otherNode.start();

+            

+            // Start the client node.  This runs in the current process so that

+            // we can use the SCAClient API to invoke its services.  The current

+            // working directory is "runtest" which means there is no interference

+            // other processes.

+            SCANode thisNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode");

+            checkDomainErr();

+            checkDomainOut();

+            thisNode.start();

+

+            // Run the client test code.

+            TestService tester = ((SCAClient)thisNode).getService(TestService.class, "MyClientComponent/TestService");

+            tester.runTest();

+            otherNode.checkNodeErr();

+            otherNode.checkNodeOut();

+            System.out.println("Sleeping ...");

+            Thread.sleep(4000);

+            otherNode.checkNodeErr();

+            otherNode.checkNodeOut();

+            assertEquals("-> someMethod -> receiveResult", tester.getResult());

+            

+            // Stop the client node.

+            thisNode.stop();

+

+            // Stop the test nodes.

+            otherNode.stopNode();

+            otherNode = null;

+

+            // Stop the domain manager by sending 'q' to stdin.

+            System.out.println("Stopping domain manager");

+            domainIn.write('q');

+            domainIn.flush();

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before shutdown completed

+                    throw new IllegalStateException("Error stopping Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // shutdown error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: SCA Domain Manager is now stopped.")) {

+                    // domain manager stopped successfully

+                    System.out.println("Domain manager stopped successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+

+            // Wait for domain manager process to end, and check its exit value.

+            int value = domainMgr.waitFor();

+            if (value != 0) {

+                throw new IllegalStateException("Domain Manager process exit value " + value);

+            }

+            domainMgr = null;

+

+        } finally {

+            // If the test nodes did not shut down cleanly, destroy the test

+            // node processes.

+            if (otherNode != null) {

+                otherNode.destroyNode();

+            }

+

+            // If the domain manager did not shut down cleanly, destroy the

+            // domain manager process.

+            if (domainMgr != null) {

+                System.out.println("Destroying domain");

+                checkDomainErr(true);

+                checkDomainOut();

+                try {

+                    domainMgr.destroy();

+                } catch (Exception e) {

+                }

+            }

+        }

+    }

+

+    /*

+     * Check stderr for the domain manager process.  Called periodically

+     * to ensure that anything written to stderr is displayed in the test log

+     * and abort execution if the domain manager has logged any errors.

+     */

+    private void checkDomainErr(boolean nothrow) throws Exception {

+        while (domainErrReader.ready()) {

+            String line = domainErrReader.readLine();

+            System.out.println("DomainMgr.e: " + line);

+            if (line.contains("SEVERE:") && !nothrow) {

+                throw new IllegalStateException("Domain manager reported error: " + line);

+            }

+        }

+    }

+

+    private void checkDomainErr() throws Exception {

+        checkDomainErr(false);

+    }

+

+    /*

+     * Check stdout for the domain manager process.  Called periodically

+     * to ensure that anything written to stdout is displayed in the test log. 

+     */

+    private void checkDomainOut() throws Exception {

+        while (domainOutReader.ready()) {

+            String line = domainOutReader.readLine();

+            System.out.println("DomainMgr.o: " + line);

+        }

+    }

+

+    /*

+     * Internal class representing a test node.

+     */

+    private class TestNode {

+

+        String nodeName;

+        String nodeDir;

+        BufferedReader nodeErrReader;

+        BufferedReader nodeOutReader;

+        OutputStream nodeIn;

+        Process nodeProcess;

+

+        TestNode(String nodeName, String nodeDir) {

+            this.nodeName = nodeName;

+            this.nodeDir = nodeDir;

+        }

+

+        /*

+         * Start the test node.

+         */

+        void start() throws Exception {

+            System.out.println("Starting node " + nodeName);

+            String[] nodeCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.NodeLauncher",

+                "http://localhost:9990/node-config/" + nodeName};

+            nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the test node process.

+            InputStream nodeErr = nodeProcess.getErrorStream();

+            nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr));

+            InputStream nodeOut = nodeProcess.getInputStream();

+            nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut));

+            nodeIn = nodeProcess.getOutputStream();

+

+            // Read startup log output from the test node process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                Thread.sleep(100);

+                checkDomainErr();

+                checkDomainOut();

+                checkNodeOut();

+                String line = nodeErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting node " + nodeName);

+                }

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by test node process

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // test node started successfully

+                    System.out.println("Node " + nodeName + " started successfully");

+                    break;

+                }

+            }

+            checkDomainErr();

+            checkDomainOut();

+            checkNodeOut();

+        }

+

+        /*

+         * Check stderr for the test node process.  Called periodically to

+         * ensure that anything written to stderr is displayed in the test log

+         * and abort execution if the test node has logged any errors.

+         */

+        void checkNodeErr(boolean nothrow) throws Exception {

+            while (nodeErrReader.ready()) {

+                String line = nodeErrReader.readLine();

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:") && !nothrow) {

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+            }

+        }

+

+        void checkNodeErr() throws Exception {

+            checkNodeErr(false);

+        }

+

+        /*

+         * Check stdout for the test node process.  Called periodically to

+         * ensure that anything written to stdout is displayed in the test log.

+         */

+        void checkNodeOut() throws Exception {

+            while (nodeOutReader.ready()) {

+                String line = nodeOutReader.readLine();

+                System.out.println(nodeName + ".o: " + line);

+            }

+        }

+

+        /*

+         * Stop the test node process.

+         */

+        void stopNode() throws Exception {

+            System.out.println("Stopping node " + nodeName);

+            nodeIn.write('q');

+            nodeIn.flush();

+            while (true) {

+                checkNodeOut();

+                String line = nodeErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before shutdown completed

+                    throw new IllegalStateException("Error stopping node " + nodeName);

+                }

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // shutdown error logged by test node process

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+                if (line.contains("INFO: SCA Node is now stopped.")) {

+                    // test node stopped successfully

+                    System.out.println("Node " + nodeName + " stopped successfully");

+                    break;

+                }

+            }

+            checkNodeOut();

+

+            // Wait for test node process to end, and check its exit value.

+            int value = nodeProcess.waitFor();

+            if (value != 0) {

+                throw new IllegalStateException("Node " + nodeName + " exit value " + value);

+            }

+        }

+

+        /*

+         * Destroy the test node process.

+         */

+        void destroyNode() throws Exception {

+            if (nodeProcess != null) {

+                System.out.println("Destroying node " + nodeName);

+                checkNodeErr(true);

+                checkNodeOut();

+                try {

+                    nodeProcess.destroy();

+                } catch (Exception e) {

+                }

+            }

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite
new file mode 100644
index 0000000000..4b2c664ed2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="cloud"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+     <include name="ns2:ServiceNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud" />
+    <include name="ns2:ClientNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud" />
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite
new file mode 100644
index 0000000000..509bfafac1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://simplecallback"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="ClientNode">
+    <component name="ClientNode">
+        <t:implementation.node uri="callback-client" composite="c:client" />
+        <service name="Node">
+             <binding.sca uri="http://localhost:8081" />
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite
new file mode 100644
index 0000000000..1f1f0c47c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://simplecallback"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="ServiceNode">
+    <component name="ServiceNode">
+        <t:implementation.node uri="callback-service" composite="c:service" />
+        <service name="Node">
+             <binding.sca uri="http://localhost:8082" />
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite
new file mode 100644
index 0000000000..ba4d6bbf25
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="domain"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:service"
+           uri="callback-service"
+           xmlns:ns2="http://simplecallback" />
+    <include name="ns2:client"
+           uri="callback-client"
+           xmlns:ns2="http://simplecallback" />
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml
new file mode 100644
index 0000000000..6a6288e39c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:./cloud"
+           uri="http://tuscany.apache.org/cloud" />
+    <contribution location="file:../../../../service/target/itest-domainmgr-callback-service.jar"
+           uri="callback-service" />
+    <contribution location="file:../../../../client/target/itest-domainmgr-callback-client.jar"
+           uri="callback-client" />
+</workspace>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/service/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/pom.xml
new file mode 100644
index 0000000000..31d019010f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-callback</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-callback-service</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Callback Service</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java
new file mode 100644
index 0000000000..e5fbeb48ba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java
@@ -0,0 +1,34 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbackservice;

+

+import org.osoa.sca.annotations.Callback;

+import org.osoa.sca.annotations.OneWay;

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

+

+/**

+ * This service that will be invoked in a non-blocking fashion

+ */

+@Remotable

+@Callback(MyServiceCallback.class)

+public interface MyService {

+

+    @OneWay

+    void someMethod(String arg);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java
new file mode 100644
index 0000000000..896f6ca873
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbackservice;

+

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

+

+/**

+ * The callback interface for {@link MyService}.

+ */

+@Remotable

+public interface MyServiceCallback {

+

+    void receiveResult(String result);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java
new file mode 100644
index 0000000000..1afbbfe934
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package callbackservice;

+

+import org.osoa.sca.annotations.Callback;

+

+/**

+ * This class implements MyService and uses a callback.

+ */

+public class MyServiceImpl implements MyService {

+

+    private MyServiceCallback myServiceCallback;

+

+    /**

+     * The setter used by the runtime to set the callback reference 

+     * @param myServiceCallback

+     */

+    @Callback

+    protected void setMyServiceCallback(MyServiceCallback myServiceCallback) {

+        this.myServiceCallback = myServiceCallback;

+    }

+    

+    public void someMethod(String arg) {

+        System.out.println("MyServiceImpl.someMethod");

+        // invoke the callback

+        try {

+            myServiceCallback.receiveResult(arg + " -> receiveResult");

+            System.out.println("MyServiceImpl.someMethod returned from receiveResult() call");

+        } catch (RuntimeException e) {

+            System.out.println("MyServiceImpl.someMethod exception invoking receiveResult: " + e.toString());

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..517d022013
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:cb="http://simplecallback">

+    <deployable composite="cb:service" />

+</contribution>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/service.composite b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/service.composite
new file mode 100644
index 0000000000..b84830795b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/service.composite
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://simplecallback"

+	name="service">

+

+    <component name="MyServiceComponent">

+        <implementation.java class="callbackservice.MyServiceImpl" />

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/pom.xml
new file mode 100644
index 0000000000..70c9e9674e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-error</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-error-payment</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Error Handling Payment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
+        </dependency>    
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-transaction</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+    <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-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.12</version>
+                <executions>
+                    <execution>
+                        <id>payment</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>payment</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>Payment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>payment.creditcard</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>payment.creditcard</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java
new file mode 100644
index 0000000000..071bcf22c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java
@@ -0,0 +1,88 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package payment;

+

+import javax.annotation.security.RolesAllowed;

+import javax.annotation.security.RunAs;

+

+import org.osoa.sca.annotations.Authentication;

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

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

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

+

+import payment.creditcard.AuthorizeFault_Exception;

+import payment.creditcard.CreditCardDetailsType;

+import payment.creditcard.CreditCardPayment;

+import scatours.customer.Customer;

+import scatours.customer.CustomerNotFoundException;

+import scatours.customer.CustomerRegistry;

+import scatours.emailgateway.EmailGateway;

+

+/**

+ * The payment implementation

+ */

+@Service(Payment.class)

+@RolesAllowed({"Admin", "Billing"})

+@RunAs("Billing")

+public class PaymentImpl implements Payment {

+

+    @Reference

+    protected CustomerRegistry customerRegistry;

+

+    @Reference

+    @Authentication

+    protected CreditCardPayment creditCardPayment;

+

+    @Reference

+    protected EmailGateway emailGateway;

+

+    @Property

+    protected float transactionFeeRate = 0.01f;

+

+    public String makePaymentMember(String customerId, float amount) {

+        Customer customer = null;

+

+        try {

+            customer = customerRegistry.getCustomer(customerId);

+        } catch (CustomerNotFoundException ex) {

+            return "Payment failed due to " + ex.getMessage();

+        } catch (Throwable t) {

+            return "Payment failed due to system error " + t.getMessage();

+        }

+

+        CreditCardDetailsType ccDetails = customer.getCreditCard();

+

+        String status;

+        try {

+            status = creditCardPayment.authorize(ccDetails, amount);

+        } catch (AuthorizeFault_Exception e) {

+            status = e.getFaultInfo().getErrorCode();

+        }

+

+        StringBuffer body = new StringBuffer();

+        body.append(customer);

+        body.append("\n").append("Status: ").append(status).append("\n");

+        emailGateway.sendEmail("order@tuscanyscatours.com", customer.getEmail(), "Status for your payment", body

+            .toString());

+

+        return status;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java
new file mode 100644
index 0000000000..daf56353a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java
@@ -0,0 +1,70 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+import payment.creditcard.CreditCardDetailsType;

+

+/**

+ * Customer data

+ */

+public class Customer {

+    private String id;

+    private String email;

+    private String name;

+

+    private CreditCardDetailsType creditCard;

+

+    public String getId() {

+        return id;

+    }

+

+    public void setId(String id) {

+        this.id = id;

+    }

+

+    public String getEmail() {

+        return email;

+    }

+

+    public void setEmail(String email) {

+        this.email = email;

+    }

+

+    public String getName() {

+        return name;

+    }

+

+    public void setName(String name) {

+        this.name = name;

+    }

+

+    public CreditCardDetailsType getCreditCard() {

+        return creditCard;

+    }

+

+    public void setCreditCard(CreditCardDetailsType creditCard) {

+        this.creditCard = creditCard;

+    }

+

+    public String toString() {

+        return "id: " + id + " name: " + name + " e-mail: " + email;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
new file mode 100644
index 0000000000..89f56ce6ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
@@ -0,0 +1,58 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+

+public class CustomerNotFoundException extends Exception {

+    private static final long serialVersionUID = -129752837478357452L;

+

+    /**

+     * 

+     */

+    public CustomerNotFoundException() {

+

+    }

+

+    /**

+     * @param message

+     */

+    public CustomerNotFoundException(String message) {

+        super(message);

+

+    }

+

+    /**

+     * @param cause

+     */

+    public CustomerNotFoundException(Throwable cause) {

+        super(cause);

+

+    }

+

+    /**

+     * @param message

+     * @param cause

+     */

+    public CustomerNotFoundException(String message, Throwable cause) {

+        super(message, cause);

+

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java
new file mode 100644
index 0000000000..cfd79a7f95
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java
@@ -0,0 +1,39 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+import java.util.Collection;

+

+import payment.creditcard.CreditCardDetailsType;

+

+/**

+ * Customer registry interface

+ */

+public interface CustomerRegistry {

+    Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);

+

+    boolean updateCustomer(Customer customer);

+

+    Customer getCustomer(String id) throws CustomerNotFoundException;

+

+    Collection<Customer> getAllCustomers();

+

+    boolean deleteCustomer(String id);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
new file mode 100644
index 0000000000..e6328f062c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
@@ -0,0 +1,112 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.Map;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.EagerInit;

+import org.osoa.sca.annotations.Init;

+import org.osoa.sca.annotations.Requires;

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

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

+

+import payment.creditcard.CreditCardDetailsType;

+import payment.creditcard.CreditCardTypeType;

+import payment.creditcard.ObjectFactory;

+import payment.creditcard.PayerType;

+

+/**

+ * An in-memory customer registry implementation

+ */

+@Service(CustomerRegistry.class)

+@Scope("COMPOSITE")

+@EagerInit

+@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")

+public class CustomerRegistryImpl implements CustomerRegistry {

+    private volatile static int idGenerator = 0;

+    private Map<String, Customer> customers = new HashMap<String, Customer>();

+

+    @Init

+    public void init() {

+        // Load the customers

+        ObjectFactory factory = new ObjectFactory();

+        CreditCardDetailsType cc = factory.createCreditCardDetailsType();

+        PayerType john = factory.createPayerType();

+        john.setName("John Smith");

+        cc.setCardOwner(john);

+        cc.setCreditCardNumber("1111-2222-3333-4444");

+        cc.setCreditCardType(CreditCardTypeType.VISA);

+        cc.setCVV2("1234");

+        cc.setExpMonth(1);

+        cc.setExpYear(2012);

+        createCustomer("John Smith", "john@xyz.com", cc);

+    }

+    

+    @Destroy

+    public void destroy() {

+        // Save the customers

+    }

+    

+    public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {

+        Customer customer = new Customer();

+        customer.setId("c-" + idGenerator++);

+        customer.setName(name);

+        customer.setEmail(email);

+        customer.setCreditCard(creditCard);

+        customers.put(customer.getId(), customer);

+        return customer;

+    }

+

+    public boolean deleteCustomer(String id) {

+        return customers.remove(id) != null;

+    }

+

+    public Collection<Customer> getAllCustomers() {

+        return customers.values();

+    }

+

+    public Customer getCustomer(String id) throws CustomerNotFoundException {

+        Customer customer = customers.get(id);

+        

+        if (customer == null){

+            throw new CustomerNotFoundException("Customer " + id + " not found");

+        }

+        

+        return customer;

+    }

+

+    public boolean updateCustomer(Customer customer) {

+        Customer current = null;

+        try {

+            current = getCustomer(customer.getId());

+        } catch (Exception ex) {

+            return false;

+        }

+

+        current.setEmail(customer.getEmail());

+        current.setName(customer.getName());

+        current.setCreditCard(customer.getCreditCard());

+        return true;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java
new file mode 100644
index 0000000000..d360381327
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.emailgateway;

+

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

+

+/**

+ * A gateway to send e-mail

+ */

+@Remotable

+public interface EmailGateway {

+    public boolean sendEmail(String sender, String recipient, String subject, String body);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
new file mode 100644
index 0000000000..060c3dabda
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.emailgateway;

+

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

+

+@Service(EmailGateway.class)

+public class EmailGatewayImpl implements EmailGateway {

+

+    public boolean sendEmail(String sender, String recipient, String subject, String body) {

+        System.out.println("From: " + sender);

+        System.out.println("To: " + recipient);

+        System.out.println("Subject: " + subject);

+        System.out.println(body);

+        return true;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl
new file mode 100644
index 0000000000..d17497d1f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="CreditCardPayment"

+                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

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

+                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

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

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

+                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

+                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

+

+            <xsd:element name="authorize">

+            <xsd:complexType>

+                <xsd:sequence>

+                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+            </xsd:element>

+

+            <xsd:element name="authorizeResponse">

+            <xsd:complexType>

+                <xsd:sequence>

+                    <xsd:element name="Status" type="xsd:string"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+            </xsd:element>

+

+            <xsd:complexType name="CreditCardDetailsType">

+                <xsd:sequence>

+                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

+                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

+                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

+                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

+                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

+                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:simpleType name="CreditCardTypeType">

+                <xsd:restriction base="xsd:token">

+                    <xsd:enumeration value="Visa" />

+                    <xsd:enumeration value="MasterCard" />

+                    <xsd:enumeration value="Discover" />

+                    <xsd:enumeration value="Amex" />

+                </xsd:restriction>

+            </xsd:simpleType>

+            <xsd:complexType name="PayerType">

+                <xsd:sequence>

+                    <xsd:element name="Name" type="xsd:string" />

+                    <xsd:element name="Address" type="tns:AddressType" />

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:complexType name="AddressType">

+                <xsd:sequence>

+                    <xsd:element name="Street" type="xsd:string" />

+                    <xsd:element name="City" type="xsd:string" />

+                    <xsd:element name="State" type="xsd:string" />

+                    <xsd:element name="ZipCode" type="xsd:string" />

+                    <xsd:element name="HomePhone" type="xsd:string" />

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:element name="authorizeFault">

+                <xsd:complexType>

+                    <xsd:sequence>

+                        <xsd:element name="errorCode" type="xsd:string"></xsd:element>

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+        </xsd:schema>

+    </wsdl:types>

+    <wsdl:message name="AuthorizeRequest">

+        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="AuthorizeResponse">

+        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="AuthorizeFault">

+        <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>

+    </wsdl:message>

+    <wsdl:portType name="CreditCardPayment">

+        <wsdl:operation name="authorize">

+            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

+            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

+            <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault>
+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

+        <wsdl:operation name="authorize">

+            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

+            <wsdl:input>

+                <soap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal" />

+            </wsdl:output>

+            <wsdl:fault name="authorizationFailure">

+                <soap:fault name="authorizationFailure" use="literal"/>

+            </wsdl:fault>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="CreditCardPaymentService">

+        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

+            <soap:address location="http://localhost:8080/CreditCardPayment" />

+        </wsdl:port>

+    </wsdl:service>

+

+    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

+        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

+    </plnk:partnerLinkType>

+</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..12b9852bf0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:scatours="http://scatours">

+   <export.java package="payment"/>

+   <deployable composite="scatours:payment" />

+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl
new file mode 100644
index 0000000000..3885764899
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Payment" 

+                  targetNamespace="http://www.tuscanyscatours.com/Payment/"

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

+                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 

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

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

+                    targetNamespace="http://www.tuscanyscatours.com/Payment/"

+                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">

+

+            <xsd:complexType name="MakePaymentMemberType">

+                <xsd:sequence>

+                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>

+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>                    

+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>

+      

+            <xsd:complexType name="MakePaymentMemberResponseType">

+                <xsd:sequence>

+                    <xsd:element name="Status" type="xsd:string"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>

+            

+        </xsd:schema>

+    </wsdl:types>

+    <wsdl:message name="MakePaymentMemberRequest">

+        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="MakePaymentMemberResponse">

+        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>

+    </wsdl:message>

+    <wsdl:portType name="Payment">

+        <wsdl:operation name="makePaymentMember">

+            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>

+            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>

+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="PaymentBinding" type="tns:Payment">

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

+        <wsdl:operation name="makePaymentMember">

+            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />

+            <wsdl:input>

+                <soap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal" />

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="PaymentService">

+        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">

+            <soap:address location="http://localhost:8083/Payment" />

+        </wsdl:port>

+    </wsdl:service>

+    

+   <plnk:partnerLinkType name="PaymentLinkType">

+       <plnk:role name="forward" portType="tns:Payment"/>

+   </plnk:partnerLinkType>

+</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/payment.composite b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/payment.composite
new file mode 100644
index 0000000000..53fcefc241
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/payment.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scatours"

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

+           xmlns:c="http://scatours" 

+           name="payment">

+           

+    <component name="PaymentComponent">

+        <implementation.java class="payment.PaymentImpl" />

+        <service name="Payment">

+           <binding.ws uri="http://localhost:8081/Payment"/>

+        </service>

+        <reference name="customerRegistry" target="CustomerRegistryComponent"/>

+        <reference name="creditCardPayment">

+            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>

+        </reference>

+        <reference name="emailGateway" target="EmailGatewayComponent"/>

+        <property name="transactionFeeRate">0.02</property>

+    </component>

+        

+    <component name="CustomerRegistryComponent">

+        <implementation.java class="scatours.customer.CustomerRegistryImpl" />

+    </component>

+            

+    <component name="EmailGatewayComponent">

+        <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />

+    </component>    

+    

+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/error/pom.xml
new file mode 100644
index 0000000000..b783d3e73a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-error</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Error Handling</name>
+
+    <packaging>pom</packaging>
+    <build>
+        <defaultGoal>install</defaultGoal>
+    </build>
+    <modules>
+        <module>payment</module>
+        <module>runtest</module>
+    </modules>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/pom.xml
new file mode 100644
index 0000000000..111062f0aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-error</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-error-runtest</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Error Handling Run Test</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-error-payment</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-transaction</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <reportFormat>brief</reportFormat>
+                    <useFile>false</useFile>
+                    <forkMode>once</forkMode>
+                    <argLine>-ea -Xmx256m</argLine>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java
new file mode 100644
index 0000000000..23ffc440ab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java
@@ -0,0 +1,342 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package domainmgr;

+

+import java.io.BufferedReader;

+import java.io.File;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.io.OutputStream;

+

+import org.junit.Test;

+

+/**

+ * Starts the Romain Manager with a test configuration, then starts

+ * a test node that reads a deployed composite.  The domain manager

+ * should read and configure the composite and send it to the node

+ * without detecting or reporting any errors.

+ */

+public class DomainManagerErrorTestCase {

+

+    private String home = System.getProperty("java.home");

+    private String classpath = System.getProperty("java.class.path");

+    private Runtime runtime = Runtime.getRuntime();

+    private Process domainMgr = null;

+    private BufferedReader domainErrReader;

+    private BufferedReader domainOutReader;

+    private OutputStream domainIn;

+

+    @Test

+    public void test() throws Exception {

+

+        TestNode paymentNode = null;

+

+        try {

+            // Start the domain manager process in its own working directory of

+            // "target/test-classes/domain/" to ensure no interference with the

+            // node processes.  The predefined domain config is copied by mvn

+            // from the "src/test/resources/domain/" directory.

+            System.out.println("Starting domain manager");

+            String[] domainCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"};

+            String userdir = System.getProperty("user.dir");

+            domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/"));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the domain manager process.

+            InputStream domainErr = domainMgr.getErrorStream();

+            domainErrReader = new BufferedReader(new InputStreamReader(domainErr));

+            InputStream domainOut = domainMgr.getInputStream();

+            domainOutReader = new BufferedReader(new InputStreamReader(domainOut));

+            domainIn = domainMgr.getOutputStream();

+

+            // Read startup log output from the domain manager process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // domain manager started successfully

+                    System.out.println("Domain manager started successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+            

+            // Start the test nodes.  Each node runs in its own "target" directory

+            // to ensure no interference with other processes.

+            paymentNode = new TestNode("PaymentNode", userdir + "/../payment/target/");

+            paymentNode.start();

+

+            // Stop the test nodes.

+            paymentNode.stopNode();

+

+            // Stop the domain manager

+            stopDomain();

+

+        } catch (Exception ex) {

+

+            // Error found, so destroy the test node processes and the domain

+            // manager process so that the test case exits cleanly.

+            if (paymentNode != null) {

+                paymentNode.destroyNode();

+            }

+            if (domainMgr != null) {

+                System.out.println("Destroying domain");

+                try {

+                    domainMgr.destroy();

+                } catch (Exception e) {

+                }

+            }

+

+            // Report the test error.

+            throw ex;

+        }

+    }

+

+    /*

+     * Stop the test node process.

+     */

+     void stopDomain() throws Exception {

+

+        // Stop the domain manager by sending 'q' to stdin.

+        System.out.println("Stopping domain manager");

+        domainIn.write('q');

+        domainIn.flush();

+        while (true) {

+            checkDomainOut();

+            String line = domainErrReader.readLine();

+            if (line == null) {

+                // reached end of stderr stream before shutdown completed

+                throw new IllegalStateException("Error stopping Domain Manager process");

+            }

+            System.out.println("DomainMgr.e: " + line);

+            if (line.contains("SEVERE:")) {

+                // shutdown error logged by domain manager process

+                throw new IllegalStateException("Domain manager reported error: " + line);

+            }

+            if (line.contains("INFO: SCA Domain Manager is now stopped.")) {

+                // domain manager stopped successfully

+                System.out.println("Domain manager stopped successfully");

+                break;

+            }

+        }

+        checkDomainOut();

+

+        // Wait for domain manager process to end, and check its exit value.

+        int value = domainMgr.waitFor();

+        if (value != 0) {

+            throw new IllegalStateException("Domain Manager process exit value " + value);

+        }

+        domainMgr = null;

+    }

+

+    /*

+     * Check stderr for the domain manager process.  Called periodically

+     * to ensure that anything written to stderr is displayed in the test log

+     * and abort execution if the domain manager has logged any errors.

+     */

+    private void checkDomainErr() throws Exception {

+        while (domainErrReader.ready()) {

+            String line = domainErrReader.readLine();

+            System.out.println("DomainMgr.e: " + line);

+

+            // This test deliberately causes a domain manager error, so

+            // don't report a test failure if the expected error shows

+            // up in the domain manager log.

+            if (line.contains("SEVERE: Policy Related Exception occured due to : org.apache.tuscany.sca.assembly.builder.impl.PolicyConfigurationException")) {

+                continue;

+            }

+

+            if (line.contains("SEVERE:")) {

+                throw new IllegalStateException("Domain manager reported error: " + line);

+            }

+        }

+    }

+

+    /*

+     * Check stdout for the domain manager process.  Called periodically

+     * to ensure that anything written to stdout is displayed in the test log. 

+     */

+    private void checkDomainOut() throws Exception {

+        while (domainOutReader.ready()) {

+            String line = domainOutReader.readLine();

+            System.out.println("DomainMgr.o: " + line);

+        }

+    }

+

+    /*

+     * Internal class representing a test node.

+     */

+    private class TestNode {

+

+        String nodeName;

+        String nodeDir;

+        BufferedReader nodeErrReader;

+        BufferedReader nodeOutReader;

+        OutputStream nodeIn;

+        Process nodeProcess;

+

+        TestNode(String nodeName, String nodeDir) {

+            this.nodeName = nodeName;

+            this.nodeDir = nodeDir;

+        }

+

+        /*

+         * Start the test node.

+         */

+        void start() throws Exception {

+            System.out.println("Starting node " + nodeName);

+            String[] nodeCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.NodeLauncher",

+                "http://localhost:9990/node-config/" + nodeName};

+            nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the test node process.

+            InputStream nodeErr = nodeProcess.getErrorStream();

+            nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr));

+            InputStream nodeOut = nodeProcess.getInputStream();

+            nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut));

+            nodeIn = nodeProcess.getOutputStream();

+

+            // Read startup log output from the test node process.  The log

+            // output is written to the process's stderr.

+            boolean firsterror = false;

+            boolean seconderror = false;

+            try {

+                while (true) {

+

+                    // The domain manager may throw an exception and hang, so give it

+                    // enough time to do this before we block on the readLine() call.

+                    // A more robust implementation would be to read the domain manager

+                    // output on another thread, which could interrupt the blocked

+                    // readLine() call if the domain manager gets into trouble.

+                    Thread.sleep(100);

+                    checkDomainErr();

+                    checkDomainOut();

+

+                    checkNodeOut();

+                    String line = nodeErrReader.readLine();

+                    if (line == null) {

+                        // reached end of stderr stream before startup completed

+                        throw new IllegalStateException("Error starting node " + nodeName);

+                    }

+                    System.out.println(nodeName + ".e: " + line);

+                    if (line.contains("SEVERE: HTTP Server Error : org.apache.tuscany.sca.assembly.builder.impl.PolicyConfigurationException")) {

+                        // test node received first expected error from the domain

+                        System.out.println("Node " + nodeName + " received first expected error from domain");

+                        firsterror = true;

+                        continue;

+                    }

+                    if (line.contains("SEVERE: ContributionReadException occured due to : java.io.IOException: Server returned HTTP response code: 500")) {

+                        if (firsterror) {

+                            // test node received second expected error from the domain

+                            System.out.println("Node " + nodeName + " received second expected error from domain");

+                            seconderror = true;

+                            return;

+                        }

+                    }

+                    if (line.contains("SEVERE:")) {

+                        // startup error logged by test node process

+                        throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                    }

+                    if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                        // test node started successfully

+                        throw new IllegalStateException("Node " + nodeName + " did not receive expected error from domain");

+                    }

+                }

+            } finally {

+                checkDomainErr();

+                checkDomainOut();

+                checkNodeOut();

+            }

+        }

+

+        /*

+         * Check stderr for the test node process.  Called periodically to

+         * ensure that anything written to stderr is displayed in the test log

+         * and abort execution if the test node has logged any errors.

+         */

+        void checkNodeErr() throws Exception {

+            while (nodeErrReader.ready()) {

+                String line = nodeErrReader.readLine();

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+            }

+        }

+

+        /*

+         * Check stdout for the test node process.  Called periodically to

+         * ensure that anything written to stdout is displayed in the test log.

+         */

+        void checkNodeOut() throws Exception {

+            while (nodeOutReader.ready()) {

+                String line = nodeOutReader.readLine();

+                System.out.println(nodeName + ".o: " + line);

+            }

+        }

+

+        /*

+         * Stop the test node process.

+         */

+        void stopNode() throws Exception {

+            // The node did not start, so there is no need to send it a

+            // "quit" command to shut it down.  We just need to make sure

+            // that the node process has ended cleanly.

+

+            // Wait for test node process to end, and check its exit value.

+            int value = nodeProcess.waitFor();

+            if (value != 1) {

+                throw new IllegalStateException("Node " + nodeName + " exit value " + value);

+            }

+        }

+

+        /*

+         * Destroy the test node process.

+         */

+        void destroyNode() {

+            if (nodeProcess != null) {

+                System.out.println("Destroying node " + nodeName);

+                try {

+                    nodeProcess.destroy();

+                } catch (Exception e) {

+                }

+            }

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite
new file mode 100644
index 0000000000..ca43648169
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="cloud"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:PaymentNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud" />
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite
new file mode 100644
index 0000000000..e61fd4c1a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://scatours"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="PaymentNode">
+    <component name="PaymentNode">
+        <t:implementation.node uri="scatours-payment" composite="c:payment" />
+        <service name="Node">
+             <binding.ws uri="http://localhost:8081" />
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite
new file mode 100644
index 0000000000..f03181ecc5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="domain"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:payment"
+           uri="scatours-payment"
+           xmlns:ns2="http://scatours" />
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml
new file mode 100644
index 0000000000..9ee266671d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:./cloud"
+           uri="http://tuscany.apache.org/cloud" />
+    <contribution location="file:../../../../payment/target/itest-domainmgr-error-payment.jar"
+           uri="scatours-payment" />
+</workspace>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/pom.xml
new file mode 100644
index 0000000000..149364ae16
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+      <relativePath>../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.tuscany.sca</groupId>
+  <artifactId>itest-domainmgr</artifactId>
+  <name>Apache Tuscany Domain Manager Integration Tests</name>
+  <version>1.5.1</version>
+
+  <packaging>pom</packaging>
+  <build>
+    <defaultGoal>install</defaultGoal>
+  </build>
+  <modules>
+    <module>basic</module>
+    <module>transaction</module>
+    <module>error</module>
+    <module>callback</module>
+  </modules>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/pom.xml
new file mode 100644
index 0000000000..5de1ca60a1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-transaction</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-transaction-payment</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Transaction Payment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
+        </dependency>    
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-transaction</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+    <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-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.12</version>
+                <executions>
+                    <execution>
+                        <id>payment</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>payment</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>Payment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>payment.creditcard</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>payment.creditcard</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java
new file mode 100644
index 0000000000..071bcf22c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java
@@ -0,0 +1,88 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package payment;

+

+import javax.annotation.security.RolesAllowed;

+import javax.annotation.security.RunAs;

+

+import org.osoa.sca.annotations.Authentication;

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

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

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

+

+import payment.creditcard.AuthorizeFault_Exception;

+import payment.creditcard.CreditCardDetailsType;

+import payment.creditcard.CreditCardPayment;

+import scatours.customer.Customer;

+import scatours.customer.CustomerNotFoundException;

+import scatours.customer.CustomerRegistry;

+import scatours.emailgateway.EmailGateway;

+

+/**

+ * The payment implementation

+ */

+@Service(Payment.class)

+@RolesAllowed({"Admin", "Billing"})

+@RunAs("Billing")

+public class PaymentImpl implements Payment {

+

+    @Reference

+    protected CustomerRegistry customerRegistry;

+

+    @Reference

+    @Authentication

+    protected CreditCardPayment creditCardPayment;

+

+    @Reference

+    protected EmailGateway emailGateway;

+

+    @Property

+    protected float transactionFeeRate = 0.01f;

+

+    public String makePaymentMember(String customerId, float amount) {

+        Customer customer = null;

+

+        try {

+            customer = customerRegistry.getCustomer(customerId);

+        } catch (CustomerNotFoundException ex) {

+            return "Payment failed due to " + ex.getMessage();

+        } catch (Throwable t) {

+            return "Payment failed due to system error " + t.getMessage();

+        }

+

+        CreditCardDetailsType ccDetails = customer.getCreditCard();

+

+        String status;

+        try {

+            status = creditCardPayment.authorize(ccDetails, amount);

+        } catch (AuthorizeFault_Exception e) {

+            status = e.getFaultInfo().getErrorCode();

+        }

+

+        StringBuffer body = new StringBuffer();

+        body.append(customer);

+        body.append("\n").append("Status: ").append(status).append("\n");

+        emailGateway.sendEmail("order@tuscanyscatours.com", customer.getEmail(), "Status for your payment", body

+            .toString());

+

+        return status;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java
new file mode 100644
index 0000000000..daf56353a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java
@@ -0,0 +1,70 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+import payment.creditcard.CreditCardDetailsType;

+

+/**

+ * Customer data

+ */

+public class Customer {

+    private String id;

+    private String email;

+    private String name;

+

+    private CreditCardDetailsType creditCard;

+

+    public String getId() {

+        return id;

+    }

+

+    public void setId(String id) {

+        this.id = id;

+    }

+

+    public String getEmail() {

+        return email;

+    }

+

+    public void setEmail(String email) {

+        this.email = email;

+    }

+

+    public String getName() {

+        return name;

+    }

+

+    public void setName(String name) {

+        this.name = name;

+    }

+

+    public CreditCardDetailsType getCreditCard() {

+        return creditCard;

+    }

+

+    public void setCreditCard(CreditCardDetailsType creditCard) {

+        this.creditCard = creditCard;

+    }

+

+    public String toString() {

+        return "id: " + id + " name: " + name + " e-mail: " + email;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
new file mode 100644
index 0000000000..89f56ce6ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
@@ -0,0 +1,58 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+

+public class CustomerNotFoundException extends Exception {

+    private static final long serialVersionUID = -129752837478357452L;

+

+    /**

+     * 

+     */

+    public CustomerNotFoundException() {

+

+    }

+

+    /**

+     * @param message

+     */

+    public CustomerNotFoundException(String message) {

+        super(message);

+

+    }

+

+    /**

+     * @param cause

+     */

+    public CustomerNotFoundException(Throwable cause) {

+        super(cause);

+

+    }

+

+    /**

+     * @param message

+     * @param cause

+     */

+    public CustomerNotFoundException(String message, Throwable cause) {

+        super(message, cause);

+

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java
new file mode 100644
index 0000000000..cfd79a7f95
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java
@@ -0,0 +1,39 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+import java.util.Collection;

+

+import payment.creditcard.CreditCardDetailsType;

+

+/**

+ * Customer registry interface

+ */

+public interface CustomerRegistry {

+    Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);

+

+    boolean updateCustomer(Customer customer);

+

+    Customer getCustomer(String id) throws CustomerNotFoundException;

+

+    Collection<Customer> getAllCustomers();

+

+    boolean deleteCustomer(String id);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
new file mode 100644
index 0000000000..e6328f062c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
@@ -0,0 +1,112 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.customer;

+

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.Map;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.EagerInit;

+import org.osoa.sca.annotations.Init;

+import org.osoa.sca.annotations.Requires;

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

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

+

+import payment.creditcard.CreditCardDetailsType;

+import payment.creditcard.CreditCardTypeType;

+import payment.creditcard.ObjectFactory;

+import payment.creditcard.PayerType;

+

+/**

+ * An in-memory customer registry implementation

+ */

+@Service(CustomerRegistry.class)

+@Scope("COMPOSITE")

+@EagerInit

+@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")

+public class CustomerRegistryImpl implements CustomerRegistry {

+    private volatile static int idGenerator = 0;

+    private Map<String, Customer> customers = new HashMap<String, Customer>();

+

+    @Init

+    public void init() {

+        // Load the customers

+        ObjectFactory factory = new ObjectFactory();

+        CreditCardDetailsType cc = factory.createCreditCardDetailsType();

+        PayerType john = factory.createPayerType();

+        john.setName("John Smith");

+        cc.setCardOwner(john);

+        cc.setCreditCardNumber("1111-2222-3333-4444");

+        cc.setCreditCardType(CreditCardTypeType.VISA);

+        cc.setCVV2("1234");

+        cc.setExpMonth(1);

+        cc.setExpYear(2012);

+        createCustomer("John Smith", "john@xyz.com", cc);

+    }

+    

+    @Destroy

+    public void destroy() {

+        // Save the customers

+    }

+    

+    public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {

+        Customer customer = new Customer();

+        customer.setId("c-" + idGenerator++);

+        customer.setName(name);

+        customer.setEmail(email);

+        customer.setCreditCard(creditCard);

+        customers.put(customer.getId(), customer);

+        return customer;

+    }

+

+    public boolean deleteCustomer(String id) {

+        return customers.remove(id) != null;

+    }

+

+    public Collection<Customer> getAllCustomers() {

+        return customers.values();

+    }

+

+    public Customer getCustomer(String id) throws CustomerNotFoundException {

+        Customer customer = customers.get(id);

+        

+        if (customer == null){

+            throw new CustomerNotFoundException("Customer " + id + " not found");

+        }

+        

+        return customer;

+    }

+

+    public boolean updateCustomer(Customer customer) {

+        Customer current = null;

+        try {

+            current = getCustomer(customer.getId());

+        } catch (Exception ex) {

+            return false;

+        }

+

+        current.setEmail(customer.getEmail());

+        current.setName(customer.getName());

+        current.setCreditCard(customer.getCreditCard());

+        return true;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java
new file mode 100644
index 0000000000..d360381327
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.emailgateway;

+

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

+

+/**

+ * A gateway to send e-mail

+ */

+@Remotable

+public interface EmailGateway {

+    public boolean sendEmail(String sender, String recipient, String subject, String body);

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
new file mode 100644
index 0000000000..060c3dabda
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.emailgateway;

+

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

+

+@Service(EmailGateway.class)

+public class EmailGatewayImpl implements EmailGateway {

+

+    public boolean sendEmail(String sender, String recipient, String subject, String body) {

+        System.out.println("From: " + sender);

+        System.out.println("To: " + recipient);

+        System.out.println("Subject: " + subject);

+        System.out.println(body);

+        return true;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl
new file mode 100644
index 0000000000..d17497d1f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="CreditCardPayment"

+                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

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

+                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

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

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

+                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

+                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

+

+            <xsd:element name="authorize">

+            <xsd:complexType>

+                <xsd:sequence>

+                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+            </xsd:element>

+

+            <xsd:element name="authorizeResponse">

+            <xsd:complexType>

+                <xsd:sequence>

+                    <xsd:element name="Status" type="xsd:string"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+            </xsd:element>

+

+            <xsd:complexType name="CreditCardDetailsType">

+                <xsd:sequence>

+                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

+                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

+                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

+                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

+                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

+                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:simpleType name="CreditCardTypeType">

+                <xsd:restriction base="xsd:token">

+                    <xsd:enumeration value="Visa" />

+                    <xsd:enumeration value="MasterCard" />

+                    <xsd:enumeration value="Discover" />

+                    <xsd:enumeration value="Amex" />

+                </xsd:restriction>

+            </xsd:simpleType>

+            <xsd:complexType name="PayerType">

+                <xsd:sequence>

+                    <xsd:element name="Name" type="xsd:string" />

+                    <xsd:element name="Address" type="tns:AddressType" />

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:complexType name="AddressType">

+                <xsd:sequence>

+                    <xsd:element name="Street" type="xsd:string" />

+                    <xsd:element name="City" type="xsd:string" />

+                    <xsd:element name="State" type="xsd:string" />

+                    <xsd:element name="ZipCode" type="xsd:string" />

+                    <xsd:element name="HomePhone" type="xsd:string" />

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:element name="authorizeFault">

+                <xsd:complexType>

+                    <xsd:sequence>

+                        <xsd:element name="errorCode" type="xsd:string"></xsd:element>

+                    </xsd:sequence>

+                </xsd:complexType>

+            </xsd:element>

+        </xsd:schema>

+    </wsdl:types>

+    <wsdl:message name="AuthorizeRequest">

+        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="AuthorizeResponse">

+        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="AuthorizeFault">

+        <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>

+    </wsdl:message>

+    <wsdl:portType name="CreditCardPayment">

+        <wsdl:operation name="authorize">

+            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

+            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

+            <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault>
+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

+        <wsdl:operation name="authorize">

+            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

+            <wsdl:input>

+                <soap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal" />

+            </wsdl:output>

+            <wsdl:fault name="authorizationFailure">

+                <soap:fault name="authorizationFailure" use="literal"/>

+            </wsdl:fault>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="CreditCardPaymentService">

+        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

+            <soap:address location="http://localhost:8080/CreditCardPayment" />

+        </wsdl:port>

+    </wsdl:service>

+

+    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

+        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

+    </plnk:partnerLinkType>

+</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..12b9852bf0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:scatours="http://scatours">

+   <export.java package="payment"/>

+   <deployable composite="scatours:payment" />

+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl
new file mode 100644
index 0000000000..3885764899
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Payment" 

+                  targetNamespace="http://www.tuscanyscatours.com/Payment/"

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

+                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 

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

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

+                    targetNamespace="http://www.tuscanyscatours.com/Payment/"

+                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">

+

+            <xsd:complexType name="MakePaymentMemberType">

+                <xsd:sequence>

+                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>

+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>                    

+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>

+      

+            <xsd:complexType name="MakePaymentMemberResponseType">

+                <xsd:sequence>

+                    <xsd:element name="Status" type="xsd:string"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>

+            

+        </xsd:schema>

+    </wsdl:types>

+    <wsdl:message name="MakePaymentMemberRequest">

+        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="MakePaymentMemberResponse">

+        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>

+    </wsdl:message>

+    <wsdl:portType name="Payment">

+        <wsdl:operation name="makePaymentMember">

+            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>

+            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>

+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="PaymentBinding" type="tns:Payment">

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

+        <wsdl:operation name="makePaymentMember">

+            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />

+            <wsdl:input>

+                <soap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal" />

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="PaymentService">

+        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">

+            <soap:address location="http://localhost:8083/Payment" />

+        </wsdl:port>

+    </wsdl:service>

+    

+   <plnk:partnerLinkType name="PaymentLinkType">

+       <plnk:role name="forward" portType="tns:Payment"/>

+   </plnk:partnerLinkType>

+</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..9060e75ed2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml
@@ -0,0 +1,35 @@
+<?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">

+

+    <!-- Policy Intents Defined by the SCA Runtime -->

+    <intent name="authorization" constrains="sca:implementation"/>

+    <intent name="managedTransaction" constrains="sca:implementation"/>

+    <intent name="managedTransaction.global"/>

+    

+    <!-- Policy intents -->

+    <policySet name="ps1" provides="sca:authorization" appliesTo="sca:implementation.java"/>

+    

+    <policySet name="ps2" provides="sca:managedTransaction.global" appliesTo="sca:implementation.java"/>

+	

+</definitions>

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite
new file mode 100644
index 0000000000..53fcefc241
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://scatours"

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

+           xmlns:c="http://scatours" 

+           name="payment">

+           

+    <component name="PaymentComponent">

+        <implementation.java class="payment.PaymentImpl" />

+        <service name="Payment">

+           <binding.ws uri="http://localhost:8081/Payment"/>

+        </service>

+        <reference name="customerRegistry" target="CustomerRegistryComponent"/>

+        <reference name="creditCardPayment">

+            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>

+        </reference>

+        <reference name="emailGateway" target="EmailGatewayComponent"/>

+        <property name="transactionFeeRate">0.02</property>

+    </component>

+        

+    <component name="CustomerRegistryComponent">

+        <implementation.java class="scatours.customer.CustomerRegistryImpl" />

+    </component>

+            

+    <component name="EmailGatewayComponent">

+        <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />

+    </component>    

+    

+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/transaction/pom.xml
new file mode 100644
index 0000000000..1fc0bf0cb8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-transaction</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Transaction</name>
+
+    <packaging>pom</packaging>
+    <build>
+        <defaultGoal>install</defaultGoal>
+    </build>
+    <modules>
+        <module>payment</module>
+        <module>runtest</module>
+    </modules>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/pom.xml b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/pom.xml
new file mode 100644
index 0000000000..48fcf1f2fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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-domainmgr-transaction</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-transaction-runtest</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Transaction Run Test</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-transaction-payment</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-transaction</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <reportFormat>brief</reportFormat>
+                    <useFile>false</useFile>
+                    <forkMode>once</forkMode>
+                    <argLine>-ea -Xmx256m</argLine>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java
new file mode 100644
index 0000000000..ef99628686
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java
@@ -0,0 +1,328 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package domainmgr;

+

+import java.io.BufferedReader;

+import java.io.File;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.io.OutputStream;

+

+import org.junit.Test;

+

+/**

+ * Starts the Romain Manager with a test configuration, then starts

+ * a test node that reads a deployed composite.  The domain manager

+ * should read and configure the composite and send it to the node

+ * without detecting or reporting any errors.

+ */

+public class DomainManagerTransactionTestCase {

+

+    private String home = System.getProperty("java.home");

+    private String classpath = System.getProperty("java.class.path");

+    private Runtime runtime = Runtime.getRuntime();

+    private Process domainMgr = null;

+    private BufferedReader domainErrReader;

+    private BufferedReader domainOutReader;

+    private OutputStream domainIn;

+

+    @Test

+    public void test() throws Exception {

+

+        TestNode paymentNode = null;

+

+        try {

+            // Start the domain manager process in its own working directory of

+            // "target/test-classes/domain/" to ensure no interference with the

+            // node processes.  The predefined domain config is copied by mvn

+            // from the "src/test/resources/domain/" directory.

+            System.out.println("Starting domain manager");

+            String[] domainCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"};

+            String userdir = System.getProperty("user.dir");

+            domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/"));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the domain manager process.

+            InputStream domainErr = domainMgr.getErrorStream();

+            domainErrReader = new BufferedReader(new InputStreamReader(domainErr));

+            InputStream domainOut = domainMgr.getInputStream();

+            domainOutReader = new BufferedReader(new InputStreamReader(domainOut));

+            domainIn = domainMgr.getOutputStream();

+

+            // Read startup log output from the domain manager process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // domain manager started successfully

+                    System.out.println("Domain manager started successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+            

+            // Start the test nodes.  Each node runs in its own "target" directory

+            // to ensure no interference with other processes.

+            paymentNode = new TestNode("PaymentNode", userdir + "/../payment/target/");

+            paymentNode.start();

+

+            // Stop the test nodes.

+            paymentNode.stopNode();

+

+            // Stop the domain manager

+            stopDomain();

+

+        } catch (Exception ex) {

+

+            // Error found, so destroy the test node processes and the domain

+            // manager process so that the test case exits cleanly.

+            if (paymentNode != null) {

+                paymentNode.destroyNode();

+            }

+            if (domainMgr != null) {

+                System.out.println("Destroying domain");

+                try {

+                    domainMgr.destroy();

+                } catch (Exception e) {

+                }

+            }

+

+            // Report the test error.

+            throw ex;

+        }

+    }

+

+    /*

+     * Stop the test node process.

+     */

+     void stopDomain() throws Exception {

+

+        // Stop the domain manager by sending 'q' to stdin.

+        System.out.println("Stopping domain manager");

+        domainIn.write('q');

+        domainIn.flush();

+        while (true) {

+            checkDomainOut();

+            String line = domainErrReader.readLine();

+            if (line == null) {

+                // reached end of stderr stream before shutdown completed

+                throw new IllegalStateException("Error stopping Domain Manager process");

+            }

+            System.out.println("DomainMgr.e: " + line);

+            if (line.contains("SEVERE:")) {

+                // shutdown error logged by domain manager process

+                throw new IllegalStateException("Domain manager reported error: " + line);

+            }

+            if (line.contains("INFO: SCA Domain Manager is now stopped.")) {

+                // domain manager stopped successfully

+                System.out.println("Domain manager stopped successfully");

+                break;

+            }

+        }

+        checkDomainOut();

+

+        // Wait for domain manager process to end, and check its exit value.

+        int value = domainMgr.waitFor();

+        if (value != 0) {

+            throw new IllegalStateException("Domain Manager process exit value " + value);

+        }

+        domainMgr = null;

+    }

+

+    /*

+     * Check stderr for the domain manager process.  Called periodically

+     * to ensure that anything written to stderr is displayed in the test log

+     * and abort execution if the domain manager has logged any errors.

+     */

+    private void checkDomainErr() throws Exception {

+        while (domainErrReader.ready()) {

+            String line = domainErrReader.readLine();

+            System.out.println("DomainMgr.e: " + line);

+            if (line.contains("SEVERE:")) {

+                throw new IllegalStateException("Domain manager reported error: " + line);

+            }

+        }

+    }

+

+    /*

+     * Check stdout for the domain manager process.  Called periodically

+     * to ensure that anything written to stdout is displayed in the test log. 

+     */

+    private void checkDomainOut() throws Exception {

+        while (domainOutReader.ready()) {

+            String line = domainOutReader.readLine();

+            System.out.println("DomainMgr.o: " + line);

+        }

+    }

+

+    /*

+     * Internal class representing a test node.

+     */

+    private class TestNode {

+

+        String nodeName;

+        String nodeDir;

+        BufferedReader nodeErrReader;

+        BufferedReader nodeOutReader;

+        OutputStream nodeIn;

+        Process nodeProcess;

+

+        TestNode(String nodeName, String nodeDir) {

+            this.nodeName = nodeName;

+            this.nodeDir = nodeDir;

+        }

+

+        /*

+         * Start the test node.

+         */

+        void start() throws Exception {

+            System.out.println("Starting node " + nodeName);

+            String[] nodeCommand = {

+                "" + home + "/bin/java",

+                "-cp",

+                "" + classpath + "",

+                "org.apache.tuscany.sca.node.launcher.NodeLauncher",

+                "http://localhost:9990/node-config/" + nodeName};

+            nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the test node process.

+            InputStream nodeErr = nodeProcess.getErrorStream();

+            nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr));

+            InputStream nodeOut = nodeProcess.getInputStream();

+            nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut));

+            nodeIn = nodeProcess.getOutputStream();

+

+            // Read startup log output from the test node process.  The log

+            // output is written to the process's stderr.

+            try {

+                while (true) {

+                    checkNodeOut();

+                    String line = nodeErrReader.readLine();

+                    if (line == null) {

+                        // reached end of stderr stream before startup completed

+                        throw new IllegalStateException("Error starting node " + nodeName);

+                    }

+                    System.out.println(nodeName + ".e: " + line);

+                    if (line.contains("SEVERE:")) {

+                        // startup error logged by test node process

+                        throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                    }

+                    if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                        // test node started successfully

+                        System.out.println("Node " + nodeName + " started successfully");

+                        return;

+                    }

+                }

+            } finally {

+                checkDomainErr();

+                checkDomainOut();

+                checkNodeOut();

+            }

+        }

+

+        /*

+         * Check stderr for the test node process.  Called periodically to

+         * ensure that anything written to stderr is displayed in the test log

+         * and abort execution if the test node has logged any errors.

+         */

+        void checkNodeErr() throws Exception {

+            while (nodeErrReader.ready()) {

+                String line = nodeErrReader.readLine();

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+            }

+        }

+

+        /*

+         * Check stdout for the test node process.  Called periodically to

+         * ensure that anything written to stdout is displayed in the test log.

+         */

+        void checkNodeOut() throws Exception {

+            while (nodeOutReader.ready()) {

+                String line = nodeOutReader.readLine();

+                System.out.println(nodeName + ".o: " + line);

+            }

+        }

+

+        /*

+         * Stop the test node process.

+         */

+        void stopNode() throws Exception {

+            System.out.println("Stopping node " + nodeName);

+            nodeIn.write('q');

+            nodeIn.flush();

+            while (true) {

+                checkNodeOut();

+                String line = nodeErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before shutdown completed

+                    throw new IllegalStateException("Error stopping node " + nodeName);

+                }

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // shutdown error logged by test node process

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+                if (line.contains("INFO: SCA Node is now stopped.")) {

+                    // test node stopped successfully

+                    System.out.println("Node " + nodeName + " stopped successfully");

+                    break;

+                }

+            }

+            checkNodeOut();

+

+            // Wait for test node process to end, and check its exit value.

+            int value = nodeProcess.waitFor();

+            if (value != 0) {

+                throw new IllegalStateException("Node " + nodeName + " exit value " + value);

+            }

+        }

+

+        /*

+         * Destroy the test node process.

+         */

+        void destroyNode() {

+            if (nodeProcess != null) {

+                System.out.println("Destroying node " + nodeName);

+                try {

+                    nodeProcess.destroy();

+                } catch (Exception e) {

+                }

+            }

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite
new file mode 100644
index 0000000000..ca43648169
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="cloud"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:PaymentNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud" />
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite
new file mode 100644
index 0000000000..e61fd4c1a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://scatours"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="PaymentNode">
+    <component name="PaymentNode">
+        <t:implementation.node uri="scatours-payment" composite="c:payment" />
+        <service name="Node">
+             <binding.ws uri="http://localhost:8081" />
+        </service>
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite
new file mode 100644
index 0000000000..f03181ecc5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="domain"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:payment"
+           uri="scatours-payment"
+           xmlns:ns2="http://scatours" />
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml
new file mode 100644
index 0000000000..1379b37dce
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:./cloud"
+           uri="http://tuscany.apache.org/cloud" />
+    <contribution location="file:../../../../payment/target/itest-domainmgr-transaction-payment.jar"
+           uri="scatours-payment" />
+</workspace>
diff --git a/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/pom.xml b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/pom.xml
new file mode 100644
index 0000000000..df7d6f8b9b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/pom.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>itest-exceptions-cross-binding-ws</artifactId>
+    <name>Apache Tuscany SCA iTest WS Binding Exceptions</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.5</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.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-xml</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</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.1</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.5.1</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.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
new file mode 100644
index 0000000000..4f4fe50041
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
new file mode 100644
index 0000000000..95496e1737
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
new file mode 100644
index 0000000000..842dd4e602
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
new file mode 100644
index 0000000000..74815dc6c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
new file mode 100644
index 0000000000..aba83723bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
new file mode 100644
index 0000000000..ab65efbb58
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
new file mode 100644
index 0000000000..acecdff613
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
new file mode 100644
index 0000000000..460edab182
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
new file mode 100644
index 0000000000..40e87953b6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
new file mode 100644
index 0000000000..9759647cfe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
new file mode 100644
index 0000000000..fc49fa1d7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding/pom.xml b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/pom.xml
new file mode 100644
index 0000000000..df1aaa3f56
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/pom.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>itest-exceptions-cross-binding</artifactId>
+    <name>Apache Tuscany SCA iTest Cross-Binding Exceptions</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.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-xml</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</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.1</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.5.1</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.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
new file mode 100644
index 0000000000..f5e36db7cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
new file mode 100644
index 0000000000..65751175fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
new file mode 100644
index 0000000000..5f65d293ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
new file mode 100644
index 0000000000..e84ae633e7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
new file mode 100644
index 0000000000..74815dc6c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
new file mode 100644
index 0000000000..5fe40935ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
new file mode 100644
index 0000000000..ab65efbb58
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
new file mode 100644
index 0000000000..872fd721d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
new file mode 100644
index 0000000000..83526cb6a1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
new file mode 100644
index 0000000000..d70cdad313
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
new file mode 100644
index 0000000000..33b830c856
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
new file mode 100644
index 0000000000..9759647cfe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
new file mode 100644
index 0000000000..7a07221b59
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions-simple-ws/pom.xml b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/pom.xml
new file mode 100644
index 0000000000..3aa16793e0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-exceptions-simple-ws</artifactId>
+    <name>Apache Tuscany SCA iTest Simple Exceptions Over Web Services</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
new file mode 100644
index 0000000000..764f31b7cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
new file mode 100644
index 0000000000..1b597984e5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 BusinessExceptionMinimal extends Exception {
+
+    public BusinessExceptionMinimal(String message) {
+        super(message);
+    }
+
+}
+
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
new file mode 100644
index 0000000000..0c72b52ed9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
new file mode 100644
index 0000000000..c86059f4f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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());
+        }
+        
+        try {
+            Object result = myService.helloUnchecked("John");
+            System.out.println("myService returned " + result.getClass().getName());
+        } catch (Exception e) {
+            System.out.println("caught exception from helloUnchecked(): " + e.getMessage());
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
new file mode 100644
index 0000000000..987d2107b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 ExampleClientMinimalImpl implements ExampleClient {
+public class ExampleClientMinimalImpl {
+    @Reference
+    protected ExampleServiceMinimal myService;
+
+    public void runTest() {
+        try {
+            //Object result = myService.hello("John");
+            myService.throwException("John");
+            //System.out.println("myService returned " + result.getClass().getName());
+        } catch (BusinessExceptionMinimal e) {
+            System.out.println("caught exception from hello(): " + e.getMessage() );
+        }
+    }
+    
+    public String hello(String name) throws BusinessExceptionMinimal{
+        throw new BusinessExceptionMinimal("bad news");
+    }
+    public void throwException(String name) throws BusinessExceptionMinimal{
+        throw new BusinessExceptionMinimal("bad news");
+    }
+    
+
+    public static void main(String[] args) {
+        
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
new file mode 100644
index 0000000000..4f82e10241
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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;
+	String helloUnchecked(String name);
+}
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
new file mode 100644
index 0000000000..5d054c1c9b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ServiceRuntimeException;
+
+public class ExampleServiceImpl implements ExampleService {
+    public String hello(String name) throws BusinessException {
+        throw new BusinessException("bad news", name);
+        // return "Hello, " + name;
+    }
+    
+    public String helloUnchecked(String name){
+        throw new ServiceRuntimeException("bad unchecked news");
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
new file mode 100644
index 0000000000..aa8591872e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 ExampleServiceMinimal {
+
+	public String hello(String name) throws Exception;
+	public void throwException(String name) throws BusinessExceptionMinimal;
+}
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
new file mode 100644
index 0000000000..728be51428
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 ExampleServiceMinimalImpl implements ExampleServiceMinimal {
+    public String hello(String name) throws Exception {
+        throw new BusinessExceptionMinimal("minimal bad news" + name);
+        // return "Hello, " + name;
+    }
+    
+    public void throwException(String name) throws BusinessExceptionMinimal {
+        throw new BusinessExceptionMinimal("minimal bad news" + name);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/example.composite b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/example.composite
new file mode 100644
index 0000000000..505132277c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/example.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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>

+    

+    <component name="ExampleClientMinimalComponent">

+        <implementation.java class="com.example.ExampleClientMinimalImpl" />

+        <reference name="myService">

+			<interface.java interface="com.example.ExampleServiceMinimal"/>

+			<binding.ws uri="http://localhost:8085/ExampleMinimalComponent" />        

+       </reference>

+    </component>

+        

+	<component name="ExampleMinimalComponent">

+		<implementation.java class="com.example.ExampleServiceMinimalImpl" />

+		<service name="ExampleServiceMinimal">

+			<interface.java interface="com.example.ExampleServiceMinimal"/>

+			<binding.ws uri="http://localhost:8085/ExampleMinimalComponent" />

+		</service>

+	</component>    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
new file mode 100644
index 0000000000..59adbb49ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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:operation name="helloUnchecked">

+            <wsdl:input message="ns0:helloRequest" wsaw:Action="urn:hello" />

+            <wsdl:output message="ns0:helloResponse" wsaw:Action="urn:helloResponse" />

+        </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:operation name="helloUnchecked">

+            <soap:operation soapAction="urn:helloUnchecked" 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="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:operation name="helloUnchecked">

+            <soap12:operation soapAction="urn:helloUnchecked" style="document" />

+            <wsdl:input>

+                <soap12:body use="literal" />

+            </wsdl:input>

+            <wsdl:output>

+                <soap12:body use="literal" />

+            </wsdl:output>

+        </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:operation name="helloUnchecked">

+            <http:operation location="ExampleService/helloUnchecked" />

+            <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.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
new file mode 100644
index 0000000000..7310a0f1e7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 ExampleMinimalTestCase extends TestCase {
+
+    private SCADomain scaDomain;
+    private ExampleClientMinimalImpl client;
+
+    @Override
+    protected void setUp() throws Exception {
+        scaDomain = SCADomain.newInstance("example.composite");
+        client = scaDomain.getService(ExampleClientMinimalImpl.class, "ExampleClientMinimalComponent");
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        scaDomain.close();
+    }
+
+    public void test() throws Exception {
+        client.runTest();
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
new file mode 100644
index 0000000000..740af4f43d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/exceptions/pom.xml b/tags/java/sca/1.5.1/itest/exceptions/pom.xml
new file mode 100644
index 0000000000..88ccdfd470
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-exceptions</artifactId>
+    <name>Apache Tuscany SCA iTest Exceptions</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
new file mode 100644
index 0000000000..b95b0ccb31
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
new file mode 100644
index 0000000000..5740e053a9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
new file mode 100644
index 0000000000..f923133ee9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
new file mode 100644
index 0000000000..55d81102d2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
new file mode 100644
index 0000000000..453528444d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
new file mode 100644
index 0000000000..1987490a0a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
new file mode 100644
index 0000000000..c4cb52f94c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
new file mode 100644
index 0000000000..cf8740ba56
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
new file mode 100644
index 0000000000..f82a30d529
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/exceptions/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.5.1/itest/exceptions/src/main/resources/ExceptionTest.composite
new file mode 100644
index 0000000000..d27797c2fe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/main/resources/ExceptionTest.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/tags/java/sca/1.5.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
new file mode 100644
index 0000000000..f84205c096
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/extended-api/pom.xml b/tags/java/sca/1.5.1/itest/extended-api/pom.xml
new file mode 100644
index 0000000000..2ba7684b38
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-extended-api</artifactId>
+    <name>Apache Tuscany SCA iTest Extended API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            
+            <groupId>org.apache.tuscany.sca</groupId>
+            
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            
+            <version>1.5.1</version>
+            
+            <scope>runtime</scope>
+        
+        </dependency>
+    
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
new file mode 100644
index 0000000000..869565af17
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
new file mode 100644
index 0000000000..c54af93c05
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
new file mode 100644
index 0000000000..523d238f2e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
new file mode 100644
index 0000000000..ab4300a7dd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/extended-api/src/main/resources/BasicService.composite b/tags/java/sca/1.5.1/itest/extended-api/src/main/resources/BasicService.composite
new file mode 100644
index 0000000000..128b33b16f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/src/main/resources/BasicService.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/extended-api/src/main/resources/MathService.composite b/tags/java/sca/1.5.1/itest/extended-api/src/main/resources/MathService.composite
new file mode 100644
index 0000000000..8e99d3da60
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/src/main/resources/MathService.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/tags/java/sca/1.5.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
new file mode 100644
index 0000000000..c480235d88
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/http-jsonrpc/pom.xml b/tags/java/sca/1.5.1/itest/http-jsonrpc/pom.xml
new file mode 100644
index 0000000000..eb13a0a0d8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-http-jsonrpc</artifactId>
+    <name>Apache Tuscany SCA iTest HTTP JSONRPC</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>         
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-jsonrpc-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-json</artifactId>
+            <version>1.5.1</version>
+        </dependency>       
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+        
+       <dependency>
+	        <groupId>httpunit</groupId>
+	        <artifactId>httpunit</artifactId>
+	        <version>1.6.1</version>
+	        <scope>test</scope>
+        </dependency>        
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/bean/TestBean.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/bean/TestBean.java
new file mode 100644
index 0000000000..5117bcf7c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/bean/TestBean.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package bean;
+
+public class TestBean {
+    private String testString;
+    private String[] testStringArray;
+    private int testInt;
+    
+
+    public String getTestString() {
+        return testString;
+    }
+
+    public void setTestString(String testString) {
+        this.testString = testString;
+    }
+
+    public String[] getTestStringArray() {
+    	return testStringArray;
+    }
+    
+    public void setStringArray(String[] stringArray) {
+    	this.testStringArray = stringArray;
+    }
+    
+    public int getTestInt() {
+        return testInt;
+    }
+
+    public void setTestInt(int testInt) {
+        this.testInt = testInt;
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/Echo.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/Echo.java
new file mode 100644
index 0000000000..0775a59135
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/Echo.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package echo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.osoa.sca.annotations.Remotable;
+
+import bean.TestBean;
+
+/**
+ * Interface of our sample JSONRPC service.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface Echo {
+    
+    String echo(String msg);
+    
+    void echoRuntimeException() throws RuntimeException;
+    
+    void echoBusinessException() throws EchoBusinessException;
+    
+    int echoInt(int param);
+    
+    boolean echoBoolean(boolean param);
+    
+    Map echoMap(HashMap map);
+    
+    TestBean echoBean(TestBean testBean);
+    
+    List echoList(ArrayList list);
+    
+    String [] echoArrayString(String[] stringArray);
+    
+    int [] echoArrayInt(int[] intArray);
+    
+    Set echoSet(HashSet set);
+    
+
+    void get\u03a9\u03bb\u03c0();
+
+}
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
new file mode 100644
index 0000000000..bf8c7d2c8a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package echo;
+
+public class EchoBusinessException extends Exception {
+    private static final long serialVersionUID = 7234119326657905710L;
+
+    public EchoBusinessException(String message)
+	{
+		super(message);
+	}
+
+}
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
new file mode 100644
index 0000000000..87ab8b4b48
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package echo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import bean.TestBean;
+
+/**
+ * A simple client component that uses a reference with an JSONRPC binding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class EchoComponentImpl implements Echo {    
+
+    public String echo(String msg) {        
+        System.out.println("Echo: "+ msg);
+        return "echo: " + msg;
+    }
+
+	public void echoBusinessException() throws EchoBusinessException {
+		throw new EchoBusinessException("Business Exception");
+		
+	}
+
+	public void echoRuntimeException() throws RuntimeException {
+		throw new RuntimeException("Runtime Exception");
+	}
+	
+	public int echoInt(int param) {
+		int value = param;
+		return value;
+	}
+	
+	public boolean echoBoolean(boolean param) {
+		boolean value = param;
+		return value;
+	}
+	
+	public Map echoMap(HashMap param) {
+		Map map = new HashMap();
+		map = param;
+		return map;
+	}
+	
+	public TestBean echoBean(TestBean testBean1) {
+		TestBean testBean = new TestBean();
+		testBean.setTestString(testBean1.getTestString());
+		testBean.setTestInt(testBean1.getTestInt());
+		return testBean;
+	}
+	
+	public List echoList(ArrayList param){
+		List list = new ArrayList();
+		for(Iterator itr = param.iterator();itr.hasNext();)
+		{
+			list.add(itr.next());
+		}
+		return list;
+	}
+	
+	public String[] echoArrayString(String[] stringArray) {
+		return stringArray;
+	}
+	
+	public int[] echoArrayInt(int[] intArray) {
+		return intArray;
+	}
+	
+	public Set echoSet(HashSet param){
+		Set set = new HashSet();
+		set  = param;
+		return set;
+		
+	}
+	
+
+	public void get\u03a9\u03bb\u03c0() {
+
+	}
+}
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
new file mode 100644
index 0000000000..b842f9b1e5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
@@ -0,0 +1,193 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.http.wireformat.jsonrpc;
+
+import java.io.ByteArrayInputStream;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JSONRPCDataTypeTestCase {
+
+    private static final String SERVICE_PATH = "/EchoService";
+    private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH;
+
+    private static SCADomain domain;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        domain.close();
+    }
+
+    @Test
+    public void testInt() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{ \"method\": \"echoInt\", \"params\": [12345], \"id\": 4}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals(12345, jsonResp.getInt("result"));
+    }
+
+    @Test
+    public void testBoolean() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{ \"method\": \"echoBoolean\", \"params\": [true], \"id\": 5}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals(true, jsonResp.getBoolean("result"));
+    }
+
+    @Test
+    public void testMap() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{ \"method\": \"echoMap\", \"params\": [ {\"javaClass\": \"java.util.HashMap\", \"map\": { \"Binding\": \"JSON-RPC\"}}], \"id\": 6}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals("JSON-RPC", jsonResp.getJSONObject("result").getJSONObject("map").getString("Binding"));
+    }
+
+    @Test
+    public void testBean() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{ \"method\": \"echoBean\", \"params\": [ {\"javaClass\": \"bean.TestBean\", \"testString\": \"JSON-RPC\", \"testInt\":1234}], \"id\": 7}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals("JSON-RPC", jsonResp.getJSONObject("result").getString("testString"));
+    }	
+
+    @Test
+    public void testList() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{ \"method\": \"echoList\", \"params\": [ {\"javaClass\": \"java.util.ArrayList\", \"list\": [0,1,2,3,4]}], \"id\": 8}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals(0, jsonResp.getJSONObject("result").getJSONArray("list").get(0));
+    }
+
+    @Test
+    public void testArrayString() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{\"params\":[[\"1\",\"2\"]],\"method\":\"echoArrayString\",\"id\":9}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals(1, jsonResp.getJSONArray("result").getInt(0));
+    }	
+
+
+    @Test
+    public void testArrayInt() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{\"params\":[[1,2]],\"method\":\"echoArrayInt\",\"id\":10}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals(1, jsonResp.getJSONArray("result").getInt(0));
+    }	
+
+
+    @Test
+    public void testSet() throws Exception {
+        JSONObject jsonRequest = new JSONObject(
+            "{ \"method\": \"echoSet\", \"params\": [ {\"javaClass\": \"java.util.HashSet\", \"set\": {\"1\": \"red\", \"2\": \"blue\"}}],\"id\": 11}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new PostMethodWebRequest(SERVICE_URL,
+                                                      new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+
+        Assert.assertEquals("red", jsonResp.getJSONObject("result").getJSONObject("set").getString("red"));
+    }
+}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
new file mode 100644
index 0000000000..159ae0e65e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.http.wireformat.jsonrpc;
+
+import java.io.ByteArrayInputStream;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JSONRPCExceptionTestCase{
+
+    private static final String SERVICE_PATH = "/EchoService";
+
+    private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH;
+
+    private static SCADomain domain;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+    	domain.close();
+    }
+    
+    @Test
+    public void testRuntimeException() throws Exception{
+    	JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoRuntimeException\", \"params\": [], \"id\": 2}");
+    	
+    	WebConversation wc = new WebConversation();
+        WebRequest request   = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+        
+        JSONObject jsonErr = new JSONObject(response.getText()).getJSONObject("error");
+        
+        Assert.assertEquals("Runtime Exception", jsonErr.getString("msg"));
+    }
+    
+    @Test
+    public void testBusinessException() throws Exception{
+    	JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoBusinessException\", \"params\": [], \"id\": 3}");
+    	
+    	WebConversation wc = new WebConversation();
+        WebRequest request   = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+        
+        JSONObject jsonErr = new JSONObject(response.getText()).getJSONObject("error");
+        
+        Assert.assertEquals("Business Exception", jsonErr.getString("msg"));
+    }
+}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
new file mode 100644
index 0000000000..e04e210596
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.http.wireformat.jsonrpc;
+
+import java.io.ByteArrayInputStream;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JSONRPCServiceTestCase {
+
+    private static final String SERVICE_PATH = "/EchoService";
+
+    private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH;
+
+    private static SCADomain domain;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        domain.close();
+    }
+
+    @Test
+    public void testJSONRPCBinding() throws Exception {
+        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echo\", \"params\": [\"Hello JSON-RPC\"], \"id\": 1}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request   = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+        Assert.assertEquals("echo: Hello JSON-RPC", jsonResp.getString("result"));
+    }
+}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java
new file mode 100644
index 0000000000..f142f53223
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.http.wireformat.jsonrpc;
+
+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 com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JSONRPCSmdTestCase {
+
+    private static final String SERVICE_PATH = "/EchoService";
+
+    private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH;
+    
+    private static final String SMD_URL = SERVICE_URL + "?smd";
+
+    private static SCADomain domain;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        domain.close();
+    }
+
+    @Test
+    /**
+     * This test make sure the JSON-RPC Binding can handle special characters when generating SMD
+     */
+    public void testJSONRPCSmdSpecialCharacters() throws Exception {
+        WebConversation wc = new WebConversation();
+        WebRequest request   = new GetMethodWebRequest(SMD_URL);
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+        Assert.assertNotNull(response.getText());
+        
+        //System.out.println(">>>SMD:" + response.getText());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
new file mode 100644
index 0000000000..07eb4907f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jsonrpc"

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

+	xmlns:jsonrpc="http://jsonrpc"

+	name="JSONRPCBinding">

+

+    <service name="EchoService" promote="EchoComponent">

+        <interface.java interface="echo.Echo"/>

+        <tuscany:binding.http uri="http://localhost:8085/EchoService">

+           <tuscany:wireFormat.jsonrpc/>

+           <tuscany:operationSelector.jsonrpc/>

+        </tuscany:binding.http>

+    </service>

+

+    <component name="EchoComponent">

+        <implementation.java class="echo.EchoComponentImpl"/>

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/pom.xml b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/pom.xml
new file mode 100644
index 0000000000..54cb73f4c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-implementation-jee-external-ear</artifactId>
+    <name>Apache Tuscany SCA iTest Implementation JEE External EAR</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-jee</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-jee</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-jee-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope> 
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</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.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
new file mode 100644
index 0000000000..76fa697c6a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License. 

+

+itest.SomeCustomModelResolver;model=org.apache.tuscany.sca.contribution.jee.ExternalEarInfo

diff --git a/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
new file mode 100644
index 0000000000..eb0811dcc6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT 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 implementation extension

+itest.MockImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.jee.JEEImplementation

diff --git a/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/test.composite b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/test.composite
new file mode 100644
index 0000000000..38902f1f1d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/test.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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: 685124 $ $Date: 2008-08-12 12:46:19 +0100 (Tue, 12 Aug 2008) $ -->

+

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

+	targetNamespace="http://sample/jee"

+	xmlns:sc="http://sample/composite"

+	name="TestJEE">

+

+    <component name="TestJEE">

+        <implementation.jee archive="../contribution-jee/src/test/resources/repository/helloworld-ejb.ear"/>

+    </component>

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
new file mode 100644
index 0000000000..c1eae6a64d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
@@ -0,0 +1,25 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+public interface Helloworld {

+

+    String getGreetings(String name);

+}

diff --git a/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
new file mode 100644
index 0000000000..765e6a3f18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
@@ -0,0 +1,52 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package itest;

+

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

+

+

+/**

+ */

+public class JeeTestCase {

+

+

+    @Before

+    public void init() {

+    }

+

+    @Test

+    public void testSayHello() throws Exception {

+        SCADomain scaDomain = SCADomain.newInstance("http://localhost", "/", "test.composite");

+

+        Helloworld service = scaDomain.getService(Helloworld.class, "TestJEE/HelloworldServiceBean_HelloworldService");

+

+        //assertEquals("hello beate", service.getGreetings("beate"));

+

+        scaDomain.close();

+    }

+

+    @After

+    public void end() {

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
new file mode 100644
index 0000000000..7f7cff8810
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
@@ -0,0 +1,44 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

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

+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;

+import org.apache.tuscany.sca.provider.ImplementationProvider;

+import org.apache.tuscany.sca.provider.ImplementationProviderFactory;

+import org.apache.tuscany.sca.runtime.RuntimeComponent;

+

+public class MockImplementationProviderFactory implements ImplementationProviderFactory<JEEImplementation>{

+

+    public MockImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {

+        

+    }

+

+    

+    public ImplementationProvider createImplementationProvider(RuntimeComponent component,

+                                                               JEEImplementation Implementation) {

+        return null;

+    }

+

+    public Class<JEEImplementation> getModelType() {

+        return null;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
new file mode 100644
index 0000000000..b534297148
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
@@ -0,0 +1,77 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+import java.io.File;

+import java.net.URI;

+import java.util.HashMap;

+import java.util.Map;

+

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

+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;

+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;

+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

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

+

+public class SomeCustomModelResolver implements ModelResolver {

+

+    private Map<URI, ExternalEarInfo> map = new HashMap<URI, ExternalEarInfo>();

+    private JavaEEIntrospector jeeIntrospector;

+    

+    

+    public SomeCustomModelResolver(Contribution contribution, ExtensionPointRegistry extensionPoints) {

+       jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class);

+    }

+        

+    public void addModel(Object resolved) {

+        ExternalEarInfo jeeApp = (ExternalEarInfo)resolved;

+        map.put(jeeApp.getAppInfo().getUri(), jeeApp);

+    }

+

+    public Object removeModel(Object resolved) {

+        return map.remove(((ExternalEarInfo)resolved).getAppInfo().getUri());

+    }

+

+    public <T> T resolveModel(final Class<T> modelClass, T unresolved) {

+        URI uri = ((ExternalEarInfo)unresolved).getAppInfo().getUri();

+        if (uri != null) {

+            ExternalEarInfo resolved = (ExternalEarInfo) map.get(uri);

+            if (resolved != null) {

+                return modelClass.cast(resolved);

+            } else {

+                try {

+                    File f = new File(uri.toString());

+                    final JavaEEApplicationInfo o = jeeIntrospector.introspectJeeArchive(f.toURI().toURL());

+                    return (T)new ExternalEarInfo() {

+                        public JavaEEApplicationInfo getAppInfo() {

+                            return (JavaEEApplicationInfo)o;

+                        }

+                    };

+                } catch (Exception e) {

+                    throw new RuntimeException(e);

+                }

+            }

+        }

+

+        return unresolved;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/interfaces/pom.xml b/tags/java/sca/1.5.1/itest/interfaces/pom.xml
new file mode 100644
index 0000000000..2ba3d07127
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-interfaces</artifactId>
+    <name>Apache Tuscany SCA iTest Interfaces</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
new file mode 100644
index 0000000000..5bc872ef83
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
new file mode 100644
index 0000000000..7bfcf5de11
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
new file mode 100644
index 0000000000..d4f7694e8f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
new file mode 100644
index 0000000000..4772303fab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
new file mode 100644
index 0000000000..e100636b23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
new file mode 100644
index 0000000000..0bc8d10904
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
new file mode 100644
index 0000000000..e2b70313ed
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
new file mode 100644
index 0000000000..dd591eabeb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
new file mode 100644
index 0000000000..d4731f35d3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
new file mode 100644
index 0000000000..6c40db0e70
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
new file mode 100644
index 0000000000..3804d31902
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interfaces/src/main/resources/InterfacesTest.composite b/tags/java/sca/1.5.1/itest/interfaces/src/main/resources/InterfacesTest.composite
new file mode 100644
index 0000000000..0361d8c83c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/main/resources/InterfacesTest.composite
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed 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.5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/tags/java/sca/1.5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
new file mode 100644
index 0000000000..013cdd4f15
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/interop-soap-client/pom.xml b/tags/java/sca/1.5.1/itest/interop-soap-client/pom.xml
new file mode 100644
index 0000000000..2ac8319d59
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-client/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>itest-interop-soap-client</artifactId>
+	<packaging>jar</packaging>
+	<name>Apache Tuscany SCA WS Interop Client Integration Tests</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-sca-api</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-embedded</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-implementation-java-runtime</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-interface-wsdl</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-ws-axis2</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-sdo</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-axiom</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-jetty</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sdo</groupId>
+			<artifactId>tuscany-sdo-impl</artifactId>
+			<version>1.0-incubating-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.tuscany.sdo</groupId>
+				<artifactId>tuscany-sdo-plugin</artifactId>
+				<version>1.0-incubating-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<configuration>
+							<schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
+							<noNotification>true</noNotification>
+							<noContainer>true</noContainer>
+							<noInterfaces>true</noInterfaces>
+							<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.5.1</version>
+				<executions>
+					<execution>
+						<configuration>
+							<wsdlFile>
+								${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
+							<javaPackage>org.soapinterop</javaPackage>
+						</configuration>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
new file mode 100644
index 0000000000..ffffb96686
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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.interop.client;
+
+import java.rmi.RemoteException;
+
+import org.osoa.sca.annotations.Service;
+import org.soapinterop.ComplexDocument;
+import org.soapinterop.DocTestPortType;
+import org.soapinterop.SimpleDocument1;
+import org.soapinterop.SingleTag;
+
+/**
+ * This class implements the DocTest service component.
+ */
+@Service(DocTestPortType.class)
+public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType {
+    
+    public ComplexDocument ComplexDocument(ComplexDocument param0){
+        return param0;
+    }
+    
+    public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) {
+        return param4;
+    }
+    
+    public SingleTag SingleTag(SingleTag param2) {
+        return param2;
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/default.composite b/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/default.composite
new file mode 100644
index 0000000000..7fd5cc0d65
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/default.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="interop.client">

+    

+    <component name="InteropDocComponentService">

+        <implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>

+

+		<service name="DocTestPortType">

+	        <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->

+	        <interface.java interface="org.soapinterop.DocTestPortType"/>

+	        <binding.ws wsdlElement="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"/>

+	    </service>

+    </component>

+    

+	    

+

+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
new file mode 100644
index 0000000000..90d8a754b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
@@ -0,0 +1,195 @@
+<?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="InteropTestDoc"
+	targetNamespace="http://soapinterop.org/"
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:tns="http://soapinterop.org/"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+	<types>
+
+		<xsd:schema elementFormDefault="qualified"
+			targetNamespace="http://soapinterop.org/"
+			xmlns:interop="http://soapinterop.org/">
+
+			<xsd:element name="SingleTag">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:complexType name="SingleTag" />
+			<xsd:element name="SingleTagResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="SimpleDocument">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:complexType name="SimpleDocument">
+				<xsd:simpleContent>
+					<xsd:extension base="xsd:string" />
+				</xsd:simpleContent>
+			</xsd:complexType>
+			<xsd:element name="SimpleDocumentResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="ComplexDocument">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:complexType name="ComplexDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument" />
+					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument" />
+				</xsd:sequence>
+				<xsd:attribute name="AnAttribute" type="xsd:string" />
+			</xsd:complexType>
+			<xsd:element name="ComplexDocumentResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:complexType name="ArrayOfSimpleDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument" />
+				</xsd:sequence>
+			</xsd:complexType>
+			<xsd:complexType name="ChildDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument" />
+				</xsd:sequence>
+			</xsd:complexType>
+
+		</xsd:schema>
+
+	</types>
+
+	<message name="SingleTagSoapIn">
+		<part name="parameters" element="tns:SingleTag" />
+	</message>
+	<message name="SingleTagSoapOut">
+		<part name="outputDoc" element="tns:SingleTagResponse" />
+	</message>
+	<message name="SimpleDocumentSoapIn">
+		<part name="parameters" element="tns:SimpleDocument" />
+	</message>
+	<message name="SimpleDocumentSoapOut">
+		<part name="outputDoc" element="tns:SimpleDocumentResponse" />
+	</message>
+	<message name="ComplexDocumentSoapIn">
+		<part name="parameters" element="tns:ComplexDocument" />
+	</message>
+	<message name="ComplexDocumentSoapOut">
+		<part name="outputDoc" element="tns:ComplexDocumentResponse" />
+	</message>
+
+	<portType name="DocTestPortType">
+
+		<operation name="SingleTag">
+			<input message="tns:SingleTagSoapIn" />
+			<output message="tns:SingleTagSoapOut" />
+		</operation>
+		<operation name="SimpleDocument">
+			<input message="tns:SimpleDocumentSoapIn" />
+			<output message="tns:SimpleDocumentSoapOut" />
+		</operation>
+		<operation name="ComplexDocument">
+			<input message="tns:ComplexDocumentSoapIn" />
+			<output message="tns:ComplexDocumentSoapOut" />
+		</operation>
+
+	</portType>
+
+	<binding name="doc_test_binding" type="tns:DocTestPortType">
+		<soap:binding style="document"
+			transport="http://schemas.xmlsoap.org/soap/http" />
+
+		<operation name="SingleTag">
+			<soap:operation
+				soapAction="http://soapinterop.org/SingleTag" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="SimpleDocument">
+			<soap:operation
+				soapAction="http://soapinterop.org/SimpleDocument" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="ComplexDocument">
+			<soap:operation
+				soapAction="http://soapinterop.org/ComplexDocument" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+	</binding>
+
+	<service name="interopDocSvc">
+
+		<port name="interopDocPort" binding="tns:doc_test_binding">
+			<soap:address location="http://www.whitemesa.net/interopdoc" />
+			<!-- soap:address location="http://mssoapinterop.org/asmx/simple.asmx"/ -->
+			<!-- soap:address location="http://easysoap.sourceforge.net/cgi-bin/interopserver"/ -->
+			<!-- soap:address location="http://www.mssoapinterop.org/remoting/ServiceAllTypes.soap"/ -->
+			<http-conf:client
+				xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
+				AllowChunking="false" />
+		</port>
+
+	</service>
+
+</definitions>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/tags/java/sca/1.5.1/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
new file mode 100644
index 0000000000..dc1ba48580
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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.interop.client;
+
+import java.rmi.RemoteException;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.soapinterop.ArrayOfSimpleDocument;
+import org.soapinterop.ChildDocument;
+import org.soapinterop.ComplexDocument;
+import org.soapinterop.DocTestPortType;
+import org.soapinterop.SimpleDocument;
+import org.soapinterop.SimpleDocument1;
+import org.soapinterop.SingleTag;
+
+import commonj.sdo.helper.DataFactory;
+
+public class InteropDocClientTestCase extends TestCase {
+    private SCADomain scaDomain;
+    
+    private DataFactory dataFactory;
+
+    private DocTestPortType interopDoc;
+
+    public InteropDocClientTestCase(){};
+
+    
+    @Override
+    protected void setUp() throws Exception {
+
+        scaDomain = SCADomain.newInstance("default.composite");
+        interopDoc = locateInteropDocService();
+
+        //Get the SDO DataFactory
+        dataFactory = DataFactory.INSTANCE;
+    }
+    
+    
+    public void testSingleTag() throws RemoteException {
+
+        assertNotNull(interopDoc);
+        
+        // Create the input
+        SingleTag input = (SingleTag) dataFactory.create(SingleTag.class);
+
+        // Invoke the service
+        SingleTag output = interopDoc.SingleTag(input);
+
+        // Test the results
+        assertNotNull(output);
+
+    }
+
+    public void testSimpleDocument() throws RemoteException {
+
+        assertNotNull(interopDoc);
+        
+        // Create the input
+        SimpleDocument1 input = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
+        input.setValue("123");
+
+        // Invoke the service
+        SimpleDocument1 output = interopDoc.SimpleDocument(input);
+
+        // Test the results
+        assertNotNull(output);
+        assertEquals("123", output.getValue());
+
+    }
+
+    public void testComplexDocument() throws RemoteException {
+
+        assertNotNull(interopDoc);
+        
+        // Create the input
+        ComplexDocument input = (ComplexDocument) dataFactory.create(ComplexDocument.class);
+        input.setAnAttribute("789");
+        ChildDocument childDocument = (ChildDocument) dataFactory.create(ChildDocument.class);
+        SimpleDocument simpleDocument = (SimpleDocument) dataFactory.create(SimpleDocument.class);
+
+        SimpleDocument1 simpleDocument1 = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
+
+        simpleDocument.setSimpleDocument(simpleDocument1);
+        simpleDocument1.setValue("456");
+        ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument) dataFactory.create(ArrayOfSimpleDocument.class);
+
+        arrayOfSimpleDocument.getSimpleDocument().add(simpleDocument1);
+        childDocument.setChildSimpleDoc(arrayOfSimpleDocument);
+        input.setChild(childDocument);
+
+        // Invoke the service
+        ComplexDocument output = interopDoc.ComplexDocument(input);
+
+        // Test the results
+        assertNotNull(output);
+        assertEquals("789", output.getAnAttribute());
+        assertNotNull(output.getChild());
+        assertNotNull(output.getChild().getChildSimpleDoc());
+
+        // FIXME Add more tests of the output document
+
+    }
+
+
+    /**
+     * Locate the interop service to test
+     * 
+     * @return
+     */
+    protected DocTestPortType locateInteropDocService() {
+        String interopLocation = System.getProperty("interopLocation");
+
+        // Valid service names are:
+        // RemoteInteropDocService: the live interop Web Service
+        // LocalHostInteropDocService: the interop Web Service hosted by Tuscany on localhost
+        // LoopbackInteropDocServiceComponent: a dummy loopback service component
+
+        // To specify the service name run mvn -interopLocation="Remote"
+
+        if (interopLocation == null)
+            interopLocation = "Remote";
+
+        return scaDomain.getService(DocTestPortType.class, interopLocation + "InteropDocService");
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-round2-client/pom.xml b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/pom.xml
new file mode 100644
index 0000000000..723ea7b18d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>itest-interop-soap-round2-client</artifactId>
+	<name>Apache Tuscany SCA WS SOAP Round2 Interop Client Integration Tests</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-sca-api</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-embedded</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-implementation-java-runtime</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-interface-wsdl</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-ws-axis2</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-sdo</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-axiom</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-jetty</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sdo</groupId>
+			<artifactId>tuscany-sdo-impl</artifactId>
+			<version>1.0-incubating-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.tuscany.sdo</groupId>
+				<artifactId>tuscany-sdo-plugin</artifactId>
+				<version>1.0-incubating-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<configuration>
+							<schemaFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</schemaFile>
+							<noNotification>true</noNotification>
+							<noContainer>true</noContainer>
+							<noInterfaces>true</noInterfaces>
+							<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.5.1</version>
+				<executions>
+					<execution>
+						<configuration>
+							<wsdlFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</wsdlFile>
+							<javaPackage>org.soapinterop.wsdl.interop.test.doc.lit</javaPackage>
+						</configuration>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
new file mode 100644
index 0000000000..ca3031c646
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
@@ -0,0 +1,44 @@
+package org.apache.tuscany.test.interop.client;
+import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+/**
+ *
+ *
+ */
+public class InteropTestDocLit {
+    private WSDLInteropTestDocLitPortType interopTestDocLitPortType =null;
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+
+
+    }
+    WSDLInteropTestDocLitPortType getInteropTestDocLitPortType() {
+        return interopTestDocLitPortType;
+    }
+    void setInteropTestDocLitPortType(WSDLInteropTestDocLitPortType interopTestDocLitPortType) {
+        this.interopTestDocLitPortType = interopTestDocLitPortType;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/default.composite b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/default.composite
new file mode 100644
index 0000000000..9bde77ef37
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/default.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" 

+    name="InteropClient">

+

+	<dbsdo:import.sdo location="wsdl/interoptestdoclit.wsdl"/>

+	<dbsdo:import.sdo factory="org.soapinterop.xsd.XsdFactory"/>

+	

+    <reference name="RemoteInteropDocService">

+<!--    

+        <interface.wsdl interface="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.interface(WSDLInteropTestDocLitPortType)"/>

+        <binding.ws port="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"/>

+-->

+

+		<interface.java interface="org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType"/>

+		<binding.ws endpoint="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"

+			location="wsdl/interoptestdoclit.wsdl" />

+    </reference>

+    

+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
new file mode 100644
index 0000000000..e08039cedb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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="WSDLInteropTestDocLitService" 
+    targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+    xmlns:xsd1="http://soapinterop.org/xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <types>
+        <schema targetNamespace="http://soapinterop.org/xsd"
+            xmlns="http://www.w3.org/2001/XMLSchema" 
+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+            elementFormDefault="qualified">
+            <complexType name="ArrayOfstring_literal">
+                <sequence>
+                    <element maxOccurs="unbounded" minOccurs="1" name="string" type="xsd:string"/>
+                </sequence>
+            </complexType>
+	    <complexType name="SOAPStruct">
+                <all>
+                    <element name="varFloat" type="xsd:float"/>
+                    <element name="varInt" type="xsd:int"/>
+                    <element name="varString" type="xsd:string"/>
+                </all>
+            </complexType>
+  
+            <element name="echoStringParam" type="xsd:string"/>
+         
+            <element name="echoStringReturn" type="xsd:string"/>
+            <element name="echoStringArrayParam" type="xsd1:ArrayOfstring_literal"/>
+                
+            <element name="echoStringArrayReturn" type="xsd1:ArrayOfstring_literal"/>
+               
+            <element name="echoStructParam" type="xsd1:SOAPStruct"/>
+                   
+            <element name="echoStructReturn" type="xsd1:SOAPStruct"/>
+        </schema>
+    </types>
+    <message name="echoString">
+        <part element="xsd1:echoStringParam" name="a"/>
+    </message>
+    <message name="echoStringResponse">
+        <part element="xsd1:echoStringReturn" name="result"/>
+    </message>
+    <message name="echoStringArray">
+        <part element="xsd1:echoStringArrayParam" name="a"/>
+    </message>
+    <message name="echoStringArrayResponse">
+        <part element="xsd1:echoStringArrayReturn" name="result"/>
+    </message>
+    <message name="echoStruct">
+        <part element="xsd1:echoStructParam" name="a"/>
+    </message>
+    <message name="echoStructResponse">
+        <part element="xsd1:echoStructReturn" name="result"/>
+    </message>
+    <message name="echoVoid"/>
+    <message name="echoVoidResponse"/>
+
+    <portType name="WSDLInteropTestDocLitPortType">
+        <operation name="echoString">
+            <input message="tns:echoString" name="echoString"/>
+            <output message="tns:echoStringResponse" name="echoStringResponse"/>
+        </operation>
+        <operation name="echoStringArray">
+            <input message="tns:echoStringArray" name="echoStringArray"/>
+            <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
+        </operation>
+        <operation name="echoStruct">
+            <input message="tns:echoStruct" name="echoStruct"/>
+            <output message="tns:echoStructResponse" name="echoStructResponse"/>
+        </operation>
+        <operation name="echoVoid">
+            <input message="tns:echoVoid" name="echoVoid"/>
+            <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
+        </operation>
+    </portType>
+    <binding name="WSDLInteropTestDocLitPortBinding" 
+        type="tns:WSDLInteropTestDocLitPortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="echoString">
+            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
+            <input name="echoString">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </input>
+            <output name="echoStringResponse">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </output>
+        </operation>
+        <operation name="echoStringArray">
+            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
+            <input name="echoStringArray">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </input>
+            <output name="echoStringArrayResponse">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </output>
+        </operation>
+        <operation name="echoStruct">
+            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
+            <input name="echoStruct">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </input>
+            <output name="echoStructResponse">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </output>
+        </operation>
+        <operation name="echoVoid">
+            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
+            <input name="echoVoid">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </input>
+            <output name="echoVoidResponse">
+                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
+                    use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="WSDLInteropTestDocLitService">
+        <port binding="tns:WSDLInteropTestDocLitPortBinding" 
+            name="WSDLInteropTestDocLitPort">
+            <soap:address 
+                location="http://mssoapinterop.org/stkv3/wsdl/interopTestDocLit.wsdl"/>
+            <http-conf:client xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
+                AllowChunking="false"/>
+        </port>
+    </service>
+</definitions>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
new file mode 100644
index 0000000000..bb379c89cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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.interop.client;
+
+import java.rmi.RemoteException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.tuscany.test.SCATestCase;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
+import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
+import org.soapinterop.xsd.ArrayOfstring_literal;
+import org.soapinterop.xsd.SOAPStruct;
+import org.soapinterop.xsd.XsdPackage;
+
+import commonj.sdo.helper.DataFactory;
+
+/**
+ * This test case is part of the tuscany interop tests. This is a reduced version of the SOAPBuilders InteropTest test, document/literal mode. This
+ * version has operations such as echoString, echoArrayOfString and echoStruct.
+ * 
+ * <p>
+ * The WSDL for the external service used in this test case can be downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl.
+ * This is part of the WSDL interop test from Microsoft and more details aobout this test case are found at
+ * http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm
+ */
+public class InteropTestDocLitTestCase extends TestCase {
+
+    private WSDLInteropTestDocLitPortType doc = null;
+
+    private DataFactory dataFactory;
+
+    
+    protected void setUp() throws Exception {
+        setApplicationSCDL(InteropTestDocLit.class, "META-INF/sca/default.scdl");
+        addExtension("test.extensions", InteropTestDocLit.class.getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl"));
+
+         super.setUp();
+
+        // Get the SDO DataFactory
+        dataFactory = DataFactory.INSTANCE;
+
+        // Locate the service to test
+        doc = locateInteropDocService();
+    }
+
+    /**
+     * Locate the interop service to test
+     * 
+     * @return
+     */
+    protected WSDLInteropTestDocLitPortType locateInteropDocService() {
+
+        CompositeContext compositeContext = CurrentCompositeContext.getContext();
+        return compositeContext.locateService(WSDLInteropTestDocLitPortType.class, "RemoteInteropDocService");
+
+    }
+
+    /**
+     * test echo void
+     * 
+     * @throws RemoteException
+     */
+    public void testEchoVoid() throws RemoteException {
+        doc.echoVoid();
+        assertTrue(true);
+    }
+
+    /**
+     * test echo string
+     * 
+     * @throws RemoteException
+     */
+    public void testEchoString() throws RemoteException {
+        String input = "a test string";
+        String output = doc.echoString(input);
+        assertEquals(input, output);
+    }
+
+    /**
+     * test echo string
+     * 
+     * @throws RemoteException
+     */
+    public void testEchoStringArray() throws RemoteException {
+
+        ArrayOfstring_literal input = (ArrayOfstring_literal) dataFactory.create(ArrayOfstring_literal.class);
+        List inStrings = Arrays.asList(new String[] { "petra", "sue" });
+        input.set(XsdPackage.ARRAY_OFSTRING_LITERAL__STRING, inStrings);
+
+        ArrayOfstring_literal output = doc.echoStringArray(input);
+
+        List outStrings = output.getString();
+        assertNotNull(outStrings);
+        assertEquals(2, outStrings.size());
+        assertEquals("petra", outStrings.get(0));
+        assertEquals("sue", outStrings.get(1));
+    }
+
+    /**
+     * test echo struct
+     * 
+     * @throws RemoteException
+     */
+    public void testEchoStruct() throws RemoteException {
+        SOAPStruct input = (SOAPStruct) dataFactory.create(SOAPStruct.class);
+        input.setVarInt(200);
+        input.setVarFloat(.002f);
+        input.setVarString("Hello");
+        SOAPStruct output = doc.echoStruct(input);
+        assertEquals(input.getVarInt(), output.getVarInt());
+        assertEquals(input.getVarFloat(), output.getVarFloat());
+        assertEquals(input.getVarString(), output.getVarString());
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-service/pom.xml b/tags/java/sca/1.5.1/itest/interop-soap-service/pom.xml
new file mode 100644
index 0000000000..81de828846
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-service/pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-interop-soap-service</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA WS Interop Service Integration Tests</name>
+
+    <dependencies>
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+
+<dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>1.2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>1.2.5</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+    </dependencies>
+      
+    <build>
+        <plugins>
+            <plugin>
+		<groupId>org.apache.tuscany.sdo</groupId>
+		<artifactId>tuscany-sdo-plugin</artifactId>
+		<version>1.0-incubating-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
+                            <noNotification>true</noNotification>
+                            <noContainer>true</noContainer>
+                            <noInterfaces>true</noInterfaces>
+                            <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.5.1</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <wsdlFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
+                            <javaPackage>org.soapinterop</javaPackage>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>     
+   </build>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
new file mode 100644
index 0000000000..c34941f43e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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.interop.server;
+
+import java.rmi.RemoteException;
+
+import org.osoa.sca.annotations.Service;
+import org.soapinterop.ComplexDocument;
+import org.soapinterop.DocTestPortType;
+import org.soapinterop.SimpleDocument1;
+import org.soapinterop.SingleTag;
+
+/**
+ * This class implements the HelloWorld service component.
+ */
+@Service(DocTestPortType.class)
+public class InteropDocServiceComponentImpl implements DocTestPortType {
+
+    public ComplexDocument ComplexDocument(ComplexDocument param2) throws RemoteException {
+        return param2;
+    }
+
+    public SimpleDocument1 SimpleDocument(SimpleDocument1 param0) throws RemoteException {
+        return param0;
+    }
+
+    public SingleTag SingleTag(SingleTag param4) throws RemoteException {
+        return param4;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
new file mode 100644
index 0000000000..820c26ca34
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
@@ -0,0 +1,180 @@
+<?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="InteropTestDoc" targetNamespace="http://soapinterop.org/"
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:tns="http://soapinterop.org/"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+	<types>
+
+		<xsd:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/" xmlns:interop="http://soapinterop.org/">
+
+			<xsd:element name="SingleTag">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+
+			<xsd:complexType name="SingleTag"/>
+			<xsd:element name="SingleTagResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="SimpleDocument">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:complexType name="SimpleDocument">
+				<xsd:simpleContent>
+					<xsd:extension base="xsd:string"/>
+				</xsd:simpleContent>
+			</xsd:complexType>
+			<xsd:element name="SimpleDocumentResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="ComplexDocument">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:complexType name="ComplexDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument"/>
+					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument"/>
+				</xsd:sequence>
+				<xsd:attribute name="AnAttribute" type="xsd:string"/>
+			</xsd:complexType>
+			<xsd:complexType name="ArrayOfSimpleDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument"/>
+				</xsd:sequence>
+			</xsd:complexType>
+			<xsd:complexType name="ChildDocument">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument"/>
+				</xsd:sequence>
+			</xsd:complexType>
+			<xsd:element name="ComplexDocumentResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+
+		</xsd:schema>
+
+	</types>
+
+	<message name="SingleTagSoapIn">
+		<part name="parameters" element="tns:SingleTag"/>
+	</message>
+	<message name="SingleTagSoapOut">
+		<part name="outputDoc" element="tns:SingleTagResponse"/>
+	</message>
+	<message name="SimpleDocumentSoapIn">
+		<part name="parameters" element="tns:SimpleDocument"/>
+	</message>
+	<message name="SimpleDocumentSoapOut">
+		<part name="outputDoc" element="tns:SimpleDocumentResponse"/>
+	</message>
+	<message name="ComplexDocumentSoapIn">
+		<part name="parameters" element="tns:ComplexDocument"/>
+	</message>
+	<message name="ComplexDocumentSoapOut">
+		<part name="outputDoc" element="tns:ComplexDocumentResponse"/>
+	</message>
+
+	<portType name="DocTestPortType">
+
+		<operation name="SingleTag">
+			<input message="tns:SingleTagSoapIn"/>
+			<output message="tns:SingleTagSoapOut"/>
+		</operation>
+		<operation name="SimpleDocument">
+			<input message="tns:SimpleDocumentSoapIn"/>
+			<output message="tns:SimpleDocumentSoapOut"/>
+		</operation>
+		<operation name="ComplexDocument">
+			<input message="tns:ComplexDocumentSoapIn"/>
+			<output message="tns:ComplexDocumentSoapOut"/>
+		</operation>
+
+	</portType>
+
+	<binding name="doc_test_binding" type="tns:DocTestPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+		<operation name="SingleTag">
+			<soap:operation soapAction="http://soapinterop.org/SingleTag"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation> 
+
+		<operation name="SimpleDocument">
+			<soap:operation soapAction="http://soapinterop.org/SimpleDocument"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation> 
+
+		<operation name="ComplexDocument">
+			<soap:operation soapAction="http://soapinterop.org/ComplexDocument"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation> 
+	</binding>
+
+	<service name="interopDocSvc">
+
+  		<port name="interopDocPort" binding="tns:doc_test_binding">
+    			<soap:address location="http://www.whitemesa.net/interopdoc"/>
+  		</port>
+
+	</service>
+
+</definitions>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
new file mode 100644
index 0000000000..3fbc73616e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="interop.server">
+
+    <import.sdo location="wsdl/interopdoc.wsdl"/>
+    <!-- import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/ -->
+		
+    <service name="InteropDocService">
+       <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
+       <interface.java interface="org.soapinterop.DocTestPortType"/>
+                
+       <binding.ws endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
+          conformanceURIs="http://ws-i.org/profiles/basic/1.1"
+          location="wsdl/interopdoc.wsdl"
+         />
+        
+        <reference>InteropDocServiceComponent/DocTestPortType</reference>
+    </service>
+
+    <component name="InteropDocServiceComponent">
+        <implementation.java class="org.apache.tuscany.test.interop.server.InteropDocServiceComponentImpl"/>
+    </component>
+    
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..8cf95fb789
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+  <display-name>Tuscany Interop Test Server</display-name>
+
+  <context-param>
+     <param-name>systemScdlPath</param-name>
+     <param-value>/META-INF/sca/webapp.system.scdl</param-value>
+  </context-param>
+
+  <context-param>
+     <param-name>applicationScdlPath</param-name>
+     <param-value>/META-INF/sca/default.scdl</param-value>
+  </context-param>
+
+  <listener>
+     <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
+  </listener>
+
+  <servlet>
+     <servlet-name>TuscanyServlet</servlet-name>
+     <display-name>Tuscany Servlet</display-name>
+     <servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
+  </servlet>
+  
+  <servlet-mapping>
+     <servlet-name>TuscanyServlet</servlet-name>
+     <url-pattern>/services/*</url-pattern>
+  </servlet-mapping>
+
+</web-app>
diff --git a/tags/java/sca/1.5.1/itest/interop-soap-service/t.bat b/tags/java/sca/1.5.1/itest/interop-soap-service/t.bat
new file mode 100755
index 0000000000..0f83dedc37
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/interop-soap-service/t.bat
@@ -0,0 +1,34 @@
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership.  The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License.  You may obtain a copy of the License at
+ #
+ #   http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing,
+ # software distributed under the License is distributed on an
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ # KIND, either express or implied.  See the License for the
+ # specific language governing permissions and limitations
+ # under the License.
+
+
+@echo off
+pushd target
+jar -xf  ..\apache-tomcat-5.5.17.zip 
+popd
+copy target\sample-helloworldws-1.0-SNAPSHOT.war target\apache-tomcat-5.5.17\webapps
+rem pushd target\apache-tomcat-5.5.17\webapps
+rem md sample-helloworldws-1.0-SNAPSHOT 
+rem cd sample-helloworldws-1.0-SNAPSHOT
+rem jar -xf ..\sample-helloworldws-1.0-SNAPSHOT.war
+pushd target\apache-tomcat-5.5.17\shared
+rem jar -xf  "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
+jar -xf  "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
+popd
+rem hack
+mkdir target\apache-tomcat-5.5.17\shared\extension
+copy target\apache-tomcat-5.5.17\shared\lib\axis2-1.0-SNAPSHOT.jar target\apache-tomcat-5.5.17\shared\extension 
diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/pom.xml b/tags/java/sca/1.5.1/itest/java-init-exceptions/pom.xml
new file mode 100644
index 0000000000..b247d9307d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-java-init-exceptions</artifactId>
+    <name>Apache Tuscany SCA iTest Java Init Exceptions</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
new file mode 100644
index 0000000000..a91904e9a8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
@@ -0,0 +1,49 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.Init;

+

+public class ConstructorException implements Service {

+

+    public static boolean initRun;

+    public static boolean destroyRun;

+    public static boolean doitRun;

+    

+    public ConstructorException() {

+        throw new RuntimeException();

+    }

+    

+    public void doit() {

+        doitRun = true;

+    }

+    

+    @Init

+    public void init() {

+       initRun = true;   

+    }

+    

+    @Destroy

+    public void destroy() {

+        destroyRun = true;   

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
new file mode 100644
index 0000000000..73017ec72b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
@@ -0,0 +1,57 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.Init;

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

+

+@Scope("COMPOSITE")

+public class InitCompositeScopeException implements Service {

+

+    public static boolean initRun;

+    public static boolean destroyRun;

+    public static boolean doitRun;

+    public static int count = 0;

+    

+    public void doit() {

+        doitRun = true;

+        if (!initRun) {

+            throw new RuntimeException("initRun false");

+        }

+        if (destroyRun) {

+            throw new RuntimeException("destroyRun true");

+        }

+    }

+    

+    @Init

+    public void init() {

+        initRun = true;

+        if (count++ < 1) {

+            throw new RuntimeException("bang");

+        }

+    }

+    

+    @Destroy

+    public void destroy() {

+        destroyRun = true;   

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
new file mode 100644
index 0000000000..b29f52645e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
@@ -0,0 +1,57 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.Init;

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

+

+@Scope("REQUEST")

+public class InitRequestScopeException implements Service {

+

+    public static boolean initRun;

+    public static boolean destroyRun;

+    public static boolean doitRun;

+    public static int count = 0;

+    

+    public void doit() {

+        doitRun = true;

+        if (!initRun) {

+            throw new RuntimeException("initRun false");

+        }

+        if (destroyRun) {

+            throw new RuntimeException("destroyRun true");

+        }

+    }

+    

+    @Init

+    public void init() {

+        initRun = true;

+        if (count++ < 1) {

+            throw new RuntimeException("bang");

+        }

+    }

+    

+    @Destroy

+    public void destroy() {

+        destroyRun = true;   

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
new file mode 100644
index 0000000000..5a898a501d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
@@ -0,0 +1,57 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.Init;

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

+

+@Scope("STATELESS")

+public class InitStatelessScopeException implements Service {

+

+    public static boolean initRun;

+    public static boolean destroyRun;

+    public static boolean doitRun;

+    public static int count = 0;

+    

+    public void doit() {

+        doitRun = true;

+        if (!initRun) {

+            throw new RuntimeException("initRun false");

+        }

+        if (destroyRun) {

+            throw new RuntimeException("destroyRun true");

+        }

+    }

+    

+    @Init

+    public void init() {

+        initRun = true;

+        if (count++ < 1) {

+            throw new RuntimeException("bang");

+        }

+    }

+    

+    @Destroy

+    public void destroy() {

+        destroyRun = true;   

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/OkImpl.java b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
new file mode 100644
index 0000000000..134bbba0d3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
@@ -0,0 +1,52 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.Init;

+

+public class OkImpl implements Service {

+

+    public static boolean initRun;

+    public static boolean destroyRun;

+    

+    public OkImpl() {

+    }

+    

+    public void doit() {

+        if (!initRun) {

+            throw new RuntimeException("initRun false");

+        }

+        if (destroyRun) {

+            throw new RuntimeException("destroyRun true");

+        }

+    }

+    

+    @Init

+    public void init() {

+       initRun = true;   

+    }

+    

+    @Destroy

+    public void destroy() {

+        destroyRun = true;   

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/Service.java b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/Service.java
new file mode 100644
index 0000000000..f6f292c4c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/Service.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+public interface Service {

+    

+    void doit();

+    

+}

diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/resources/test.composite b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/resources/test.composite
new file mode 100644
index 0000000000..3a1a897def
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/resources/test.composite
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"

+           xmlns:itest="http://itest"

+           name="Test">

+

+    <component name="OkService">

+        <implementation.java class="itest.OkImpl"/>

+    </component>       

+

+    <component name="ConstructorException">

+        <implementation.java class="itest.ConstructorException"/>

+    </component>       

+

+    <component name="InitCompositeScopeException">

+        <implementation.java class="itest.InitCompositeScopeException"/>

+    </component>       

+    <component name="InitRequestScopeException">

+        <implementation.java class="itest.InitRequestScopeException"/>

+    </component>       

+    <component name="InitStatelessScopeException">

+        <implementation.java class="itest.InitStatelessScopeException"/>

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
new file mode 100644
index 0000000000..f6a1da5b79
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
@@ -0,0 +1,150 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package itest;

+

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertTrue;

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

+

+/**

+ */

+public class InitTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "test.composite");

+    }

+

+    @Test

+    public void testOk() throws Exception {

+        Service client1 = scaDomain.getService(Service.class, "OkService");

+        client1.doit();

+        assertTrue(OkImpl.initRun);

+        assertTrue(OkImpl.destroyRun); // its stateless so destory is called after every service invocations

+    }

+

+    @Test

+    public void testConstructorException() throws Exception {

+        Service client1 = scaDomain.getService(Service.class, "ConstructorException");

+        try {

+            client1.doit();

+            fail();

+        } catch (RuntimeException e) {

+            // expected

+        }

+        assertFalse(ConstructorException.initRun);

+        assertFalse(ConstructorException.doitRun);

+        assertFalse(ConstructorException.destroyRun);

+    }

+

+    @Test

+    public void testInitCompositeScopeException() throws Exception {

+        Service client1 = scaDomain.getService(Service.class, "InitCompositeScopeException");

+        try {

+            client1.doit();

+            fail();

+        } catch (RuntimeException e) {

+            // expected

+        }

+        assertTrue(InitCompositeScopeException.initRun);

+        assertFalse(InitCompositeScopeException.doitRun);

+        assertTrue(InitCompositeScopeException.destroyRun);

+

+        // reset and try again to verify init init still gets run again

+        InitCompositeScopeException.initRun = false;    

+        InitCompositeScopeException.doitRun = false;    

+        InitCompositeScopeException.destroyRun = false;    

+

+        client1.doit();

+

+        assertTrue(InitCompositeScopeException.initRun);

+        assertTrue(InitCompositeScopeException.doitRun);

+        scaDomain.close();

+        scaDomain = null;

+        assertTrue(InitCompositeScopeException.destroyRun);

+    }

+

+    @Test

+    public void testInitStatelessScopeException() throws Exception {

+        Service client1 = scaDomain.getService(Service.class, "InitStatelessScopeException");

+        try {

+            client1.doit();

+            fail();

+        } catch (RuntimeException e) {

+            // expected

+        }

+        assertTrue(InitStatelessScopeException.initRun);

+        assertFalse(InitStatelessScopeException.doitRun);

+        assertTrue(InitStatelessScopeException.destroyRun);

+

+        // reset and try again to verify init init still gets run again

+        InitStatelessScopeException.initRun = false;    

+        InitStatelessScopeException.doitRun = false;    

+        InitStatelessScopeException.destroyRun = false;    

+

+        client1.doit();

+

+        assertTrue(InitStatelessScopeException.initRun);

+        assertTrue(InitStatelessScopeException.doitRun);

+        scaDomain.close();

+        scaDomain = null;

+        assertTrue(InitStatelessScopeException.destroyRun);

+    }

+

+    @Test

+    public void testInitRequestScopeException() throws Exception {

+        Service client1 = scaDomain.getService(Service.class, "InitRequestScopeException");

+        try {

+            client1.doit();

+            fail();

+        } catch (RuntimeException e) {

+            // expected

+        }

+        assertTrue(InitRequestScopeException.initRun);

+        assertFalse(InitRequestScopeException.doitRun);

+        assertTrue(InitRequestScopeException.destroyRun);

+

+        // reset and try again to verify init init still gets run again

+        InitRequestScopeException.initRun = false;    

+        InitRequestScopeException.doitRun = false;    

+        InitRequestScopeException.destroyRun = false;    

+

+        client1.doit();

+

+        assertTrue(InitRequestScopeException.initRun);

+        assertTrue(InitRequestScopeException.doitRun);

+        scaDomain.close();

+        scaDomain = null;

+        assertTrue(InitRequestScopeException.destroyRun);

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jaxws/pom.xml b/tags/java/sca/1.5.1/itest/jaxws/pom.xml
new file mode 100644
index 0000000000..b39d460c60
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jaxws/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jaxws</artifactId>
+    <name>Apache Tuscany SCA iTest JAXWS generated artifacts</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>    
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>            
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+       
+    </dependencies>
+    
+    <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-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.12</version>
+                <executions>
+                    <execution>
+                        <id>payment</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>com.tuscanyscatours.payment</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>Payment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/tags/java/sca/1.5.1/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
new file mode 100644
index 0000000000..3b557d693a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.tuscanyscatours.payment.impl;

+

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

+

+import com.tuscanyscatours.payment.Payment;

+

+/**

+ * The payment implementation

+ */

+@Service(Payment.class)

+public class PaymentImpl implements Payment {

+

+    public String makePaymentMember(String customerId, float amount) {

+        return "Made payment of " + amount + " to customer " + customerId;

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jaxws/src/main/resources/Payment.wsdl b/tags/java/sca/1.5.1/itest/jaxws/src/main/resources/Payment.wsdl
new file mode 100644
index 0000000000..3885764899
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jaxws/src/main/resources/Payment.wsdl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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="Payment" 

+                  targetNamespace="http://www.tuscanyscatours.com/Payment/"

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

+                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 

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

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

+                    targetNamespace="http://www.tuscanyscatours.com/Payment/"

+                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">

+

+            <xsd:complexType name="MakePaymentMemberType">

+                <xsd:sequence>

+                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>

+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>                    

+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>

+      

+            <xsd:complexType name="MakePaymentMemberResponseType">

+                <xsd:sequence>

+                    <xsd:element name="Status" type="xsd:string"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>

+            

+        </xsd:schema>

+    </wsdl:types>

+    <wsdl:message name="MakePaymentMemberRequest">

+        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="MakePaymentMemberResponse">

+        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>

+    </wsdl:message>

+    <wsdl:portType name="Payment">

+        <wsdl:operation name="makePaymentMember">

+            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>

+            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>

+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="PaymentBinding" type="tns:Payment">

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

+        <wsdl:operation name="makePaymentMember">

+            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />

+            <wsdl:input>

+                <soap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal" />

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="PaymentService">

+        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">

+            <soap:address location="http://localhost:8083/Payment" />

+        </wsdl:port>

+    </wsdl:service>

+    

+   <plnk:partnerLinkType name="PaymentLinkType">

+       <plnk:role name="forward" portType="tns:Payment"/>

+   </plnk:partnerLinkType>

+</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jaxws/src/main/resources/payment.composite b/tags/java/sca/1.5.1/itest/jaxws/src/main/resources/payment.composite
new file mode 100644
index 0000000000..77a956a3c6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jaxws/src/main/resources/payment.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://tuscanyscatours.com/"

+           name="payment">

+           

+    <component name="Payment">

+        <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />

+        <service name="Payment">

+            <!-- use interface.wsdl to work around TUSCANY-3267 -->

+            <!--interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" /-->

+            <binding.ws uri="http://localhost:8081/Payment"/>

+        </service>

+    </component>

+    

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java b/tags/java/sca/1.5.1/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java
new file mode 100644
index 0000000000..610e20b456
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java
@@ -0,0 +1,55 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package scatours.payment;

+

+import com.tuscanyscatours.payment.Payment;

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

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+public class PaymentTestCase {

+    private static SCANode node;

+

+    @BeforeClass

+    public static void setUpBeforeClass() throws Exception {

+        node = SCANodeFactory.newInstance().createSCANode("payment.composite", 

+                new SCAContribution("payment", "./target/classes"));

+        node.start();

+    }

+    

+    @Test

+    public void testPayment() {

+        SCAClient client = (SCAClient) node;

+        Payment payment = client.getService(Payment.class, "Payment");

+        System.out.println(payment.makePaymentMember("c-0", 100.00f));

+    }

+    

+    @AfterClass

+    public static void tearDownAfterClass() throws Exception {

+        if (node != null) {

+            node.stop();

+            node = null;

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-args/pom.xml b/tags/java/sca/1.5.1/itest/jms-args/pom.xml
new file mode 100644
index 0000000000..d75fdf9b69
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-args/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-args</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Args</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+              a temporary queue name -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.1.0</version>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
new file mode 100644
index 0000000000..51ce5f4f24
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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(MyService.class)

+public class ClientImpl implements MyService {

+

+    private MyService serviceA;

+

+    @Reference

+    public void setServiceA(MyService service) {

+        this.serviceA = service;

+    }

+

+    public void sayHello(String name, String n2) {

+        serviceA.sayHello(name, n2);

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
new file mode 100644
index 0000000000..487e5f2cbb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 MyService {

+    

+    @OneWay

+    void sayHello(String name, String n2);

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
new file mode 100644
index 0000000000..18324d5d1d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 ServiceImpl implements MyService {

+

+    public static Object lock = new Object();

+    public static String name;

+    public static String n2;

+    

+    public void sayHello(String name, String n2) {

+        System.out.println("SelectorServiceImpl1 " + name + n2);

+        ServiceImpl.name = name;

+        ServiceImpl.n2 = n2;

+        synchronized (ServiceImpl.lock) {

+            ServiceImpl.lock.notify();

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-args/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-args/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..bb431a592b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-args/src/main/resources/jndi.properties
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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&broker.useJmx=false

+

+# use the following property to specify the JNDI name the connection factory

+# should appear as. 

+#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

+connectionFactoryNames = ConnectionFactory, ConnectionFactory2

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+

+# register some topics in JNDI using the form

+# topic.[jndiName] = [physicalName]

+#topic.MyTopic = example.MyTopic

+topic.ServiceTopic = ServiceTopic

+

+# END SNIPPET: jndi

diff --git a/tags/java/sca/1.5.1/itest/jms-args/src/main/resources/selectors/selectors.composite b/tags/java/sca/1.5.1/itest/jms-args/src/main/resources/selectors/selectors.composite
new file mode 100644
index 0000000000..74c352934f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-args/src/main/resources/selectors/selectors.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           xmlns:itest="http://jms"

+           name="DefinitionsTests">

+

+    <component name="Client1">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

+        <reference name="serviceA">

+           <binding.jms uri="jms:MyService" />

+        </reference>

+    </component>

+

+    <component name="Service1">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>

+        <service name="MyService">

+            <binding.jms />

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/tags/java/sca/1.5.1/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
new file mode 100644
index 0000000000..228366d596
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+/**

+ */

+public class ArgsTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite");

+    }

+

+    @Test

+    public void testSayHello() throws Exception {

+        MyService client1 = scaDomain.getService(MyService.class, "Client1");

+

+        client1.sayHello("petra", "beate");

+

+        synchronized(ServiceImpl.lock) {

+            if (ServiceImpl.name == null) {

+                ServiceImpl.lock.wait(5000);

+            }

+        }

+

+        assertEquals("petra", ServiceImpl.name);

+        assertEquals("beate", ServiceImpl.n2);

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/pom.xml b/tags/java/sca/1.5.1/itest/jms-callbacks/pom.xml
new file mode 100644
index 0000000000..8393432b48
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-callbacks</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Tests For Callbacks</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+              a temporary queue name -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.1.0</version>
+            <scope>test</scope>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
new file mode 100644
index 0000000000..d4cd5df431
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+

+/**

+ * The client interface

+ */

+public interface JMSClient {

+

+    void aClientMethod();

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
new file mode 100644
index 0000000000..9d75685a8a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+/**

+ * Remote Web service client with callback interface

+ */

+@Service(JMSClient.class)

+public class JMSClientImpl implements JMSClient, JMSServiceCallback {

+

+    @Reference protected JMSService myService;

+

+    public static String result;

+    public static Object lock = new Object();

+	

+    public void aClientMethod() {

+        System.out.println("aClientMethod " + this + " on thread " + Thread.currentThread());

+        myService.someMethod(" -> someMethod ");  // calls the server

+        System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());

+    }

+

+    public void receiveResult(String result) {

+        System.out.println("receiveResult " + this + " '" + result + "' on thread " + Thread.currentThread());

+        JMSClientImpl.result = result;

+        

+        // wakeup the waiting testcase

+        synchronized (lock) {

+            lock.notifyAll();

+	}

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
new file mode 100644
index 0000000000..9c2c657b55
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
@@ -0,0 +1,34 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.Callback;

+import org.osoa.sca.annotations.OneWay;

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

+

+/**

+ * The remote service that will be invoked by the client

+ */

+@Remotable

+@Callback(JMSServiceCallback.class)

+public interface JMSService {

+

+    @OneWay

+    void someMethod(String arg);

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
new file mode 100644
index 0000000000..5697d819c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+/**

+ * The callback interface for {@link JMSService}.

+ */

+@Remotable

+public interface JMSServiceCallback {

+

+    @OneWay

+    void receiveResult(String result);

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
new file mode 100644
index 0000000000..b15b40c8a6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
@@ -0,0 +1,47 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.Callback;

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

+

+/**

+ * This class implements MyService and uses a callback.

+ */

+@Service(JMSService.class)

+public class JMSServiceImpl implements JMSService {

+

+    private JMSServiceCallback myServiceCallback;

+    

+    @Callback

+    public void setMyServiceCallback(JMSServiceCallback myServiceCallback) {

+        System.out.println("setMyServiceCallback on thread " + Thread.currentThread() + " cb: " + myServiceCallback);

+        this.myServiceCallback = myServiceCallback;

+    }

+    

+    public void someMethod(String arg) {

+        System.out.println("someMethod '" + arg + "' on thread " + Thread.currentThread());

+        try {

+            myServiceCallback.receiveResult(arg + " -> receiveResult ");

+        } catch(Exception e) {

+            System.out.println("RuntimeException invoking receiveResult: " + e.toString());

+            e.printStackTrace();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..608fe747f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/jndi.properties
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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&broker.useJmx=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.ServiceQueue = ServiceQueue

+queue.CallbackQueue = CallbackQueue

+

+# 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.5.1/itest/jms-callbacks/src/main/resources/simple/client.composite b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/simple/client.composite
new file mode 100644
index 0000000000..93d8acb65b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/simple/client.composite
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           name="CallbackClientComposite">

+

+    <component name="ClientComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />

+        <reference name="myService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms uri="jms:CallbackQueue"/>

+            </callback>

+        </reference>

+    </component>

+

+    <component name="ServiceComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />

+        <service name="JMSService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms uri="jms:CallbackQueue"/>

+            </callback>

+        </service>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/simple/tempq.composite
new file mode 100644
index 0000000000..636e951d03
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/simple/tempq.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           name="CallbackClientComposite">

+

+<!-- 

+

+The client component does not define the callback destination so a temporary queue should be used

+

+-->

+

+    <component name="ClientComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />

+        <reference name="myService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms />

+            </callback>

+        </reference>

+    </component>

+

+    <component name="ServiceComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />

+        <service name="JMSService">

+            <binding.jms uri="jms:ServiceQueue"/>

+            <callback>

+                <binding.jms />

+            </callback>

+        </service>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
new file mode 100644
index 0000000000..cb9acb1bc1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
@@ -0,0 +1,60 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 CallbackTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");

+    }

+

+    @Test

+    public void testHelloWorldCreate() throws Exception {

+        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

+

+        client.aClientMethod();

+

+        // wait for up to 5 seconds but should wake up as soon as done

+        synchronized(JMSClientImpl.lock) {

+        	JMSClientImpl.lock.wait(5000);

+        }

+

+        assertEquals(" -> someMethod  -> receiveResult ", JMSClientImpl.result);

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
new file mode 100644
index 0000000000..9f450574df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
@@ -0,0 +1,63 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.net.MalformedURLException;

+

+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 TempCallbackQTestCase {

+

+    private SCADomain scaDomain;

+

+    @Before

+    public void init() throws MalformedURLException {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/tempq.composite");

+    }

+

+    @Test

+    public void testHelloWorldCreate() throws Exception {

+        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

+

+        client.aClientMethod();

+

+        // wait for up to 5 seconds but should wake up as soon as done

+        synchronized (JMSClientImpl.lock) {

+            JMSClientImpl.lock.wait(5000);

+        }

+

+        assertEquals(" -> someMethod  -> receiveResult ", JMSClientImpl.result);

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-definitions/pom.xml b/tags/java/sca/1.5.1/itest/jms-definitions/pom.xml
new file mode 100644
index 0000000000..4e1af223c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-definitions</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Tests For Properties</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+              a temporary queue name -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.1.0</version>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
new file mode 100644
index 0000000000..4d00d2df0d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
new file mode 100644
index 0000000000..377f227ceb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
new file mode 100644
index 0000000000..6b763874df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
@@ -0,0 +1,34 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 lock = new Object();

+    public static String name;

+    

+    public void sayHello(String name) {

+        OneWayServiceImpl.name = name;

+        synchronized (OneWayServiceImpl.lock) {

+            OneWayServiceImpl.lock.notify();

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..07b9f4aaa8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions.xml
@@ -0,0 +1,28 @@
+<?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://jms" >

+

+    <binding.jms name="TestService" >

+        <destination name="MyServiceQueue" create="never"/>

+        <connectionFactory name="MyConnectionFactory"/>

+    </binding.jms>

+

+ </definitions>

diff --git a/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions/definitions.composite
new file mode 100644
index 0000000000..99e4e5016e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions/definitions.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           xmlns:itest="http://jms"

+           name="DefinitionsTests">

+

+    <component name="OneWayClient">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>

+        <reference name="serviceA">

+           <binding.jms requestConnection="itest:TestService" />

+        </reference>

+    </component>

+

+    <component name="OneWayService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

+        <service name="OneWayService">

+            <binding.jms requestConnection="itest:TestService" />

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..f7555e0beb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/jndi.properties
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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&broker.useJmx=false

+

+# use the following property to specify the JNDI name the connection factory

+# should appear as. 

+#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

+connectionFactoryNames = MyConnectionFactory

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+queue.MyServiceQueue= MyServiceQueue

+

+# 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.5.1/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/tags/java/sca/1.5.1/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
new file mode 100644
index 0000000000..9de3bff7c3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+/**

+ */

+public class DefinitionsTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "definitions/definitions.composite");

+    }

+

+    @Test

+    public void testSayHello() throws Exception {

+        OneWayService client = scaDomain.getService(OneWayService.class, "OneWayClient");

+

+        client.sayHello("petra");

+

+        // wait for up to 5 seconds but should wake up as soon as done

+        synchronized(OneWayServiceImpl.lock) {

+            if (OneWayServiceImpl.name == null) {

+                OneWayServiceImpl.lock.wait(5000);

+            }

+        }

+

+        assertEquals("petra", OneWayServiceImpl.name);

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-format/pom.xml b/tags/java/sca/1.5.1/itest/jms-format/pom.xml
new file mode 100644
index 0000000000..b1cffdc3c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/pom.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-format</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>         
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
new file mode 100644
index 0000000000..e8a7102afd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytes.helloworld;
+
+public class CheckedException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public CheckedException(String s) {
+        super(s);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
new file mode 100644
index 0000000000..b1f62c1422
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytes.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String message);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..efed4842ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytes.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldServiceReference helloWorldService1;
+    
+    public String getGreetings(String name){     
+        byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
+        String stringValue = new String(bytesValue);
+        
+        try {
+            helloWorldService1.throwChecked(name.getBytes());
+        } catch (Exception e) {
+            // Test to see what happens if we talk to a service
+            // that declares a checked exception through an
+            // interface that doesn't
+            stringValue += " " + e.getCause().getMessage();
+        }
+        
+        try {
+            helloWorldService1.throwUnChecked(name.getBytes());
+        } catch (Exception e) {
+            stringValue += " " + e.getMessage();
+        }
+        return stringValue; 
+    }    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..5ae7032993
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytes.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+    public byte[] getByteArrayGreetings(byte[] msg);
+    
+    public void throwChecked(byte[] msg) throws CheckedException;
+    public void throwUnChecked(byte[] msg);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..803be4cbe6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytes.helloworld;
+
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+    
+    public byte[] getByteArrayGreetings(byte[] msg){
+         
+        String name = new String(msg);
+        name =  "Hello " + name;
+        
+        return name.getBytes();
+    }
+
+    public void throwChecked(byte[] msg) throws CheckedException {
+        throw new CheckedException("foo");
+    }
+
+    public void throwUnChecked(byte[] msg) {
+        throw new RuntimeException("bla");
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
new file mode 100644
index 0000000000..5fad413ebe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytes.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldServiceReference {
+
+    public byte[] getByteArrayGreetings(byte[] msg);
+    
+    public void throwChecked(byte[] msg) ;
+    public void throwUnChecked(byte[] msg);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
new file mode 100644
index 0000000000..251fa58cfe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytesxml.helloworld;
+
+public class CheckedException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public CheckedException(String s) {
+        super(s);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
new file mode 100644
index 0000000000..dd58c9554e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytesxml.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String message);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..02a3d944f7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytesxml.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldService helloWorldService1;
+    
+    public String getGreetings(String name){     
+        byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
+        String stringValue = new String(bytesValue);  
+        
+        try {
+            helloWorldService1.throwChecked(name.getBytes());
+        } catch (CheckedException e) {
+            stringValue += " " + e.getMessage();
+        }
+        
+        try {
+            helloWorldService1.throwUnChecked(name.getBytes());
+        } catch (Exception e) {
+            stringValue += " " + e.getMessage();
+        }
+        return stringValue;          
+    }    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..9c2198e6ca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytesxml.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+    public byte[] getByteArrayGreetings(byte[] msg);
+    
+    public void throwChecked(byte[] msg) throws CheckedException;
+    public void throwUnChecked(byte[] msg);
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..75e07564ce
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsbytesxml.helloworld;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+    
+    public byte[] getByteArrayGreetings(byte[] msg){
+         
+        String name = new String(msg);
+        name =  "Hello " + name;
+        
+        return name.getBytes();
+    }
+
+    public void throwChecked(byte[] msg) throws CheckedException {
+        throw new CheckedException("foo");
+    }
+
+    public void throwUnChecked(byte[] msg) {
+        throw new RuntimeException("bla");
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
new file mode 100644
index 0000000000..ee02ac5f39
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsdefault.helloworld;
+
+public class CheckedException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public CheckedException(String s) {
+        super(s);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
new file mode 100644
index 0000000000..8744a57daf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsdefault.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String name);
+    
+    public String getPersonGreetings(Person person);
+    
+    public void nullInVoidOut();
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..f465767056
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsdefault.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldService helloWorldService1;
+    
+    @Reference
+    protected HelloWorldService helloWorldService2;
+    
+    @Reference
+    protected HelloWorldService helloWorldService3;
+    
+    @Reference
+    protected HelloWorldService helloWorldService4;
+
+    public String getGreetings(String name){
+        String stringValue = helloWorldService1.getGreetings(name) + " " +
+                             helloWorldService2.getGreetings(name) + " " +
+                             helloWorldService3.getGreetings(name) + " " +
+                             helloWorldService4.getGreetings(name);
+        
+        try {
+            helloWorldService3.throwChecked(name);
+        } catch (CheckedException e) {
+            stringValue += " " + e.getMessage();
+        }
+        
+        try {
+            helloWorldService3.throwUnChecked(name);
+        } catch (Exception e) {
+            stringValue += " " + e.getMessage();
+        }
+        
+        try {
+            helloWorldService4.throwChecked(name);
+        } catch (CheckedException e) {
+            stringValue += " " + e.getMessage();
+        }
+        
+        try {
+            helloWorldService4.throwUnChecked(name);
+        } catch (Exception e) {
+            stringValue += " " + e.getMessage();
+        }        
+        
+        return stringValue;
+    }
+    
+    public String getPersonGreetings(Person person){
+        return helloWorldService1.getPersonGreetings(person) + " " + 
+               helloWorldService2.getPersonGreetings(person) + " " +
+               helloWorldService3.getPersonGreetings(person) + " " +
+               helloWorldService4.getPersonGreetings(person);
+    }
+    
+    public void nullInVoidOut() {
+        helloWorldService1.nullInVoidOut();  
+        helloWorldService2.nullInVoidOut();
+        helloWorldService3.nullInVoidOut();
+        helloWorldService4.nullInVoidOut();
+        
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..545fcc894d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsdefault.helloworld;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException;
+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 getPersonGreetings(Person person);
+    
+    public void nullInVoidOut();
+    
+    public void throwChecked(String msg) throws CheckedException;
+    public void throwUnChecked(String msg);    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..aca727a9db
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsdefault.helloworld;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+    
+    public static int nullInVoidOutCalled = 0;
+
+    public String getGreetings(String name){
+        String response =  "Hello " + name;
+        System.out.println("getGreetings: " + response);
+        return response;
+    }
+    
+    public String getPersonGreetings(Person person){
+        String response =  "Hello " + person.getFirstName() + " " + person.getLastName();
+        System.out.println("getPersonGreetings: " + response);
+        return response;
+    }
+    
+    public void nullInVoidOut() {
+        System.out.println("nullInVoidOut");
+        nullInVoidOutCalled++;
+    }
+    
+    public void throwChecked(String msg) throws CheckedException {
+        throw new CheckedException("foo");
+    }
+
+    public void throwUnChecked(String msg) {
+        throw new RuntimeException("bla");
+    }    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
new file mode 100644
index 0000000000..c28347bf8e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsdefault.helloworld;
+
+public class Person {
+    String firstName;
+    String lastName;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
new file mode 100644
index 0000000000..948732adb4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsmessage.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String message);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..ed697f8a38
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsmessage.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldServiceReferenceSide helloWorldService1;
+    
+    public String getGreetings(String name){
+        helloWorldService1.getGreetings(name);
+        
+        try {
+            Thread.sleep(2000);
+        } catch (Exception ex) {
+            // do nothing
+        }
+        
+        return HelloWorldServiceImpl.getGreetings(); 
+    }    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..574188d466
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsmessage.helloworld;
+
+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 {
+
+    @OneWay
+    public void onMessage(javax.jms.Message message);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..2956df755b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsmessage.helloworld;
+
+import javax.jms.TextMessage;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+    
+    private static String greetings = "not set";
+    
+    public void onMessage(javax.jms.Message message){
+         
+        String name = null;
+        
+        try {
+            name = ((TextMessage)message).getText();
+        } catch (Exception ex) {
+            name = "EXCEPTION";
+        }
+        greetings =  "Hello " + name;
+    }
+    
+    public static String getGreetings(){
+        return greetings;
+    }
+    
+    // javax.jms.BytesMessage
+    // javax.jms.MapMessage
+    // javax.jms.ObjectMessage
+    // javax.jms.StreamMessage
+    // javax.jms.TextMessage
+    
+
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
new file mode 100644
index 0000000000..39af400f6a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsmessage.helloworld;
+
+import javax.jws.soap.SOAPBinding;
+
+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 HelloWorldServiceReferenceSide {
+
+    @OneWay
+    @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.BARE)
+    public void getGreetings(String message);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
new file mode 100644
index 0000000000..81ea3edffb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
@@ -0,0 +1,3 @@
+This test uses an SCA composite to fake a scenario where the reference is an SCA reference but the 
+service is a non-SCA JMS endpoint. This gives us the opportunity to play about with the interface
+configuration at the reference to see how the contents of the JMS message can be controlled. 
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
new file mode 100644
index 0000000000..da82b2fd5c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsobject.helloworld;
+
+public class CheckedException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public CheckedException(String s) {
+        super(s);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
new file mode 100644
index 0000000000..e89598cb96
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsobject.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetingsWrapSingle(String firstName, String lastName);
+    public String getGreetingsDontWrapSingle(String firstName, String lastName);
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..bb853673e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsobject.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldService helloWorldServiceWrapSingle;
+    
+    @Reference
+    protected HelloWorldService helloWorldServiceDontWrapSingle;
+    
+    public String getGreetingsWrapSingle(String firstName, String lastName){ 
+    	Person person = new Person();
+    	person.setFirstName(firstName);
+    	person.setLastName(lastName);
+    	
+    	String returnString = "";
+    	
+        Person returnPerson =  helloWorldServiceWrapSingle.getPersonGreetings(person);
+        returnString = returnPerson.getFirstName() + " " + returnPerson.getLastName();
+        
+        Person returnNullPerson = helloWorldServiceWrapSingle.getNullReturnGreetings(person); 
+        
+        if (returnNullPerson == null){
+            returnString += " Hello2 null";
+        }
+        
+        String returnGreeting = helloWorldServiceWrapSingle.getArrayGreeting(new String[]{firstName, lastName});
+        returnString += " " + returnGreeting;
+        
+        returnGreeting = helloWorldServiceWrapSingle.getMultiArrayGreetings(new String[]{firstName, firstName},new String[]{lastName, lastName});
+        returnString += " " + returnGreeting;
+        
+        returnGreeting = helloWorldServiceWrapSingle.getMultiGreetings(firstName, lastName);
+        returnString += " " + returnGreeting;        
+
+        returnGreeting = helloWorldServiceWrapSingle.getObjectGreeting(person);
+        returnString += " " + returnGreeting; 
+        
+        returnGreeting = helloWorldServiceWrapSingle.getObjectArrayGreeting(new Object[]{person});
+        returnString += " " + returnGreeting;      
+        
+        return returnString;
+    }  
+    
+    public String getGreetingsDontWrapSingle(String firstName, String lastName){ 
+        Person person = new Person();
+        person.setFirstName(firstName);
+        person.setLastName(lastName);
+        
+        String returnString = "";
+        
+        Person returnPerson =  helloWorldServiceDontWrapSingle.getPersonGreetings(person);
+        returnString = returnPerson.getFirstName() + " " + returnPerson.getLastName();
+        
+        Person returnNullPerson = helloWorldServiceDontWrapSingle.getNullReturnGreetings(person); 
+        
+        if (returnNullPerson == null){
+            returnString += " Hello2 null";
+        }
+        
+        String returnGreeting = helloWorldServiceDontWrapSingle.getArrayGreeting(new String[]{firstName, lastName});
+        returnString += " " + returnGreeting;
+        
+        returnGreeting = helloWorldServiceDontWrapSingle.getMultiArrayGreetings(new String[]{firstName, firstName},new String[]{lastName, lastName});
+        returnString += " " + returnGreeting;
+        
+        returnGreeting = helloWorldServiceDontWrapSingle.getMultiGreetings(firstName, lastName);
+        returnString += " " + returnGreeting;        
+
+        returnGreeting = helloWorldServiceDontWrapSingle.getObjectGreeting(person);
+        returnString += " " + returnGreeting; 
+        
+        returnGreeting = helloWorldServiceDontWrapSingle.getObjectArrayGreeting(new Object[]{person});
+        returnString += " " + returnGreeting;
+        
+        try {
+            helloWorldServiceDontWrapSingle.throwChecked(person);
+        } catch (CheckedException e) {
+            returnString += " " + e.getMessage();
+        }
+        
+        try {
+            helloWorldServiceDontWrapSingle.throwUnChecked(person);
+        } catch (Exception e) {
+            returnString += " " + e.getCause().getMessage();
+        }           
+        
+        return returnString;
+    }     
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..8976887daa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsobject.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+    public Person getPersonGreetings(Person person);
+    public Person getNullReturnGreetings(Person person);
+    public String getArrayGreeting(String[] names);
+    public String getMultiArrayGreetings(String[] firstName, String[] lastName);
+    public String getMultiGreetings(String firstName, String lastName);
+    public String getObjectGreeting(Object person);
+    public String getObjectArrayGreeting(Object[] pearson);
+    
+    public void throwChecked(Person person) throws CheckedException;
+    public void throwUnChecked(Person person);
+  
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..0c76c01362
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsobject.helloworld;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+    
+    public Person getPersonGreetings(Person person){
+         
+    	person.setFirstName("Hello1 " + person.getFirstName());
+    	person.setLastName("Hello1 " + person.getLastName());
+    	
+        return person;
+    }
+    
+    public Person getNullReturnGreetings(Person person){      
+        return null;
+    }    
+    
+    public String getArrayGreeting(String[] names) {
+        return "Hello3 " + names[0];
+    }
+    
+    public String getMultiArrayGreetings(String[] firstName, String[] lastName) {
+        return "Hello4 " + firstName[0] + " " + lastName[0];
+    }
+    
+    public String getMultiGreetings(String firstName, String lastName) {
+        return "Hello5 " + firstName + " " + lastName;
+    }
+    
+    public String getObjectGreeting(Object person) {
+        return "Hello6 " + ((Person)person).getFirstName() + " " + ((Person)person).getLastName();
+    }
+    
+    public String getObjectArrayGreeting(Object[] person) {
+        return "Hello7 " + ((Person)person[0]).getFirstName() + " " + ((Person)person[0]).getLastName();
+    }
+    
+    public void throwChecked(Person person) throws CheckedException {
+        throw new CheckedException("foo");
+    }
+
+    public void throwUnChecked(Person person) {
+        throw new RuntimeException("bla");
+    }    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
new file mode 100644
index 0000000000..35c383ace9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmsobject.helloworld;
+
+import java.io.Serializable;
+
+public class Person implements Serializable {
+
+    private static final long serialVersionUID = -6842761353978551779L;
+    
+    String firstName;
+    String lastName;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
new file mode 100644
index 0000000000..e2732a295c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstext.helloworld;
+
+public class CheckedException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public CheckedException(String s) {
+        super(s);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
new file mode 100644
index 0000000000..304e145161
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstext.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String message);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..2587a51704
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstext.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldService helloWorldService1;
+    
+    public String getGreetings(String name){     
+        String stringValue = helloWorldService1.getStringGreetings(name);
+        
+        try {
+            helloWorldService1.throwChecked(name);
+        } catch (Exception e) {
+            stringValue += " " + e.getMessage();
+        }
+        
+        try {
+            helloWorldService1.throwUnChecked(name);
+        } catch (Exception e) {
+            stringValue += " " + e.getMessage();
+        }
+        return stringValue;  
+    }    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..f46f3e2d04
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstext.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+    public String getStringGreetings(String msg);
+    
+    public void throwChecked(String msg) throws CheckedException;
+    public void throwUnChecked(String msg);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..988222c296
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstext.helloworld;
+
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+    
+    public String getStringGreetings(String msg){
+         
+        msg =  "Hello " + msg;
+        return msg;
+    }
+
+    public void throwChecked(String msg) throws CheckedException {
+        throw new CheckedException("foo");
+    }
+
+    public void throwUnChecked(String msg) {
+        throw new RuntimeException("bla");
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
new file mode 100644
index 0000000000..6015ab8930
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstext.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldServiceReference {
+
+    public String getStringGreetings(String msg);
+    
+    public void throwChecked(String msg) ;
+    public void throwUnChecked(String msg);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
new file mode 100644
index 0000000000..c45e3899e0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxml.helloworld;
+
+public class CheckedException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public CheckedException(String s) {
+        super(s);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
new file mode 100644
index 0000000000..e5cd9db281
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxml.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String name);  
+    public String getPersonGreetings(Person person);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..c54e195178
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxml.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldService helloWorldService1;
+    
+    @Reference
+    protected HelloWorldService helloWorldService2;
+    
+    @Reference
+    protected HelloWorldService helloWorldService3;
+
+    public String getGreetings(String name){
+        String stringValue = helloWorldService1.getGreetings(name) + " " +
+                             helloWorldService2.getGreetings(name) + " " +
+                             helloWorldService3.getGreetings(name);
+        
+        return stringValue;
+    }
+    
+    public String getPersonGreetings(Person person){
+        String stringValue = helloWorldService1.getPersonGreetings(person) + " " + 
+                             helloWorldService2.getPersonGreetings(person) + " " +
+                             helloWorldService3.getPersonGreetings(person);
+        
+        try {
+            helloWorldService1.throwChecked(person.getLastName());
+        } catch (CheckedException e) {
+            stringValue += " " + e.getMessage();
+        }
+        
+        try {
+            helloWorldService1.throwUnChecked(person.getLastName());
+        } catch (Exception e) {
+            stringValue += " " + e.getMessage();
+        }
+        
+        return stringValue;
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..a98f589b9a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxml.helloworld;
+
+import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException;
+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 getPersonGreetings(Person person);
+    
+    public void throwChecked(String msg) throws CheckedException;
+    public void throwUnChecked(String msg);
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..7965388013
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxml.helloworld;
+
+import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    public String getGreetings(String name){
+        String response =  "Hello " + name;
+        System.out.println("getGreetings: " + response);
+        return response;
+    }
+    
+    public String getPersonGreetings(Person person){
+        String response =  "Hello " + person.getFirstName() + " " + person.getLastName();
+        System.out.println("getPersonGreetings: " + response);
+        return response;
+    }
+    
+    public void throwChecked(String msg) throws CheckedException {
+        throw new CheckedException("foo");
+    }
+
+    public void throwUnChecked(String msg) {
+        throw new RuntimeException("bla");
+    }    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
new file mode 100644
index 0000000000..8f9c3564f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxml.helloworld;
+
+public class Person {
+    String firstName;
+    String lastName;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..732b49ea6c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxmlinjmsobjectout.helloworld;
+
+import org.osoa.sca.annotations.Reference;
+
+
+public class HelloWorldReferenceImpl implements HelloWorldService {
+    
+    @Reference
+    protected HelloWorldService helloWorldService1;
+    
+    public String getGreetings(String name){
+        return helloWorldService1.getGreetings(name).toString();
+    }
+    
+    public String getPersonGreetings(Person person){
+        return helloWorldService1.getPersonGreetings(person).toString();
+    }   
+         
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..65323a3d63
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxmlinjmsobjectout.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 getPersonGreetings(Person person);
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..2f2c53b41d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxmlinjmsobjectout.helloworld;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    public String getGreetings(String name){
+        String response =  "Hello " + name;
+        System.out.println("getGreetings: " + response);
+        return response;
+    }
+    
+    public String getPersonGreetings(Person person){
+        String response =  "Hello " + person.getFirstName() + " " + person.getLastName();
+        System.out.println("getPersonGreetings: " + response);
+        return response;
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
new file mode 100644
index 0000000000..ad6fe0b043
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format.jmstextxmlinjmsobjectout.helloworld;
+
+public class Person {
+    String firstName;
+    String lastName;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..f2564234fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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:hw="http://helloworld">
+    <deployable composite="hw:jmsobject" />
+</contribution>
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
new file mode 100644
index 0000000000..ea6ed6c464
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" 
+	xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+           <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsBytes/>
+            </binding.jms>
+        </reference>  
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsBytes/>
+            </binding.jms>
+        </service>
+    </component> 
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
new file mode 100644
index 0000000000..fff5656c98
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" 
+	xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+           <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsBytesXML/>
+            </binding.jms>
+        </reference>  
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsBytesXML/>
+            </binding.jms>
+        </service>
+    </component> 
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
new file mode 100644
index 0000000000..2c54bf8bc5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+            </binding.jms>
+        </reference>  
+        <reference name="helloWorldService2" >
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <tuscany:wireFormat.jmsdefault/>
+            </binding.jms>
+        </reference>
+        <reference name="helloWorldService3" >
+            <binding.jms>
+                <destination name="HelloWorldService3"/>
+                <tuscany:wireFormat.jmsdefault/>
+            </binding.jms>
+        </reference> 
+        <reference name="helloWorldService4" >
+            <binding.jms>
+                <destination name="HelloWorldService4"/>
+                <tuscany:wireFormat.jmsdefault sendFormat="text"/>
+            </binding.jms>
+        </reference> 
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+            </binding.jms>
+        </service>
+    </component> 
+    
+    <component name="HelloWorldServiceComponent2">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldService" />
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+            </binding.jms>
+        </service>
+    </component>    
+        
+    <component name="HelloWorldServiceComponent3">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
+	    <service name="HelloWorldService">
+	        <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
+            <binding.jms>
+                <destination name="HelloWorldService3"/>
+                <tuscany:wireFormat.jmsdefault />
+            </binding.jms>
+	    </service>
+    </component>
+    
+    <component name="HelloWorldServiceComponent4">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
+            <binding.jms>
+                <destination name="HelloWorldService4"/>
+                <tuscany:wireFormat.jmsdefault />
+            </binding.jms>
+        </service>
+    </component>    
+    
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
new file mode 100644
index 0000000000..30372cc02f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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/textxml" xmlns:tns="http://helloworld/textxml" 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/textxml" 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>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="PersonType">
+                <xsd:sequence>
+                    <xsd:element name="firstName" type="xsd:string"/>
+                    <xsd:element name="lastName" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            
+            <element name="getPersonGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="person" type="PersonType"/>
+                    </sequence>
+                </complexType>
+            </element> 
+            
+            <element name="getPersonGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getPersonGreetingsReturn" 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:message name="getPersonGreetingsRequest">
+        <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getPersonGreetingsResponse">
+        <wsdl:part element="tns:getPersonGreetingsResponse" 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="getPersonGreetings">
+            <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
+            <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
+        </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="getPersonGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getPersonGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getPersonGreetingsResponse">
+                <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:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
new file mode 100644
index 0000000000..6202e947f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+            <!--interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/-->
+            <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceReferenceSide"/>
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsText/>
+            </binding.jms>
+        </reference>  
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+            </binding.jms>
+        </service>
+    </component> 
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
new file mode 100644
index 0000000000..092c56b31d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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">
+
+            <xsd:complexType name="PersonType">
+                <xsd:sequence>
+                    <xsd:element name="firstName" type="xsd:string"/>
+                    <xsd:element name="lastName" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            
+            <element name="getPersonGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="person" type="PersonType"/>
+                    </sequence>
+                </complexType>
+            </element> 
+            
+            <element name="getPersonGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getPersonGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            
+            <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:part type="xsd:string" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <!-- wsdl:part element="tns:getGreetingsResponse" name="parameters"/-->
+        <wsdl:part type="xsd:string" name="parameters"/>
+    </wsdl:message>
+    
+    <!-- wsdl:message name="getPersonGreetingsRequest">
+        <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getPersonGreetingsResponse">
+        <wsdl:part element="tns:getPersonGreetingsResponse" 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="getPersonGreetings">
+            <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
+            <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
+        </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="rpc" 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:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
+        </wsdl:port>
+    </wsdl:service-->
+
+</wsdl:definitions>
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
new file mode 100644
index 0000000000..3ca541c9fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" 
+    name="jmsobject">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldServiceWrapSingle" >
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                 <tuscany:wireFormat.jmsObject wrapSingle="true"/>
+            </binding.jms>
+        </reference> 
+        <reference name="helloWorldServiceDontWrapSingle" >
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                 <tuscany:wireFormat.jmsObject wrapSingle="false" />
+            </binding.jms>
+        </reference>          
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <interface.wsdl interface="http://helloworld.jmsobject.format.jms.binding.sca.tuscany.apache.org/#wsdl.interface(HelloWorldService)"/>
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                 <tuscany:wireFormat.jmsObject wrapSingle="true"/>
+            </binding.jms>
+        </service>
+    </component> 
+    
+    <component name="HelloWorldServiceComponent2">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <tuscany:wireFormat.jmsObject /> <!-- test that wrapSingle default works -->
+            </binding.jms>
+        </service>
+    </component>     
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
new file mode 100644
index 0000000000..a2af528e9e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        * Licensed to the Apache Software Foundation (ASF) under one *
+        or more contributor license agreements. See the NOTICE file *
+        distributed with this work for additional information *
+        regarding copyright ownership. The ASF licenses this file * to
+        you under the Apache License, Version 2.0 (the * "License"); you
+        may not use this file except in compliance * with the License.
+        You may obtain a copy of the License at * *
+        http://www.apache.org/licenses/LICENSE-2.0 * * Unless required
+        by applicable law or agreed to in writing, * software
+        distributed under the License is distributed on an * "AS IS"
+        BASIS, WITHOUT 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="HelloWorldServiceService"
+    targetNamespace="http://helloworld.jmsobject.format.jms.binding.sca.tuscany.apache.org/"
+    xmlns:tns="http://helloworld.jmsobject.format.jms.binding.sca.tuscany.apache.org/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
+    <wsdl:types>
+        <xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:complexType name="person">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="firstName"
+                        type="xs:string" />
+                    <xs:element minOccurs="0" name="lastName"
+                        type="xs:string" />
+                </xs:sequence>
+            </xs:complexType>
+        </xs:schema>
+        <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
+            version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:complexType final="#all" name="stringArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded"
+                        minOccurs="0" name="item" nillable="true" type="xs:string" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType final="#all" name="anyTypeArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded"
+                        minOccurs="0" name="item" nillable="true" type="xs:anyType" />
+                </xs:sequence>
+            </xs:complexType>
+        </xs:schema>
+        <xs:schema attributeFormDefault="qualified"
+            elementFormDefault="unqualified"
+            targetNamespace="http://helloworld.jmsobject.format.jms.binding.sca.tuscany.apache.org/"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:import />
+            <xs:import />
+            <xs:import />
+            <xs:import />
+            <xs:element name="getObjectGreetingResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getNullReturnGreetingsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="person" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getPersonGreetings">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="person" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getPersonGreetingsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="person" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getMultiGreetingsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getObjectArrayGreeting">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded"
+                            minOccurs="0" name="arg0" nillable="true"
+                            type="xs:anyType" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getArrayGreeting">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded"
+                            minOccurs="0" name="arg0" nillable="true"
+                            type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getObjectArrayGreetingResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getMultiArrayGreetingsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getObjectGreeting">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:anyType" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getNullReturnGreetings">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="person" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getMultiArrayGreetings">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded"
+                            minOccurs="0" name="arg0" nillable="true"
+                            type="xs:string" />
+                        <xs:element maxOccurs="unbounded"
+                            minOccurs="0" name="arg1" nillable="true"
+                            type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getMultiGreetings">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:string" />
+                        <xs:element minOccurs="0" name="arg1"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getArrayGreetingResponse">
+                <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="getObjectGreetingResponse">
+        <wsdl:part name="getObjectGreetingResponse" element="tns:getObjectGreetingResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getNullReturnGreetingsResponse">
+        <wsdl:part name="getNullReturnGreetingsResponse"
+            element="tns:getNullReturnGreetingsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getPersonGreetings">
+        <wsdl:part name="getPersonGreetings" element="tns:getPersonGreetings">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getPersonGreetingsResponse">
+        <wsdl:part name="getPersonGreetingsResponse" element="tns:getPersonGreetingsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getMultiGreetingsResponse">
+        <wsdl:part name="getMultiGreetingsResponse" element="tns:getMultiGreetingsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getObjectArrayGreeting">
+        <wsdl:part name="getObjectArrayGreeting" element="tns:getObjectArrayGreeting">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getArrayGreeting">
+        <wsdl:part name="getArrayGreeting" element="tns:getArrayGreeting">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getObjectArrayGreetingResponse">
+        <wsdl:part name="getObjectArrayGreetingResponse"
+            element="tns:getObjectArrayGreetingResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getMultiArrayGreetingsResponse">
+        <wsdl:part name="getMultiArrayGreetingsResponse"
+            element="tns:getMultiArrayGreetingsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getObjectGreeting">
+        <wsdl:part name="getObjectGreeting" element="tns:getObjectGreeting">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getNullReturnGreetings">
+        <wsdl:part name="getNullReturnGreetings" element="tns:getNullReturnGreetings">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getMultiArrayGreetings">
+        <wsdl:part name="getMultiArrayGreetings" element="tns:getMultiArrayGreetings">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getMultiGreetings">
+        <wsdl:part name="getMultiGreetings" element="tns:getMultiGreetings">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getArrayGreetingResponse">
+        <wsdl:part name="getArrayGreetingResponse" element="tns:getArrayGreetingResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="HelloWorldService">
+        <wsdl:operation name="getPersonGreetings">
+            <wsdl:input message="tns:getPersonGreetings">
+            </wsdl:input>
+            <wsdl:output message="tns:getPersonGreetingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getNullReturnGreetings">
+            <wsdl:input message="tns:getNullReturnGreetings">
+            </wsdl:input>
+            <wsdl:output message="tns:getNullReturnGreetingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getArrayGreeting">
+            <wsdl:input message="tns:getArrayGreeting">
+            </wsdl:input>
+            <wsdl:output message="tns:getArrayGreetingResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getMultiArrayGreetings">
+            <wsdl:input message="tns:getMultiArrayGreetings">
+            </wsdl:input>
+            <wsdl:output message="tns:getMultiArrayGreetingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getMultiGreetings">
+            <wsdl:input message="tns:getMultiGreetings">
+            </wsdl:input>
+            <wsdl:output message="tns:getMultiGreetingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getObjectGreeting">
+            <wsdl:input message="tns:getObjectGreeting">
+            </wsdl:input>
+            <wsdl:output message="tns:getObjectGreetingResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getObjectArrayGreeting">
+            <wsdl:input message="tns:getObjectArrayGreeting">
+            </wsdl:input>
+            <wsdl:output message="tns:getObjectArrayGreetingResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="HelloWorldServiceBinding" type="tns:HelloWorldService">
+        <SOAP:binding style="document"
+            transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="getPersonGreetings">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getNullReturnGreetings">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getArrayGreeting">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getMultiArrayGreetings">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getMultiGreetings">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getObjectGreeting">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getObjectArrayGreeting">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="HelloWorldServiceService">
+        <wsdl:port name="HelloWorldServicePort" binding="tns:HelloWorldServiceBinding">
+            <SOAP:address location="/HelloWorldServiceComponent1" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstext/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstext/helloworld.composite
new file mode 100644
index 0000000000..5b3e710a51
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstext/helloworld.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" 
+	xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+           <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsText/>
+            </binding.jms>
+        </reference>  
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsText/>
+            </binding.jms>
+        </service>
+    </component> 
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
new file mode 100644
index 0000000000..2d25f2c3f4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+        </reference>  
+        <reference name="helloWorldService2" >
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+        </reference>
+        <reference name="helloWorldService3" >
+            <binding.jms>
+                <destination name="HelloWorldService3"/>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+        </reference>      
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+        </service>
+    </component> 
+    
+    <component name="HelloWorldServiceComponent2">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldService" />
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+        </service>
+    </component>    
+        
+    <component name="HelloWorldServiceComponent3">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
+	    <service name="HelloWorldService">
+	        <interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" />
+            <binding.jms>
+                <destination name="HelloWorldService3"/>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+	    </service>
+    </component>
+    
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
new file mode 100644
index 0000000000..30372cc02f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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/textxml" xmlns:tns="http://helloworld/textxml" 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/textxml" 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>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="PersonType">
+                <xsd:sequence>
+                    <xsd:element name="firstName" type="xsd:string"/>
+                    <xsd:element name="lastName" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            
+            <element name="getPersonGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="person" type="PersonType"/>
+                    </sequence>
+                </complexType>
+            </element> 
+            
+            <element name="getPersonGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getPersonGreetingsReturn" 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:message name="getPersonGreetingsRequest">
+        <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getPersonGreetingsResponse">
+        <wsdl:part element="tns:getPersonGreetingsResponse" 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="getPersonGreetings">
+            <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
+            <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
+        </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="getPersonGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getPersonGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getPersonGreetingsResponse">
+                <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:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
new file mode 100644
index 0000000000..3f05ac2683
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <response>
+                    <tuscany:wireFormat.jmsObject/>
+                </response>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+        </reference>       
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <response>
+                    <tuscany:wireFormat.jmsObject/>
+                </response>
+                <tuscany:wireFormat.jmsTextXML/>
+            </binding.jms>
+        </service>
+    </component> 
+    
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
new file mode 100644
index 0000000000..30372cc02f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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/textxml" xmlns:tns="http://helloworld/textxml" 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/textxml" 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>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="PersonType">
+                <xsd:sequence>
+                    <xsd:element name="firstName" type="xsd:string"/>
+                    <xsd:element name="lastName" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            
+            <element name="getPersonGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="person" type="PersonType"/>
+                    </sequence>
+                </complexType>
+            </element> 
+            
+            <element name="getPersonGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getPersonGreetingsReturn" 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:message name="getPersonGreetingsRequest">
+        <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getPersonGreetingsResponse">
+        <wsdl:part element="tns:getPersonGreetingsResponse" 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="getPersonGreetings">
+            <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
+            <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
+        </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="getPersonGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getPersonGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getPersonGreetingsResponse">
+                <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:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..9abdff215d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jndi.properties
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+## 
+## http://www.apache.org/licenses/LICENSE-2.0
+## 
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT 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.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
new file mode 100644
index 0000000000..a0429aa59f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 FormatJMSBytesTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmsbytes/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
+/* TUSCANY-2967 - disable this change while we decide what to do and
+ *                return faults as JMSObject messages to be consistent
+ *                again with other wire formats        
+        assertEquals("Hello Fred Bloggs " +
+                     "org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.CheckedException: foo " +
+                     "org.osoa.sca.ServiceRuntimeException: java.lang.RuntimeException: bla", 
+                     helloWorldService.getGreetings("Fred Bloggs"));
+*/
+        assertEquals("Hello Fred Bloggs " +
+                     "foo " +
+                     "remote service exception, see nested exception" , 
+                     helloWorldService.getGreetings("Fred Bloggs"));        
+             
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
new file mode 100644
index 0000000000..ec9a1adeb4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 FormatJMSBytesXMLTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmsbytesxml/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
+        assertEquals("Hello Fred Bloggs foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
+        
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
new file mode 100644
index 0000000000..dc2cc13679
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReference;
+import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl;
+import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.Person;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * This shows how to test the JMS binding using a simple HelloWorld application.
+ */
+public class FormatJMSDefaultTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmsdefault/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs foo remote service exception, see nested exception foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
+        
+        Person person = new Person();
+        person.setFirstName("Fred");
+        person.setLastName("Bloggs");
+        assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
+        
+        // this just makes sure that there are no exceptions thrown for this case
+        helloWorldService.nullInVoidOut();
+        Assert.assertEquals(4, HelloWorldServiceImpl.nullInVoidOutCalled);
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
new file mode 100644
index 0000000000..c617a984ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReference;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 FormatJMSMessageTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmsmessage/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
+        assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
+        
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
new file mode 100644
index 0000000000..462ebb557e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReference;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * This shows how to test the JMS binding using a simple HelloWorld application.
+ */
+public class FormatJMSObjectTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmsobject/helloworld.composite",
+                new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldService = ((SCAClient) node).getService(
+                HelloWorldReference.class, "HelloWorldReferenceComponent");
+
+        assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs", 
+                     helloWorldService.getGreetingsWrapSingle("Fred", "Bloggs"));
+        
+        assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs foo java.lang.RuntimeException: bla", 
+                helloWorldService.getGreetingsDontWrapSingle("Fred", "Bloggs"));        
+
+    }
+    
+    @Ignore
+    @Test
+    public void testWaitForInput() {
+        System.out.println("Press a key to end");
+        try {
+            System.in.read();
+        } catch (Exception ex) {
+        }
+        System.out.println("Shutting down");
+    }     
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
new file mode 100644
index 0000000000..d45e6492ce
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 FormatJMSTextTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmstext/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
+        assertEquals("Hello Fred Bloggs " +
+                "foo remote service exception, see nested exception", 
+                helloWorldService.getGreetings("Fred Bloggs"));
+        
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
new file mode 100644
index 0000000000..5d3b0ac9e3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldService;
+import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.Person;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * This shows how to test the JMS binding using a simple HelloWorld application.
+ */
+public class FormatJMSTextXMLInJMSObjectOutTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmstextxmlinjmsobjectout/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldReferenceComponent");
+        
+        assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
+        
+        Person person = new Person();
+        person.setFirstName("Fred");
+        person.setLastName("Bloggs");
+        assertEquals("Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
new file mode 100644
index 0000000000..5650d06a36
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.format;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReference;
+import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.Person;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 FormatJMSTextXMLTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmstextxml/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
+        
+        Person person = new Person();
+        person.setFirstName("Fred");
+        person.setLastName("Bloggs");
+        assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs foo remote service exception, see nested exception", helloWorldService.getPersonGreetings(person));
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/pom.xml b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/pom.xml
new file mode 100644
index 0000000000..93756df077
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-nonscaclient-exceptions</artifactId>
+    <name>Apache Tuscany SCA iTest JMS NonSCA Client Exceptions</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-policy</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>1.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>         
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
new file mode 100644
index 0000000000..469882f3b3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
new file mode 100644
index 0000000000..19b584950a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 CheckedExcpetion2Args extends Exception {

+    private static final long serialVersionUID = 1L;

+

+    public CheckedExcpetion2Args(String s, Throwable e) {

+        super(s, e);

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
new file mode 100644
index 0000000000..b12e3a562e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 CheckedExcpetionChained extends Exception {

+    private static final long serialVersionUID = 1L;

+

+    public CheckedExcpetionChained(Throwable e) {

+        super(e);

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
new file mode 100644
index 0000000000..b23db73c01
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 CheckedExcpetionNoArgs extends Exception {

+    private static final long serialVersionUID = 1L;

+

+    public CheckedExcpetionNoArgs() {

+        super();

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
new file mode 100644
index 0000000000..cc21afaa60
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 throwCheckedNoArgs() throws CheckedExcpetionNoArgs;

+    public void throwChecked2Args() throws CheckedExcpetion2Args;

+    public void throwCheckedChained() throws CheckedExcpetionChained;

+

+    public void throwUnChecked();

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
new file mode 100644
index 0000000000..866acf1ce1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
@@ -0,0 +1,44 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 throwChecked2Args() throws CheckedExcpetion2Args {

+        throw new CheckedExcpetion2Args("foo", new Exception("bla"));

+    }

+

+    public void throwCheckedChained() throws CheckedExcpetionChained {

+        throw new CheckedExcpetionChained(new Exception("bla"));

+    }

+

+    public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {

+        throw new CheckedExcpetionNoArgs();

+    }

+

+    public void throwUnChecked() {

+        throw new RuntimeException("bla");

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
new file mode 100644
index 0000000000..0dcbb0687a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="ExceptionServiceComposite">

+

+    <component name="TextExceptionService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>

+        <service name="ExceptionService">

+            <binding.jms>

+                 <destination name="TextExceptionService"/>

+            </binding.jms>

+        </service> 

+    </component>       

+

+    <component name="ObjectExceptionService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>

+        <service name="ExceptionService">

+            <binding.jms>

+                 <destination name="ObjectExceptionService"/>

+                 <tuscany:wireFormat.jmsObject/>

+            </binding.jms>

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..72d5457faf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
@@ -0,0 +1,40 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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.TextExceptionService = TextRequestQueue

+queue.ObjectExceptionService = ObjectRequestQueue

+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.5.1/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
new file mode 100644
index 0000000000..1dec4a6f92
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
@@ -0,0 +1,211 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.custommonkey.xmlunit.XMLAssert.assertXMLEqual;

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertTrue;

+

+import java.io.IOException;

+import java.util.Properties;

+

+import javax.jms.Connection;

+import javax.jms.ConnectionFactory;

+import javax.jms.Destination;

+import javax.jms.JMSException;

+import javax.jms.Message;

+import javax.jms.MessageConsumer;

+import javax.jms.MessageProducer;

+import javax.jms.ObjectMessage;

+import javax.jms.Session;

+import javax.jms.TextMessage;

+import javax.naming.InitialContext;

+import javax.naming.NamingException;

+

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

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+import org.xml.sax.SAXException;

+

+/**

+ * This shows how to test the JMS binding using a simple HelloWorld application.

+ */

+public class ExceptionsTestCase {

+

+    private static SCADomain scaDomain;

+    private Session session;

+    private InitialContext context;

+    private Connection connection;

+

+    private static final String CHECKED_XML =

+        "<ns2:CheckedExcpetion xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><message>foo</message></ns2:CheckedExcpetion>";

+    private static final String CHECKED_NOARGS_XML = "<ns2:CheckedExcpetionNoArgs xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\" />";

+    private static final String CHECKED_2ARGS_XML =

+        "<ns2:CheckedExcpetion2Args xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><message>foo</message></ns2:CheckedExcpetion2Args>";

+    private static final String CHECKED_CHAINED_XML =

+        "<ns2:CheckedExcpetionChained xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><message>java.lang.Exception: bla</message></ns2:CheckedExcpetionChained>";

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "exceptions/service.composite");

+    }

+

+    @Test

+    public void testTextChecked() throws NamingException, JMSException, SAXException, IOException {

+        sendJMSTextRequest("throwChecked");

+        Message m = receiveJMSResponse();

+        assertXMLEqual(CHECKED_XML, ((TextMessage)m).getText());

+    }

+

+    @Test

+    public void testTextCheckedNoArgs() throws NamingException, JMSException, SAXException, IOException {

+        sendJMSTextRequest("throwCheckedNoArgs");

+        Message m = receiveJMSResponse();

+        assertXMLEqual(CHECKED_NOARGS_XML, ((TextMessage)m).getText());

+    }

+

+    @Test

+    public void testTextChecked2Args() throws NamingException, JMSException, SAXException, IOException {

+        sendJMSTextRequest("throwChecked2Args");

+        Message m = receiveJMSResponse();

+        assertXMLEqual(CHECKED_2ARGS_XML, ((TextMessage)m).getText());

+    }

+

+    @Test

+    public void testTextCheckedChained() throws NamingException, JMSException, SAXException, IOException {

+        sendJMSTextRequest("throwCheckedChained");

+        Message m = receiveJMSResponse();

+        assertXMLEqual(CHECKED_CHAINED_XML, ((TextMessage)m).getText());

+    }

+

+    @Test

+    public void testTextUnChecked() throws NamingException, JMSException, SAXException, IOException {

+        sendJMSTextRequest("throwUnChecked");

+        Message m = receiveJMSResponse();

+        

+        // FIXME: what should the response message be for unchecked exceptions with wireFormat.textXML???

+        Object o = ((ObjectMessage)m).getObject();

+        assertTrue(o instanceof RuntimeException);

+        assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));

+        assertEquals("java.lang.RuntimeException: bla", ((RuntimeException)o).getMessage());

+    }

+

+    @Test

+    public void testObjectChecked() throws NamingException, JMSException {

+        sendJMSObjectRequest("throwChecked");

+        Message m = receiveJMSResponse();

+        Object o = ((ObjectMessage)m).getObject();

+        assertTrue(o instanceof CheckedExcpetion);

+        assertEquals("foo", ((CheckedExcpetion)o).getMessage());

+    }

+

+    @Test

+    public void testObjectCheckedNoArgs() throws NamingException, JMSException {

+        sendJMSObjectRequest("throwCheckedNoArgs");

+        Message m = receiveJMSResponse();

+        Object o = ((ObjectMessage)m).getObject();

+        assertTrue(o instanceof CheckedExcpetionNoArgs);

+    }

+

+    @Test

+    public void testObjectChecked2Args() throws NamingException, JMSException {

+        sendJMSObjectRequest("throwChecked2Args");

+        Message m = receiveJMSResponse();

+        Object o = ((ObjectMessage)m).getObject();

+        assertTrue(o instanceof CheckedExcpetion2Args);

+        assertEquals("foo", ((CheckedExcpetion2Args)o).getMessage());

+        assertEquals("bla", ((CheckedExcpetion2Args)o).getCause().getMessage());

+    }

+

+    @Test

+    public void testObjectCheckedChained() throws NamingException, JMSException {

+        sendJMSObjectRequest("throwCheckedChained");

+        Message m = receiveJMSResponse();

+        Object o = ((ObjectMessage)m).getObject();

+        assertTrue(o instanceof CheckedExcpetionChained);

+        assertEquals("bla", ((CheckedExcpetionChained)o).getCause().getMessage());

+    }

+

+    @Test

+    public void testObjectUnChecked() throws NamingException, JMSException {

+        sendJMSObjectRequest("throwUnChecked");

+        Message m = receiveJMSResponse();

+        Object o = ((ObjectMessage)m).getObject();

+        assertTrue(o instanceof RuntimeException);

+        assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));

+        assertEquals("java.lang.RuntimeException: bla", ((RuntimeException)o).getMessage());

+    }

+

+    @After

+    public void end() throws JMSException {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+        if (connection != null) {

+            connection.close();

+        }

+    }

+

+    private void sendJMSTextRequest(String operationName) throws NamingException, JMSException {

+        context = new InitialContext(new Properties());

+        ConnectionFactory cf = (ConnectionFactory)context.lookup("ConnectionFactory");

+        connection = cf.createConnection();

+        connection.start();

+

+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

+        Destination toDest = (Destination)context.lookup("TextExceptionService");

+

+        TextMessage m = session.createTextMessage();

+        m.setStringProperty("scaOperationName", operationName);

+        m.setJMSReplyTo((Destination)context.lookup("ResponseQueue"));

+        m.setText("<_ns_:" + operationName + " xmlns:_ns_=\"http://jms.binding.sca.tuscany.apache.org/\" />");

+

+        MessageProducer producer = session.createProducer(toDest);

+        producer.send(m);

+    }

+

+    private void sendJMSObjectRequest(String operationName) throws NamingException, JMSException {

+        context = new InitialContext(new Properties());

+        ConnectionFactory cf = (ConnectionFactory)context.lookup("ConnectionFactory");

+        connection = cf.createConnection();

+        connection.start();

+

+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

+        Destination toDest = (Destination)context.lookup("ObjectExceptionService");

+

+        ObjectMessage m = session.createObjectMessage();

+        m.setStringProperty("scaOperationName", operationName);

+        m.setJMSReplyTo((Destination)context.lookup("ResponseQueue"));

+        m.setObject(new Object[0]);

+

+        MessageProducer producer = session.createProducer(toDest);

+        producer.send(m);

+    }

+

+    private Message receiveJMSResponse() throws NamingException, JMSException {

+        Destination replyDest = (Destination)context.lookup("ResponseQueue");

+        MessageConsumer consumer = session.createConsumer(replyDest);

+        Message m = consumer.receive(5000);

+        if (m == null) {

+            throw new RuntimeException("No reply message received");

+        }

+        return m;

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-noreplyto/pom.xml b/tags/java/sca/1.5.1/itest/jms-noreplyto/pom.xml
new file mode 100644
index 0000000000..8b2877b4cb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-noreplyto/pom.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-noreplyto</artifactId>
+    <name>Apache Tuscany SCA iTest JMS No replyTo</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-policy</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>         
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
new file mode 100644
index 0000000000..28b281a0c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..2c6d9d0d17
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-noreplyto/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..4d6acc037b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/resources/jndi.properties
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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.5.1/itest/jms-noreplyto/src/main/resources/service.composite b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/resources/service.composite
new file mode 100644
index 0000000000..f6cc48fa0f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/resources/service.composite
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SimpleServiceComposite">

+

+    <component name="HelloWorldService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

+        <service name="HelloWorldService">

+            <binding.jms>

+               <destination name="RequestQueue"/>

+               <response>

+                  <destination name="ResponseQueue"/>

+               </response>

+               <tuscany:wireFormat.jmsObject/>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
new file mode 100644
index 0000000000..3db0e634be
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
@@ -0,0 +1,100 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.Properties;

+

+import javax.jms.Connection;

+import javax.jms.ConnectionFactory;

+import javax.jms.Destination;

+import javax.jms.JMSException;

+import javax.jms.Message;

+import javax.jms.MessageConsumer;

+import javax.jms.MessageProducer;

+import javax.jms.ObjectMessage;

+import javax.jms.Session;

+import javax.naming.InitialContext;

+import javax.naming.NamingException;

+

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

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * Uses a non-Tuscany JMS client to send/receive a JMS request to a Tuscany/SCA JMS service

+ */

+public class NoReplyToTestCase {

+

+    private static SCADomain scaDomain;

+    private Session session;

+    private InitialContext context;

+    private Connection connection;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "service.composite");

+    }

+

+    @Test

+    public void testHelloWorldCreate() throws Exception {

+        sendJMSRequest();

+        String response = receiveJMSResponse();

+        assertEquals("jmsHello Petra", response);

+    }

+

+    private void sendJMSRequest() throws NamingException, JMSException {

+        context = new InitialContext(new Properties());

+        ConnectionFactory cf = (ConnectionFactory)context.lookup("ConnectionFactory");

+        connection = cf.createConnection();

+        connection.start();

+

+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

+        Destination toDest = (Destination)context.lookup("RequestQueue");

+        

+        ObjectMessage m = session.createObjectMessage();

+        m.setObject("Petra");

+        

+        MessageProducer producer = session.createProducer(toDest);

+        producer.send(m);

+    }

+

+    private String receiveJMSResponse() throws NamingException, JMSException {

+        Destination replyDest = (Destination)context.lookup("ResponseQueue");

+        MessageConsumer consumer = session.createConsumer(replyDest);

+        Message m = consumer.receive(5000);

+        if (m == null) {

+            throw new RuntimeException("No reply message received");

+        }

+        return ((ObjectMessage)m).getObject().toString();

+    }

+

+    @After

+    public void end() throws JMSException {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+        if (connection != null) {

+            connection.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nulls/pom.xml b/tags/java/sca/1.5.1/itest/jms-nulls/pom.xml
new file mode 100644
index 0000000000..5ab71b52fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nulls/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-nulls</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Nulls</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+              a temporary queue name -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.1.0</version>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
new file mode 100644
index 0000000000..f7f930f443
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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(MyService.class)

+public class ClientImpl implements MyService {

+

+    private MyService serviceA;

+

+    @Reference

+    public void setServiceA(MyService service) {

+        this.serviceA = service;

+    }

+

+    public void sayHello() {

+        serviceA.sayHello();

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
new file mode 100644
index 0000000000..5c43f02ca4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 MyService {

+    

+    void sayHello();

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
new file mode 100644
index 0000000000..89758becff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 ServiceImpl implements MyService {

+

+    public void sayHello() {

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..bb431a592b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/jndi.properties
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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&broker.useJmx=false

+

+# use the following property to specify the JNDI name the connection factory

+# should appear as. 

+#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

+connectionFactoryNames = ConnectionFactory, ConnectionFactory2

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+

+# register some topics in JNDI using the form

+# topic.[jndiName] = [physicalName]

+#topic.MyTopic = example.MyTopic

+topic.ServiceTopic = ServiceTopic

+

+# END SNIPPET: jndi

diff --git a/tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/nulls.composite b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/nulls.composite
new file mode 100644
index 0000000000..99717d4c0f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/nulls.composite
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           xmlns:itest="http://jms"

+           name="Nulls">

+

+    <component name="Client1">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

+        <reference name="serviceA">

+           <binding.jms uri="jms:MyService" />

+        </reference>

+    </component>

+

+    <component name="Service1">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>

+        <service name="MyService">

+            <binding.jms />

+        </service> 

+    </component>       

+

+    <component name="Client2">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

+        <reference name="serviceA">

+           <binding.jms uri="jms:MyService2">

+              <tuscany:wireFormat.jmsObject/>

+           </binding.jms>

+        </reference>

+    </component>

+

+    <component name="Service2">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>

+        <service name="MyService">

+            <binding.jms uri="jms:MyService2">

+              <tuscany:wireFormat.jmsObject/>

+           </binding.jms>

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/tags/java/sca/1.5.1/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
new file mode 100644
index 0000000000..e8aa803369
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
@@ -0,0 +1,59 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.apache.tuscany.sca.host.embedded.SCADomain;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ */

+public class NullsTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "nulls.composite");

+    }

+

+    @Test

+    public void testSayHello() throws Exception {

+        MyService client1 = scaDomain.getService(MyService.class, "Client1");

+

+        client1.sayHello();

+

+    }

+

+    @Test

+    public void testSayHelloObjectFormat() throws Exception {

+        MyService client1 = scaDomain.getService(MyService.class, "Client2");

+

+        client1.sayHello();

+

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-oneway-nocf/pom.xml b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/pom.xml
new file mode 100644
index 0000000000..bd015d401d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-oneway-nocf</artifactId>
+    <name>Apache Tuscany SCA iTest JMS for a oneway service</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-policy</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>         
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
new file mode 100644
index 0000000000..4d00d2df0d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
new file mode 100644
index 0000000000..377f227ceb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
new file mode 100644
index 0000000000..0036391696
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
@@ -0,0 +1,34 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-oneway-nocf/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..8934614a8a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/jndi.properties
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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 = SomeConnectionFactory

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+queue.SomeQueue = RequestQueue

+

+# 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.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
new file mode 100644
index 0000000000..ec7b19ff98
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="OneWayClientComposite">

+

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

+            <connectionFactory name="SomeConnectionFactory"/>

+            <destination name="SomeQueue"/>

+        </binding.jms>  

+    </reference>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
new file mode 100644
index 0000000000..dff7d0c77f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="OneWayServiceComposite">

+

+    <component name="OneWayService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

+        <service name="OneWayService">

+            <binding.jms>

+               <connectionFactory name="SomeConnectionFactory"/>

+               <destination name="SomeQueue"/>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
new file mode 100644
index 0000000000..adc7813bee
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
@@ -0,0 +1,58 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-responsecf/pom.xml b/tags/java/sca/1.5.1/itest/jms-responsecf/pom.xml
new file mode 100644
index 0000000000..dcdb1bafe5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-responsecf</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Response ConnectionFactory</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-policy</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>         
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..1f310e0685
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
new file mode 100644
index 0000000000..28b281a0c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..2c6d9d0d17
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-responsecf/src/main/resources/cf/client.composite b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/cf/client.composite
new file mode 100644
index 0000000000..3e16e794cb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/cf/client.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SimpleClientComposite">

+

+    <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.5.1/itest/jms-responsecf/src/main/resources/cf/service.composite b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/cf/service.composite
new file mode 100644
index 0000000000..9a13b0cb0e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/cf/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SimpleServiceComposite">

+

+    <component name="HelloWorldService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

+        <service name="HelloWorldService">

+            <binding.jms>

+               <destination name="DestQueueA"/>

+               <response>

+                  <connectionFactory name="ResponseCF"/>

+               </response>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..a41e42950e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/jndi.properties
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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, ResponseCF

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+queue.DestQueueA = RequestQueue

+queue.RespQueueA = 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.5.1/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/tags/java/sca/1.5.1/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
new file mode 100644
index 0000000000..fd7b167963
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
@@ -0,0 +1,53 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 response ConnectionFactory

+ */

+public class ResponseCFTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain =

+            SCADomain.newInstance("http://localhost", "/", "cf/client.composite", "cf/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() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/pom.xml b/tags/java/sca/1.5.1/itest/jms-selectors/pom.xml
new file mode 100644
index 0000000000..9d3c8383d3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-selectors</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Tests For Selectors</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+              a temporary queue name -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.1.0</version>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
new file mode 100644
index 0000000000..0ad6440593
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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(SelectorService.class)

+public class ClientImpl implements SelectorService {

+

+    private SelectorService serviceA;

+

+    @Reference

+    public void setServiceA(SelectorService service) {

+        this.serviceA = service;

+    }

+

+    public void sayHello(String name) {

+        serviceA.sayHello(name);

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
new file mode 100644
index 0000000000..f26a3ce68b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 SelectorService {

+    

+    @OneWay

+    void sayHello(String name);

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
new file mode 100644
index 0000000000..fb53c877e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
@@ -0,0 +1,40 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 java.util.ArrayList;

+import java.util.List;

+

+public class SelectorServiceImpl1 implements SelectorService {

+

+    public static Object lock = new Object();

+    public static List<String> names = new ArrayList<String>();

+    

+    public void sayHello(String name) {

+        System.out.println("SelectorServiceImpl1 " + name);

+        SelectorServiceImpl1.names.add(name);

+        if (names.size() == 2) {

+            synchronized (SelectorServiceImpl1.lock) {

+                SelectorServiceImpl1.lock.notify();

+            }

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
new file mode 100644
index 0000000000..1bbaf5d6f4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 SelectorServiceImpl2 implements SelectorService {

+

+    public static Object lock = new Object();

+    public static String name;

+    

+    public void sayHello(String name) {

+        if (SelectorServiceImpl2.name != null) {

+            throw new IllegalStateException("name already set");

+        }

+        System.out.println("SelectorServiceImpl2 " + name);

+        SelectorServiceImpl2.name = name;

+        synchronized (SelectorServiceImpl2.lock) {

+            SelectorServiceImpl2.lock.notify();

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
new file mode 100644
index 0000000000..4bdc4edcb5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 SelectorServiceImpl3 implements SelectorService {

+

+    public static Object lock = new Object();

+    public static String name;

+    

+    public void sayHello(String name) {

+        if (SelectorServiceImpl3.name != null) {

+            throw new IllegalStateException("name already set");

+        }

+        System.out.println("SelectorServiceImpl3 " + name);

+        SelectorServiceImpl3.name = name;

+        synchronized (SelectorServiceImpl3.lock) {

+            SelectorServiceImpl3.lock.notify();

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
new file mode 100644
index 0000000000..2b2c5d571a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsdefault;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String name);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..9ab8221417
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsdefault;
+
+import org.osoa.sca.annotations.Reference;
+
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldService helloWorldService1;
+    
+    @Reference
+    protected HelloWorldService helloWorldService2;
+    
+    public String getGreetings(String name){
+        return helloWorldService1.getGreetingsOne(name) + " " +
+               helloWorldService1.getGreetingsTwo(name) + " " +
+               helloWorldService2.getGreetingsOne(name) + " " +
+               helloWorldService1.getGreetingsThree(name);
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
new file mode 100644
index 0000000000..c7bdba492f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsdefault;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+    public String getGreetingsOne(String name);
+    
+    public String getGreetingsTwo(String name);
+    
+    public String getGreetingsThree(String name);
+    
+    public String getGreetingsFour(String name);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..b2df9137c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsdefault;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    public String getGreetingsOne(String name){
+        String response =  "Hello One " + name;
+        System.out.println("getGreetingsOne: " + response);
+        return response;
+    }
+ 
+    public String getGreetingsTwo(String name){
+        String response =  "Hello Two " + name;
+        System.out.println("getGreetingsTwo: " + response);
+        return response;
+    }
+    
+    public String getGreetingsThree(String name){
+        String response =  "Hello Three " + name;
+        System.out.println("getGreetingsThree: " + response);
+        return response;
+    }
+    
+    public String getGreetingsFour(String name){
+        String response =  "Hello Four " + name;
+        System.out.println("getGreetingsFour: " + response);
+        return response;
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
new file mode 100644
index 0000000000..573ae8d068
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsuserprop;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldReference {
+
+    public String getGreetings(String name);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
new file mode 100644
index 0000000000..744612bc14
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsuserprop;
+
+import org.osoa.sca.annotations.Reference;
+
+
+public class HelloWorldReferenceImpl implements HelloWorldReference {
+    
+    @Reference
+    protected HelloWorldService helloWorldService1;
+    
+    
+    public String getGreetings(String name){
+        return helloWorldService1.getGreetingsOne(name) + " " +
+               helloWorldService1.getGreetingsTwo(name) + " " +
+               helloWorldService1.getGreetingsThree(name);
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
new file mode 100644
index 0000000000..7dca243bdf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsuserprop;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+    public String getGreetingsOne(String name);
+    
+    public String getGreetingsTwo(String name);
+    
+    public String getGreetingsThree(String name);
+    
+    public String getGreetingsFour(String name);
+    
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..724de6ff7c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.operationselector.jmsuserprop;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    public String getGreetingsOne(String name){
+        String response =  "Hello One " + name;
+        System.out.println("getGreetingsOne: " + response);
+        return response;
+    }
+ 
+    public String getGreetingsTwo(String name){
+        String response =  "Hello Two " + name;
+        System.out.println("getGreetingsTwo: " + response);
+        return response;
+    }
+    
+    public String getGreetingsThree(String name){
+        String response =  "Hello Three " + name;
+        System.out.println("getGreetingsThree: " + response);
+        return response;
+    }
+    
+    public String getGreetingsFour(String name){
+        String response =  "Hello Four " + name;
+        System.out.println("getGreetingsFour: " + response);
+        return response;
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
new file mode 100644
index 0000000000..8f6994b843
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+            </binding.jms>
+        </reference> 
+        <reference name="helloWorldService2" >
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <operationProperties name="getGreetingsOne" >
+                  <headers>
+                     <property name="scaOperationName">getGreetingsThree</property>
+                  </headers>
+               </operationProperties>
+            </binding.jms>
+        </reference> 
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService1"/>
+                <operationProperties name="getGreetingsThree" nativeOperation="getGreetingsFour">
+                </operationProperties>
+            </binding.jms>
+        </service>
+    </component> 
+    
+    <component name="HelloWorldServiceComponent2">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <tuscany:operationSelector.jmsdefault/>
+            </binding.jms>
+        </service>
+    </component>     
+    
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
new file mode 100644
index 0000000000..1aa5444e17
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:hw="http://helloworld"
+    name="helloworld">
+
+    <component name="HelloWorldReferenceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldReferenceImpl" />
+        <reference name="helloWorldService1" >
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <operationProperties name="getGreetingsOne" >
+                  <headers>
+                     <property name="myProperty">getGreetingsOne</property>
+                  </headers>
+                </operationProperties>
+                <operationProperties name="getGreetingsTwo" >
+                  <headers>
+                     <property name="myProperty">getGreetingsThree</property>
+                  </headers>
+                </operationProperties>               
+                <operationProperties name="getGreetingsThree" >
+                  <headers>
+                     <property name="myProperty">getGreetingsTwo</property>
+                  </headers>
+                </operationProperties>
+            </binding.jms>
+        </reference> 
+    </component>
+    
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldServiceImpl" />
+        <service name="HelloWorldService">
+            <binding.jms>
+                <destination name="HelloWorldService2"/>
+                <operationProperties name="getGreetingsThree" nativeOperation="getGreetingsFour">
+                </operationProperties>
+                <tuscany:operationSelector.jmsUserProp propertyName="myProperty"/>
+            </binding.jms>
+        </service>
+    </component>     
+    
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..bb431a592b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jndi.properties
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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&broker.useJmx=false

+

+# use the following property to specify the JNDI name the connection factory

+# should appear as. 

+#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

+connectionFactoryNames = ConnectionFactory, ConnectionFactory2

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+

+# register some topics in JNDI using the form

+# topic.[jndiName] = [physicalName]

+#topic.MyTopic = example.MyTopic

+topic.ServiceTopic = ServiceTopic

+

+# END SNIPPET: jndi

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/selectors/selectors.composite
new file mode 100644
index 0000000000..83fb50531b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/selectors/selectors.composite
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           xmlns:itest="http://jms"

+           name="DefinitionsTests">

+

+    <component name="Client1">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

+        <reference name="serviceA">

+           <binding.jms uri="jms:ServiceTopic" >

+              <headers JMSType="type1" />

+           </binding.jms>

+        </reference>

+    </component>

+

+    <component name="Client2">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

+        <reference name="serviceA">

+           <binding.jms uri="jms:ServiceTopic" >

+              <headers JMSType="type2" />

+           </binding.jms>

+        </reference>

+    </component>

+

+    <component name="Service1">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl1"/>

+        <service name="SelectorService">

+            <binding.jms uri="jms:ServiceTopic" />

+        </service> 

+    </component>       

+

+    <component name="Service2">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl2"/>

+        <service name="SelectorService">

+            <binding.jms uri="jms:ServiceTopic" >

+               <SubscriptionHeaders JMSSelector="JMSType = 'type1'"/>

+            </binding.jms>

+        </service> 

+    </component>       

+

+    <component name="Service3">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl3"/>

+        <service name="SelectorService">

+            <binding.jms uri="jms:ServiceTopic" >

+               <SubscriptionHeaders JMSSelector="JMSType = 'type2'"/>

+            </binding.jms>

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
new file mode 100644
index 0000000000..46ca6b9844
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.binding.jms.operationselector.jmsdefault.HelloWorldReference;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 OperationselectorJMSDefaultTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmsdefault/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldReference = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        assertEquals("Hello One Fred Bloggs Hello Two Fred Bloggs Hello Three Fred Bloggs Hello Four Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs"));
+        
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
new file mode 100644
index 0000000000..c9cf1a80c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.binding.jms.operationselector.jmsdefault.HelloWorldReference;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 OperationselectorJMSUserPropTestCase {
+
+    private static SCANode node;
+
+    @Before
+    public void init() {
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("jmsuserprop/helloworld.composite", 
+                                     new SCAContribution("test", "./target/classes"));
+
+        node.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldReference helloWorldReference = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        
+        assertEquals("Hello One Fred Bloggs Hello Four Fred Bloggs Hello Two Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs"));
+        
+    }
+
+    @After
+    public void end() {
+        if (node != null) {
+            node.stop();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
new file mode 100644
index 0000000000..ea548c22e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
@@ -0,0 +1,75 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+/**

+ */

+public class SelectorsTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite");

+    }

+

+    @Test

+    public void testSayHello() throws Exception {

+        SelectorService client1 = scaDomain.getService(SelectorService.class, "Client1");

+        SelectorService client2 = scaDomain.getService(SelectorService.class, "Client2");

+

+        client1.sayHello("petra");

+        client2.sayHello("beate");

+

+        // wait for up to 5 seconds but should wake up as soon as done

+        synchronized(SelectorServiceImpl2.lock) {

+            if (SelectorServiceImpl2.name == null) {

+                SelectorServiceImpl2.lock.wait(5000);

+            }

+        }

+        synchronized(SelectorServiceImpl3.lock) {

+            if (SelectorServiceImpl3.name == null) {

+                SelectorServiceImpl3.lock.wait(5000);

+            }

+        }

+        synchronized(SelectorServiceImpl1.lock) {

+            if (SelectorServiceImpl1.names.size() != 2) {

+                SelectorServiceImpl1.lock.wait(5000);

+            }

+        }

+

+        assertEquals("petra", SelectorServiceImpl2.name);

+        assertEquals("beate", SelectorServiceImpl3.name);

+        assertEquals(2, SelectorServiceImpl1.names.size());

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-topics/pom.xml b/tags/java/sca/1.5.1/itest/jms-topics/pom.xml
new file mode 100644
index 0000000000..75a20511fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-topics</artifactId>
+    <name>Apache Tuscany SCA JMS Tests for topics</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+              a temporary queue name -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.1.0</version>
+            <scope>test</scope>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
new file mode 100644
index 0000000000..4d00d2df0d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
@@ -0,0 +1,41 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
new file mode 100644
index 0000000000..377f227ceb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
new file mode 100644
index 0000000000..0036391696
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
@@ -0,0 +1,34 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/jms-topics/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..9888d5843b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/jndi.properties
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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&broker.useJmx=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]

+

+# register some topics in JNDI using the form

+# topic.[jndiName] = [physicalName]

+#topic.MyTopic = example.MyTopic

+topic.MyTopic = example.MyTopic

+

+# END SNIPPET: jndi

diff --git a/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsClient.composite b/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
new file mode 100644
index 0000000000..cf876932d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="TopicsClientComposite">

+

+    <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="MyTopic" type="topic" create="never"/>

+        </binding.jms>  

+    </reference>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsService.composite b/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsService.composite
new file mode 100644
index 0000000000..2f2678ab0b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsService.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="OneWayServiceComposite">

+

+    <component name="OneWayService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

+        <service name="OneWayService">

+            <binding.jms>

+               <destination name="MyTopic" type="topic" create="never"/>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/tags/java/sca/1.5.1/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
new file mode 100644
index 0000000000..f0b7537bcc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
@@ -0,0 +1,58 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 TopicsTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "topics/TopicsClient.composite", "topics/TopicsService.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.5.1/itest/jms-ttl/pom.xml b/tags/java/sca/1.5.1/itest/jms-ttl/pom.xml
new file mode 100644
index 0000000000..09a51705aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-ttl/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-ttl</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Time To Live</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+              a temporary queue name -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.1.0</version>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
new file mode 100644
index 0000000000..336fecf67b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
@@ -0,0 +1,904 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest;

+

+import java.io.Serializable;

+import java.util.Enumeration;

+import java.util.Hashtable;

+

+import javax.jms.BytesMessage;

+import javax.jms.Connection;

+import javax.jms.ConnectionConsumer;

+import javax.jms.ConnectionFactory;

+import javax.jms.ConnectionMetaData;

+import javax.jms.Destination;

+import javax.jms.ExceptionListener;

+import javax.jms.JMSException;

+import javax.jms.MapMessage;

+import javax.jms.Message;

+import javax.jms.MessageConsumer;

+import javax.jms.MessageListener;

+import javax.jms.MessageProducer;

+import javax.jms.ObjectMessage;

+import javax.jms.Queue;

+import javax.jms.QueueBrowser;

+import javax.jms.ServerSessionPool;

+import javax.jms.Session;

+import javax.jms.StreamMessage;

+import javax.jms.TemporaryQueue;

+import javax.jms.TemporaryTopic;

+import javax.jms.TextMessage;

+import javax.jms.Topic;

+import javax.jms.TopicSubscriber;

+import javax.naming.Binding;

+import javax.naming.Context;

+import javax.naming.Name;

+import javax.naming.NameClassPair;

+import javax.naming.NameParser;

+import javax.naming.NamingEnumeration;

+import javax.naming.NamingException;

+

+/**

+ * Some classes that mock up various JMS interfaces with the end result

+ * of having the Time-To-Live value set on the static timeToLive 

+ * 

+ * This class is referenced from the AMQ jndi.properties file

+ */

+public class MockInitialContextFactory extends org.apache.activemq.jndi.ActiveMQInitialContextFactory{

+    

+    public static Object lock = new Object();

+    public static Long timeToLive;

+

+    public Context getInitialContext(Hashtable environment) throws NamingException {

+        return new Context() {

+

+            public Object addToEnvironment(String propName, Object propVal) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public void bind(Name name, Object obj) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public void bind(String name, Object obj) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public void close() throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public Name composeName(Name name, Name prefix) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public String composeName(String name, String prefix) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public Context createSubcontext(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public Context createSubcontext(String name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public void destroySubcontext(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public void destroySubcontext(String name) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public Hashtable<?, ?> getEnvironment() throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public String getNameInNamespace() throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public NameParser getNameParser(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public NameParser getNameParser(String name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public NamingEnumeration<NameClassPair> list(String name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public NamingEnumeration<Binding> listBindings(String name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public Object lookup(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public Object lookup(String name) throws NamingException {

+                if (name.endsWith("ConnectionFactory")) {

+                    return new ConnectionFactory() {

+                        public Connection createConnection() throws JMSException {

+                            return new Connection(){

+

+                                public void close() throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    

+                                }

+

+                                public ConnectionConsumer createConnectionConsumer(Destination arg0,

+                                                                                   String arg1,

+                                                                                   ServerSessionPool arg2,

+                                                                                   int arg3) throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    return null;

+                                }

+

+                                public ConnectionConsumer createDurableConnectionConsumer(Topic arg0,

+                                                                                          String arg1,

+                                                                                          String arg2,

+                                                                                          ServerSessionPool arg3,

+                                                                                          int arg4) throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    return null;

+                                }

+

+                                public Session createSession(boolean arg0, int arg1) throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    return new Session() {

+

+                                        public void close() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            

+                                        }

+

+                                        public void commit() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            

+                                        }

+

+                                        public QueueBrowser createBrowser(Queue arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public QueueBrowser createBrowser(Queue arg0, String arg1) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public BytesMessage createBytesMessage() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return new BytesMessage() {

+

+                                                public long getBodyLength() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public boolean readBoolean() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return false;

+                                                }

+

+                                                public byte readByte() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public int readBytes(byte[] arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public int readBytes(byte[] arg0, int arg1) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public char readChar() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public double readDouble() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public float readFloat() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public int readInt() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public long readLong() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public short readShort() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public String readUTF() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public int readUnsignedByte() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public int readUnsignedShort() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public void reset() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeBoolean(boolean arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeByte(byte arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeBytes(byte[] arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeBytes(byte[] arg0, int arg1, int arg2)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeChar(char arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeDouble(double arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeFloat(float arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeInt(int arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeLong(long arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeObject(Object arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeShort(short arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void writeUTF(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void acknowledge() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void clearBody() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void clearProperties() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public boolean getBooleanProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return false;

+                                                }

+

+                                                public byte getByteProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public double getDoubleProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public float getFloatProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public int getIntProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public String getJMSCorrelationID() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public byte[] getJMSCorrelationIDAsBytes() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public int getJMSDeliveryMode() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public Destination getJMSDestination() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public long getJMSExpiration() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public String getJMSMessageID() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public int getJMSPriority() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public boolean getJMSRedelivered() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return false;

+                                                }

+

+                                                public Destination getJMSReplyTo() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public long getJMSTimestamp() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public String getJMSType() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public long getLongProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public Object getObjectProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public Enumeration getPropertyNames() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public short getShortProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public String getStringProperty(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public boolean propertyExists(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return false;

+                                                }

+

+                                                public void setBooleanProperty(String arg0, boolean arg1)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setByteProperty(String arg0, byte arg1) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setDoubleProperty(String arg0, double arg1)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setFloatProperty(String arg0, float arg1)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setIntProperty(String arg0, int arg1) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSCorrelationID(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSCorrelationIDAsBytes(byte[] arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSDeliveryMode(int arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSDestination(Destination arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSExpiration(long arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSMessageID(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSPriority(int arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSRedelivered(boolean arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSReplyTo(Destination arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSTimestamp(long arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setJMSType(String arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setLongProperty(String arg0, long arg1) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setObjectProperty(String arg0, Object arg1)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setShortProperty(String arg0, short arg1)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setStringProperty(String arg0, String arg1)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }};

+                                        }

+

+                                        public MessageConsumer createConsumer(Destination arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public MessageConsumer createConsumer(Destination arg0, String arg1)

+                                            throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public MessageConsumer createConsumer(Destination arg0,

+                                                                              String arg1,

+                                                                              boolean arg2) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public TopicSubscriber createDurableSubscriber(Topic arg0, String arg1)

+                                            throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public TopicSubscriber createDurableSubscriber(Topic arg0,

+                                                                                       String arg1,

+                                                                                       String arg2,

+                                                                                       boolean arg3)

+                                            throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public MapMessage createMapMessage() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public Message createMessage() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public ObjectMessage createObjectMessage() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public ObjectMessage createObjectMessage(Serializable arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public MessageProducer createProducer(Destination arg0) throws JMSException {

+                                            return  new MessageProducer() {

+

+                                                public void close() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public int getDeliveryMode() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public Destination getDestination() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return null;

+                                                }

+

+                                                public boolean getDisableMessageID() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return false;

+                                                }

+

+                                                public boolean getDisableMessageTimestamp() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return false;

+                                                }

+

+                                                public int getPriority() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public long getTimeToLive() throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    return 0;

+                                                }

+

+                                                public void send(Message arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void send(Destination arg0, Message arg1) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void send(Message arg0, int arg1, int arg2, long arg3)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void send(Destination arg0,

+                                                                 Message arg1,

+                                                                 int arg2,

+                                                                 int arg3,

+                                                                 long arg4) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setDeliveryMode(int arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setDisableMessageID(boolean arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setDisableMessageTimestamp(boolean arg0)

+                                                    throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setPriority(int arg0) throws JMSException {

+                                                    // TODO Auto-generated method stub

+                                                    

+                                                }

+

+                                                public void setTimeToLive(long arg0) throws JMSException {

+                                                    MockInitialContextFactory.timeToLive = Long.valueOf(arg0);

+                                                    synchronized(MockInitialContextFactory.lock) {

+                                                        MockInitialContextFactory.lock.notifyAll();

+                                                    }

+                                                }};

+                                        }

+

+                                        public Queue createQueue(String arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public StreamMessage createStreamMessage() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public TemporaryQueue createTemporaryQueue() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public TemporaryTopic createTemporaryTopic() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public TextMessage createTextMessage() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public TextMessage createTextMessage(String arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public Topic createTopic(String arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public int getAcknowledgeMode() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return 0;

+                                        }

+

+                                        public MessageListener getMessageListener() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return null;

+                                        }

+

+                                        public boolean getTransacted() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            return false;

+                                        }

+

+                                        public void recover() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            

+                                        }

+

+                                        public void rollback() throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            

+                                        }

+

+                                        public void run() {

+                                            // TODO Auto-generated method stub

+                                            

+                                        }

+

+                                        public void setMessageListener(MessageListener arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            

+                                        }

+

+                                        public void unsubscribe(String arg0) throws JMSException {

+                                            // TODO Auto-generated method stub

+                                            

+                                        }};

+                                }

+

+                                public String getClientID() throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    return null;

+                                }

+

+                                public ExceptionListener getExceptionListener() throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    return null;

+                                }

+

+                                public ConnectionMetaData getMetaData() throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    return null;

+                                }

+

+                                public void setClientID(String arg0) throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    

+                                }

+

+                                public void setExceptionListener(ExceptionListener arg0) throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    

+                                }

+

+                                public void start() throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    

+                                }

+

+                                public void stop() throws JMSException {

+                                    // TODO Auto-generated method stub

+                                    

+                                }};

+                        }

+                        public Connection createConnection(String arg0, String arg1) throws JMSException {

+                            return null;

+                        }};

+                } else {

+                    return new Queue(){

+                        public String getQueueName() throws JMSException {

+                            return null;

+                        }};

+                }

+            }

+

+            public Object lookupLink(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public Object lookupLink(String name) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public void rebind(Name name, Object obj) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public void rebind(String name, Object obj) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public Object removeFromEnvironment(String propName) throws NamingException {

+                // TODO Auto-generated method stub

+                return null;

+            }

+

+            public void rename(Name oldName, Name newName) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public void rename(String oldName, String newName) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public void unbind(Name name) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }

+

+            public void unbind(String name) throws NamingException {

+                // TODO Auto-generated method stub

+                

+            }};

+    }

+    

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
new file mode 100644
index 0000000000..0819e8474f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 ClientIface {

+

+    @OneWay

+    void sayHello(String s);

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
new file mode 100644
index 0000000000..4467d91f0d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
@@ -0,0 +1,39 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+/**

+ * This class implements the OneWay service.

+ */

+public class ClientImpl implements ClientIface {

+

+    private ClientIface serviceA;

+

+    @Reference

+    public void setServiceA(ClientIface service) {

+        this.serviceA = service;

+    }

+

+    public void sayHello(String name) {

+        serviceA.sayHello(name);

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..040ec282d7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/jndi.properties
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------

+## Licensed to the Apache Software Foundation (ASF) under one or more

+## contributor license agreements.  See the NOTICE file distributed with

+## this work for additional information regarding copyright ownership.

+## The ASF licenses this file to You under the Apache License, Version 2.0

+## (the "License"); you may not use this file except in compliance with

+## the License.  You may obtain a copy of the License at

+## 

+## http://www.apache.org/licenses/LICENSE-2.0

+## 

+## Unless required by applicable law or agreed to in writing, software

+## distributed under the License is distributed on an "AS IS" BASIS,

+## WITHOUT 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 = itest.MockInitialContextFactory

+

+# use the following property to configure the default connector

+java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false

+

+# use the following property to specify the JNDI name the connection factory

+# should appear as. 

+#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

+connectionFactoryNames = ConnectionFactory, ConnectionFactory2

+

+# register some queues in JNDI using the form

+# queue.[jndiName] = [physicalName]

+

+# register some topics in JNDI using the form

+# topic.[jndiName] = [physicalName]

+#topic.MyTopic = example.MyTopic

+topic.ServiceTopic = ServiceTopic

+

+# END SNIPPET: jndi

diff --git a/tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/ttl.composite b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/ttl.composite
new file mode 100644
index 0000000000..9065148c0f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/ttl.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           xmlns:itest="http://jms"

+           name="DefinitionsTests">

+

+    <component name="Client1">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

+        <reference name="serviceA">

+           <interface.java interface="org.apache.tuscany.sca.binding.jms.ClientIface" />

+           <binding.jms >

+               <destination name="dynamic/MyService"/>

+               <headers JMSTimeToLive="123" />

+           </binding.jms>

+        </reference>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/tags/java/sca/1.5.1/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
new file mode 100644
index 0000000000..70b945798b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
@@ -0,0 +1,63 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.assertNotNull;

+import itest.MockInitialContextFactory;

+

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

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ */

+public class TTLTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "ttl.composite");

+    }

+

+    @Test

+    public void testSayHello() throws Exception {

+        ClientIface client1 = scaDomain.getService(ClientIface.class, "Client1");

+

+        client1.sayHello("petra");

+

+        synchronized(MockInitialContextFactory.lock) {

+            if (MockInitialContextFactory.timeToLive == null) {

+                MockInitialContextFactory.lock.wait(1000);

+            }

+        }

+

+        assertNotNull(MockInitialContextFactory.timeToLive);

+        assertEquals(123, MockInitialContextFactory.timeToLive.longValue());

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/pom.xml b/tags/java/sca/1.5.1/itest/jms/pom.xml
new file mode 100644
index 0000000000..35dcfb47a5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms</artifactId>
+    <name>Apache Tuscany SCA iTest JMS</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.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-policy</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>         
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
new file mode 100644
index 0000000000..7b1c63d437
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
new file mode 100644
index 0000000000..19b584950a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 CheckedExcpetion2Args extends Exception {

+    private static final long serialVersionUID = 1L;

+

+    public CheckedExcpetion2Args(String s, Throwable e) {

+        super(s, e);

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
new file mode 100644
index 0000000000..b12e3a562e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 CheckedExcpetionChained extends Exception {

+    private static final long serialVersionUID = 1L;

+

+    public CheckedExcpetionChained(Throwable e) {

+        super(e);

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
new file mode 100644
index 0000000000..b23db73c01
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 CheckedExcpetionNoArgs extends Exception {

+    private static final long serialVersionUID = 1L;

+

+    public CheckedExcpetionNoArgs() {

+        super();

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
new file mode 100644
index 0000000000..4351b17cd6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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 throwCheckedNoArgs() throws CheckedExcpetionNoArgs;
+    public void throwChecked2Args() throws CheckedExcpetion2Args;
+    public void throwCheckedChained() throws CheckedExcpetionChained;
+
+    public void throwUnChecked();
+}
diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
new file mode 100644
index 0000000000..cb244a5160
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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 throwChecked2Args() throws CheckedExcpetion2Args {
+        service.throwChecked2Args();
+    }
+
+    public void throwCheckedChained() throws CheckedExcpetionChained {
+        service.throwCheckedChained();
+    }
+
+    public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
+        service.throwCheckedNoArgs();
+    }
+
+    public void throwUnChecked() {
+        service.throwUnChecked();
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
new file mode 100644
index 0000000000..40780709f4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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 throwChecked2Args() throws CheckedExcpetion2Args {
+        throw new CheckedExcpetion2Args("foo", new Exception("bla"));
+    }
+
+    public void throwCheckedChained() throws CheckedExcpetionChained {
+        throw new CheckedExcpetionChained(new Exception("bla"));
+    }
+
+    public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
+        throw new CheckedExcpetionNoArgs();
+    }
+
+    public void throwUnChecked() {
+        throw new RuntimeException("bla");
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..86d4719646
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
new file mode 100644
index 0000000000..abb29aec4c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..21d2de2cf0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
new file mode 100644
index 0000000000..d4cd5df431
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+

+/**

+ * The client interface

+ */

+public interface JMSClient {

+

+    void aClientMethod();

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
new file mode 100644
index 0000000000..464072b42d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+

+/**

+ * The client interface

+ */

+public interface MsgClient {

+

+    void aClientMethod();

+    void op2();

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
new file mode 100644
index 0000000000..b4d1cbccda
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+@Service(MsgClient.class)

+public class MsgClientImpl implements MsgClient {

+

+    @Reference protected MsgClientService myService;

+

+    public void aClientMethod() {

+        myService.aClientMethod();

+    }

+

+    public void op2() {

+        myService.op2();

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
new file mode 100644
index 0000000000..e8242467cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+

+

+/**

+ * The client interface

+ */

+@Remotable

+public interface MsgClientService {

+

+    void aClientMethod();

+

+    void op2();

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
new file mode 100644
index 0000000000..d376d74295
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.AllowsPassByReference;

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

+

+

+@Remotable 

+@AllowsPassByReference

+public interface MsgService {

+    

+    void onMessage(javax.jms.Message msg);

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
new file mode 100644
index 0000000000..142343e349
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
@@ -0,0 +1,39 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 org.osoa.sca.annotations.Service;

+

+@Service(MsgService.class)

+public class MsgServiceImpl implements MsgService {

+

+    public static Object lock = new Object();

+    public static Message msg;

+    

+    public void onMessage(Message msg) {

+        MsgServiceImpl.msg = msg;

+        synchronized(lock) {

+            lock.notifyAll();

+        }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
new file mode 100644
index 0000000000..218cccf64c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
new file mode 100644
index 0000000000..9795089952
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
new file mode 100644
index 0000000000..25a89fc5b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
new file mode 100644
index 0000000000..f16f853ba7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
new file mode 100644
index 0000000000..bff4536fa0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
new file mode 100644
index 0000000000..cdf9bef93f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.TextMessageProcessor;
+
+public class TestMessageProcessor extends TextMessageProcessor {
+
+    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.5.1/itest/jms/src/main/resources/defaults/client.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/defaults/client.composite
new file mode 100644
index 0000000000..991b0cf11b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/defaults/client.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="DefaultClientComposite">

+

+    <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.5.1/itest/jms/src/main/resources/defaults/service.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/defaults/service.composite
new file mode 100644
index 0000000000..3f299bc787
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/defaults/service.composite
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="DefaultServiceComposite">

+

+    <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.5.1/itest/jms/src/main/resources/dynamic/client.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/dynamic/client.composite
new file mode 100644
index 0000000000..afa4135f1d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/dynamic/client.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="DynamicComposite">

+

+    <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.5.1/itest/jms/src/main/resources/exceptions/client.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/exceptions/client.composite
new file mode 100644
index 0000000000..8bb7f86252
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/exceptions/client.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/jms/src/main/resources/exceptions/service.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/exceptions/service.composite
new file mode 100644
index 0000000000..052ff9d985
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/exceptions/service.composite
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/jms/src/main/resources/external/client.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/external/client.composite
new file mode 100644
index 0000000000..7a0013be4d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/external/client.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="ExternalClientComposite">

+

+    <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.5.1/itest/jms/src/main/resources/external/service.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/external/service.composite
new file mode 100644
index 0000000000..b9f33e5afc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/external/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="ExternalServiceComposite">

+

+    <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.5.1/itest/jms/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/jms/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..9abdff215d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/jndi.properties
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+## 
+## http://www.apache.org/licenses/LICENSE-2.0
+## 
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT 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.5.1/itest/jms/src/main/resources/nonSCAclient/service.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/nonSCAclient/service.composite
new file mode 100644
index 0000000000..ea821c347b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/nonSCAclient/service.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="ServiceComposite">

+

+    <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:61623"

+                         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:61623"

+                         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:61623"

+                         messageProcessor="ObjectMessage"

+                         uri="jms:ObjectDest" />

+        </service>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/oneway/OneWayClient.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/oneway/OneWayClient.composite
new file mode 100644
index 0000000000..bed0663f58
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/oneway/OneWayClient.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="OneWayClientComposite">

+

+    <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.5.1/itest/jms/src/main/resources/oneway/OneWayService.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/oneway/OneWayService.composite
new file mode 100644
index 0000000000..3d08de7d51
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/oneway/OneWayService.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="OneWayServiceComposite">

+

+    <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.5.1/itest/jms/src/main/resources/policyHeaders/definitions.xml b/tags/java/sca/1.5.1/itest/jms/src/main/resources/policyHeaders/definitions.xml
new file mode 100644
index 0000000000..dd4350c6fe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/policyHeaders/definitions.xml
@@ -0,0 +1,54 @@
+<?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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ 			 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
+
+    <policySet name="JMSPolicySet1"
+               provides="priority"
+               appliesTo="sca:binding.jms">
+        <intentMap provides="priority" default="medium">
+            <qualifier name="high">
+                <tuscany:jmsHeader JMSPriority="9"/>
+            </qualifier>
+            <qualifier name="medium">
+                <tuscany:jmsHeader JMSPriority="4"/>
+            </qualifier>
+            <qualifier name="low">
+                <tuscany:jmsHeader JMSPriority="0"/>
+            </qualifier>
+        </intentMap>
+    </policySet>
+    
+    <policySet name="JMSPolicySet2"
+               provides="deliveryMode"
+               appliesTo="sca:binding.jms">
+        <intentMap provides="deliveryMode" default="nonPersistent">
+            <qualifier name="persistent">
+                <tuscany:jmsHeader JMSDeliveryMode="PERSISTENT"/>
+            </qualifier>
+            <qualifier name="nonPersistent">
+                <tuscany:jmsHeader JMSDeliveryMode="NON_PERSISTENT"/>
+            </qualifier>
+        </intentMap>
+    </policySet>    
+
+</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
new file mode 100644
index 0000000000..8902f1d32a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"
+           name="PropertiesClientComposite">
+
+    <component name="ClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
+        <reference name="myService" requires="priority.medium">
+            <binding.jms uri="jms:ServiceQueue">
+               <headers JMSType="myType"
+                        JMSCorrelationID="xyz"
+                        JMSDeliveryMode="PERSISTENT"
+                        JMSTimeToLive="4321"	
+                        JMSPriority="7">
+                  <property name="headP1">myHeadP1</property>    
+               </headers>
+            </binding.jms>
+        </reference>
+    </component>
+
+    <component name="ServiceComponent">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
+        <service name="MsgService">
+            <binding.jms uri="jms:ServiceQueue"/>
+        </service>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/properties/properties.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/properties/properties.composite
new file mode 100644
index 0000000000..3678356d3b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/properties/properties.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://jms"

+           name="PropertiesClientComposite">

+

+    <component name="ClientComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />

+        <reference name="myService">

+            <binding.jms uri="jms:ServiceQueue">

+               <headers JMSType="myType"

+                        JMSCorrelationID="xyz"

+                        JMSDeliveryMode="PERSISTENT"

+                        JMSTimeToLive="4321"	

+                        JMSPriority="7">

+                  <property name="headP1">myHeadP1</property>    

+               </headers>

+               <operationProperties name="op2" nativeOperation="nativeOp2">

+                  <headers JMSType="op2Type"

+                     JMSCorrelationID="op2CID"

+                     JMSDeliveryMode="NON_PERSISTENT"

+                     JMSTimeToLive="6000"

+                     JMSPriority="8">

+                     <property name="op2P2">foo</property>

+                  </headers>

+               </operationProperties>

+            </binding.jms>

+        </reference>

+    </component>

+

+    <component name="ServiceComponent">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />

+        <service name="MsgService">

+            <binding.jms uri="jms:ServiceQueue"/>

+        </service>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/client.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/client.composite
new file mode 100644
index 0000000000..6454370419
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/client.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SimpleClientComposite">

+

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

+            </destination>

+            <response>

+               <destination name="RespQueueA"/>

+            </response>

+        </binding.jms>  

+    </reference>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpclient.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpclient.composite
new file mode 100644
index 0000000000..5389c427dc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpclient.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="MPClientComposite">

+

+    <component name="HelloWorldClientMP">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

+        <reference name="serviceA" />

+    </component>

+

+    <reference name="serviceMP" promote="HelloWorldClientMP/serviceA">

+        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

+        <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">

+            <destination name="DestQueueMP"/>

+            <response>

+               <destination name="RespQueueMP"/>

+            </response>

+        </binding.jms>  

+    </reference>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpservice.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpservice.composite
new file mode 100644
index 0000000000..6d0d11f4b6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpservice.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="MPServiceComposite">
+
+    <component name="HelloWorldServiceMP">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
+        <service name="HelloWorldService">
+            <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
+               <destination name="DestQueueMP" create="always"> 
+               </destination>
+               <response>
+                  <destination name="RespQueueMP" create="always"/>
+               </response>
+            </binding.jms>  
+        </service> 
+    </component>       
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/service.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/service.composite
new file mode 100644
index 0000000000..4dfdb5f27d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SimpleServiceComposite">

+

+    <component name="HelloWorldService">

+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

+        <service name="HelloWorldService">

+            <binding.jms>

+               <destination name="DestQueueA" create="always"> 

+               </destination>

+               <response>

+                  <destination name="RespQueueA" create="always"/>

+               </response>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/uriclient.composite b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/uriclient.composite
new file mode 100644
index 0000000000..83ef9c3c95
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/uriclient.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="URIClientComposite">

+

+    <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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
new file mode 100644
index 0000000000..dca9386637
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
new file mode 100644
index 0000000000..f4750e5453
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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/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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
new file mode 100644
index 0000000000..bd326b36d2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.assertNotNull;
+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 testCheckedNoArgs() {
+        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
+        try {
+            service.throwCheckedNoArgs();
+            fail();
+        } catch (CheckedExcpetionNoArgs e) {
+            // ok
+        }
+    }
+
+    @Test
+    public void testChecked2Args() {
+        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
+        try {
+            service.throwChecked2Args();
+            fail();
+        } catch (CheckedExcpetion2Args e) {
+            assertEquals("foo", e.getMessage());
+// FIXME: TUSCANY-2848: lost the cause!            
+//            assertNotNull(e.getCause());
+//            assertEquals("bla", e.getCause().getMessage());
+        }
+    }
+
+    @Test
+    public void testCheckedChained() {
+        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
+        try {
+            service.throwCheckedChained();
+            fail();
+        } catch (CheckedExcpetionChained e) {
+         // FIXME: TUSCANY-2848: lost the cause!            
+//            assertNotNull(e.getCause());
+//            assertEquals("bla", e.getCause().getMessage());
+        }
+    }
+
+    @Test
+    public void testUnChecked() {
+        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
+        try {
+            service.throwUnChecked();
+            fail();
+        } catch (Exception e) {
+            assertEquals("java.lang.RuntimeException: bla", e.getCause().getMessage());
+        }
+    }
+
+    @After
+    public void end() {
+        if (scaDomain != null) {
+            scaDomain.close();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
new file mode 100644
index 0000000000..c34ad07901
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
new file mode 100644
index 0000000000..44f9754e29
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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/mpservice.composite");
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClientMP");
+        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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
new file mode 100644
index 0000000000..d982e651cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.binding.jms.provider.JMSResourceFactoryImpl;
+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", "<ns2:sayHello xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><arg0>Petra</arg0></ns2:sayHello>");
+
+            // wait up to 10 seconds but it will likely be a lot less
+            // as the service invocation will wake this up earlier
+            if (OneWayServiceImpl.name == null) {
+                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:61623");
+        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 JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");
+        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 JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");
+        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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
new file mode 100644
index 0000000000..26dda13cf9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
new file mode 100644
index 0000000000..5e208a3081
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.assertNotNull;
+
+import javax.jms.DeliveryMode;
+import javax.jms.Message;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ */
+public class PolicyHeadersTestCase {
+
+    private static SCADomain scaDomain;
+
+    @Before
+    public void init() {
+        scaDomain = SCADomain.newInstance("http://localhost", "/", "policyHeaders/policyHeaders.composite");
+    }
+
+    @Test
+    public void testProps1() throws Exception {
+        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
+
+        client.aClientMethod();
+
+        // wait for up to 5 seconds but should wake up as soon as done
+        synchronized(MsgServiceImpl.lock) {
+            if (MsgServiceImpl.msg == null) {
+                MsgServiceImpl.lock.wait(5000); // For debugging set higher.
+            }
+        }
+        assertNotNull(MsgServiceImpl.msg);
+
+        assertEquals("myType", MsgServiceImpl.msg.getJMSType());
+        assertEquals("xyz", MsgServiceImpl.msg.getJMSCorrelationID());
+        assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
+        assertEquals(7, MsgServiceImpl.msg.getJMSPriority());
+        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
+    }
+
+    @Test
+    @Ignore
+    public void testOp2() throws Exception {
+        MsgClient client = scaDomain.getService(MsgClient.class, "ClientComponent");
+
+        client.op2();
+
+        // wait for up to 5 seconds but should wake up as soon as done
+        synchronized(MsgServiceImpl.lock) {
+            if (MsgServiceImpl.msg == null) {
+                MsgServiceImpl.lock.wait(5000);
+            }
+        }
+        assertNotNull(MsgServiceImpl.msg);
+
+        assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());
+        assertEquals("op2CID", MsgServiceImpl.msg.getJMSCorrelationID());
+        assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
+        assertEquals(3, MsgServiceImpl.msg.getJMSPriority());
+        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
+        assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));
+        assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));
+    }
+
+    @After
+    public void end() {
+        if (scaDomain != null) {
+            scaDomain.close();
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
new file mode 100644
index 0000000000..e38f9104c0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
@@ -0,0 +1,93 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.assertNotNull;

+

+import javax.jms.DeliveryMode;

+

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

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ */

+public class PropertiesTestCase {

+

+    private static SCADomain scaDomain;

+

+    @Before

+    public void init() {

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "properties/properties.composite");

+    }

+

+    @Test

+    public void testProps1() throws Exception {

+        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

+

+        client.aClientMethod();

+

+        // wait for up to 10 seconds but should wake up as soon as done

+        synchronized(MsgServiceImpl.lock) {

+            if (MsgServiceImpl.msg == null) {

+                MsgServiceImpl.lock.wait(10000);

+            }

+        }

+        assertNotNull(MsgServiceImpl.msg);

+

+        assertEquals("myType", MsgServiceImpl.msg.getJMSType());

+        assertEquals("xyz", MsgServiceImpl.msg.getJMSCorrelationID());

+        assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());

+        // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ

+        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));

+    }

+

+    @Test

+    public void testOp2() throws Exception {

+        MsgClient client = scaDomain.getService(MsgClient.class, "ClientComponent");

+

+        client.op2();

+

+        // wait for up to 10 seconds but should wake up as soon as done

+        synchronized(MsgServiceImpl.lock) {

+            if (MsgServiceImpl.msg == null) {

+                MsgServiceImpl.lock.wait(10000);

+            }

+        }

+        assertNotNull(MsgServiceImpl.msg);

+

+        assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());

+        assertEquals("op2CID", MsgServiceImpl.msg.getJMSCorrelationID());

+        // assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode()); // Doesn't seem to work with ActiveMQ

+        // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ

+        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));

+        assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));

+        //operation properties are a service side thing

+        //assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));

+    }

+

+    @After

+    public void end() {

+        if (scaDomain != null) {

+            scaDomain.close();

+        }

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
new file mode 100644
index 0000000000..c1882a1e26
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
new file mode 100644
index 0000000000..bed5515d7f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/late-reference-resolution/pom.xml b/tags/java/sca/1.5.1/itest/late-reference-resolution/pom.xml
new file mode 100644
index 0000000000..5e8c8a0aa6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-late-reference-resolution</artifactId>
+    <name>Apache Tuscany SCA iTest Late Reference Resolution</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-node-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>    
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher</artifactId>
+            <version>1.5.1</version>
+        </dependency>    
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.5.1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>                                        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-endpoint</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>   
+                
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>   
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/AddService.java
new file mode 100644
index 0000000000..d7dc4473ad
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/AddService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
new file mode 100644
index 0000000000..e9b7e254e5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
new file mode 100644
index 0000000000..031fa8b912
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..da869e00fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
new file mode 100644
index 0000000000..30d248208b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
new file mode 100644
index 0000000000..f7ac0b7287
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
new file mode 100644
index 0000000000..5290605938
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..b7dca792b2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
new file mode 100644
index 0000000000..78ab9c6ee0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
new file mode 100644
index 0000000000..1010207154
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
new file mode 100644
index 0000000000..c53b55aacf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT 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.5.1/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
new file mode 100644
index 0000000000..378d6e9706
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..db255e0232
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
new file mode 100644
index 0000000000..3fb16fa619
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..130157ac04
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
new file mode 100644
index 0000000000..c615b4355a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..cba0a5c281
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
new file mode 100644
index 0000000000..e4bd3035e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
new file mode 100644
index 0000000000..c6e0689837
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
new file mode 100644
index 0000000000..ebe834028d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode nodeA;
+    private static SCANode nodeB;
+    private static SCANode 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");
+
+            
+            SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
new file mode 100644
index 0000000000..57afc9ea50
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/oneway/build.xml b/tags/java/sca/1.5.1/itest/oneway/build.xml
new file mode 100644
index 0000000000..7ad0a4bd8c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/build.xml
@@ -0,0 +1,127 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1\tuscany-core-spi-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.5.1\tuscany-host-http-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.5.1\tuscany-binding-ws-axis2-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.5.1\tuscany-policy-1.5.1.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.5.1\tuscany-implementation-java-runtime-1.5.1.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.5.1\tuscany-contribution-namespace-1.5.1.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.5.1\tuscany-assembly-xsd-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.5.1\tuscany-assembly-1.5.1.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.5.1\tuscany-core-databinding-1.5.1.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.5.1\tuscany-policy-xml-1.5.1.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.5.1\tuscany-sca-api-1.5.1.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.5.1\tuscany-contribution-java-1.5.1.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.5.1\tuscany-databinding-1.5.1.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.5.1\tuscany-binding-ws-xml-1.5.1.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.5.1\tuscany-policy-security-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.5.1\tuscany-assembly-xml-1.5.1.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.5.1\tuscany-domain-1.5.1.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.5.1\tuscany-interface-java-1.5.1.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.5.1\tuscany-contribution-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.5.1\tuscany-implementation-java-1.5.1.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.5.1\tuscany-domain-api-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.5.1\tuscany-binding-sca-1.5.1.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.5.1\tuscany-host-jetty-1.5.1.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.5.1\tuscany-implementation-java-xml-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.5.1\tuscany-binding-sca-xml-1.5.1.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.5.1\tuscany-interface-wsdl-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.5.1\tuscany-binding-ws-1.5.1.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.5.1\tuscany-databinding-axiom-1.5.1.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.5.1\tuscany-core-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.5.1\tuscany-interface-wsdl-xml-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.5.1\tuscany-contribution-impl-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.5.1\tuscany-node-1.5.1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.5.1\tuscany-definitions-1.5.1.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.5.1\tuscany-host-embedded-1.5.1.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.5.1\tuscany-interface-java-xml-1.5.1.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.5.1\tuscany-interface-1.5.1.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.5.1/itest/oneway/pom.xml b/tags/java/sca/1.5.1/itest/oneway/pom.xml
new file mode 100644
index 0000000000..2bc884fd4a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-oneway</artifactId>
+    <name>Apache Tuscany SCA iTest OneWay</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+                
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
new file mode 100644
index 0000000000..04c6069dfe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
@@ -0,0 +1,40 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
new file mode 100644
index 0000000000..b3cec51b1f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
@@ -0,0 +1,47 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
new file mode 100644
index 0000000000..8013c5c0e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
@@ -0,0 +1,64 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
new file mode 100644
index 0000000000..01f956cb67
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
@@ -0,0 +1,68 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/tags/java/sca/1.5.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
new file mode 100644
index 0000000000..d053a6278c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/tags/java/sca/1.5.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
new file mode 100644
index 0000000000..c490150ec5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
@@ -0,0 +1,233 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+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 SCANode node;

+    

+    /**

+     * Initialise the SCADomain.

+     *

+     * @throws Exception Failed to initialise the SCADomain

+     */

+    @Before

+    public void setUp() throws Exception {

+        

+        SCANodeFactory nodeFactory = SCANodeFactory.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.5.1/itest/operation-overloading/pom.xml b/tags/java/sca/1.5.1/itest/operation-overloading/pom.xml
new file mode 100644
index 0000000000..adc87f7ced
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/operation-overloading/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-operation-overloading</artifactId>
+    <name>Apache Tuscany SCA iTest Operation Overloading</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
new file mode 100644
index 0000000000..85b5717c00
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
new file mode 100644
index 0000000000..e5d5083a2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
new file mode 100644
index 0000000000..e206a86768
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/operation-overloading/src/main/resources/OperationOverload.composite b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/resources/OperationOverload.composite
new file mode 100644
index 0000000000..cbf5aa2078
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/operation-overloading/src/main/resources/OperationOverload.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/tags/java/sca/1.5.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
new file mode 100644
index 0000000000..0b3b12c762
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
new file mode 100644
index 0000000000..82d536cbfe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/pom.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
new file mode 100644
index 0000000000..290c76469d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-contribution-classes</artifactId>
+    <name>Apache Tuscany SCA iTest OSGi Contribution Version 1 Classes</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.5.1</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.5</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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
new file mode 100644
index 0000000000..fba9a109b3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
new file mode 100644
index 0000000000..225dce0236
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..2b8c973e2c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
new file mode 100644
index 0000000000..a1c7fce60a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
new file mode 100644
index 0000000000..4647a716c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
new file mode 100644
index 0000000000..cc5d44d279
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
new file mode 100644
index 0000000000..1b7fb15bf1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
new file mode 100644
index 0000000000..e97331c06c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
new file mode 100644
index 0000000000..1e87d59af1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
new file mode 100644
index 0000000000..2d1bb68e5b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
new file mode 100644
index 0000000000..0f88cca213
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
new file mode 100644
index 0000000000..f55a068ede
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
new file mode 100644
index 0000000000..2514928c10
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
new file mode 100644
index 0000000000..c39a34cb96
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
new file mode 100644
index 0000000000..600f3f0c74
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
new file mode 100644
index 0000000000..0ba54b363a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
new file mode 100644
index 0000000000..6f1f6b8730
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
new file mode 100644
index 0000000000..4779eff514
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
new file mode 100644
index 0000000000..d505834f15
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
new file mode 100644
index 0000000000..6bcf6cef0a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..210a68011f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
new file mode 100644
index 0000000000..e23e1a2ecd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
new file mode 100644
index 0000000000..9832da880e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
new file mode 100644
index 0000000000..5586179421
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
new file mode 100644
index 0000000000..ccc4f84ee4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
new file mode 100644
index 0000000000..644b207e70
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
@@ -0,0 +1,13 @@
+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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
new file mode 100644
index 0000000000..e649870356
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
@@ -0,0 +1,13 @@
+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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
new file mode 100644
index 0000000000..8e8e33ecd1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
new file mode 100644
index 0000000000..2f4b56835b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
@@ -0,0 +1 @@
+Manifest-Version: 1.0

diff --git a/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
new file mode 100644
index 0000000000..5f4a8b94ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
new file mode 100644
index 0000000000..57d2ac9e4d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
@@ -0,0 +1,13 @@
+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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
new file mode 100644
index 0000000000..2e1399bb3b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
new file mode 100644
index 0000000000..bb8fb2b07c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-contribution/contribution-classes/build-bundles.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/build-bundles.xml
new file mode 100644
index 0000000000..82d536cbfe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/build-bundles.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/pom.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/pom.xml
new file mode 100644
index 0000000000..1673ba3f18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/pom.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-contribution-classes-v2</artifactId>
+    <name>Apache Tuscany SCA iTest OSGi Contribution Version 2 Classes</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.5.1</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.5</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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
new file mode 100644
index 0000000000..fba9a109b3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
new file mode 100644
index 0000000000..225dce0236
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..d0b0a13e6d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
new file mode 100644
index 0000000000..a1c7fce60a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
new file mode 100644
index 0000000000..4647a716c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
new file mode 100644
index 0000000000..d2bf71ed28
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
new file mode 100644
index 0000000000..1b7fb15bf1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
new file mode 100644
index 0000000000..e97331c06c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
new file mode 100644
index 0000000000..1e87d59af1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
new file mode 100644
index 0000000000..2556a0cfa0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
new file mode 100644
index 0000000000..0f88cca213
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
new file mode 100644
index 0000000000..f55a068ede
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
new file mode 100644
index 0000000000..2514928c10
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
new file mode 100644
index 0000000000..e180c37e3f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
new file mode 100644
index 0000000000..600f3f0c74
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
new file mode 100644
index 0000000000..0ba54b363a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
new file mode 100644
index 0000000000..6f1f6b8730
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
new file mode 100644
index 0000000000..7edc392f46
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
new file mode 100644
index 0000000000..828dc6f472
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
new file mode 100644
index 0000000000..9293b1ff52
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
new file mode 100644
index 0000000000..03077aa4d4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
new file mode 100644
index 0000000000..210a68011f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
new file mode 100644
index 0000000000..c96deb4e1b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
new file mode 100644
index 0000000000..9832da880e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
new file mode 100644
index 0000000000..5586179421
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
new file mode 100644
index 0000000000..ccc4f84ee4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
new file mode 100644
index 0000000000..404995a90f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
@@ -0,0 +1,13 @@
+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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
new file mode 100644
index 0000000000..0441e8c6f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
@@ -0,0 +1,13 @@
+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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
new file mode 100644
index 0000000000..ac0ca72030
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
new file mode 100644
index 0000000000..2f4b56835b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
@@ -0,0 +1 @@
+Manifest-Version: 1.0

diff --git a/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
new file mode 100644
index 0000000000..61f62fa16e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
new file mode 100644
index 0000000000..dc4aa2c30e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
@@ -0,0 +1,13 @@
+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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
new file mode 100644
index 0000000000..d149165366
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
new file mode 100644
index 0000000000..4a18aed5f3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-contribution/contribution-test/pom.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/pom.xml
new file mode 100644
index 0000000000..cbe4898b18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-contribution-test</artifactId>
+    <name>Apache Tuscany SCA iTest OSGi Contribution</name>
+
+<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.main</artifactId>
+            <version>1.0.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
+        </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>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>1.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
new file mode 100644
index 0000000000..108481fcbd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
new file mode 100644
index 0000000000..28fe368663
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
new file mode 100644
index 0000000000..be3b7365e5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
new file mode 100644
index 0000000000..03372349f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
@@ -0,0 +1,257 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
new file mode 100644
index 0000000000..a2b3a7bc92
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
@@ -0,0 +1,240 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
new file mode 100644
index 0000000000..ea8d272a0c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
@@ -0,0 +1,44 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-contribution/pom.xml b/tags/java/sca/1.5.1/itest/osgi-contribution/pom.xml
new file mode 100644
index 0000000000..f5537a4762
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-contribution/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/osgi-implementation/build-bundles.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/build-bundles.xml
new file mode 100644
index 0000000000..53bf014546
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/build-bundles.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/pom.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/pom.xml
new file mode 100644
index 0000000000..ee457a4053
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/pom.xml
@@ -0,0 +1,1236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-implementation</artifactId>
+    <name>Apache Tuscany SCA iTest OSGi Implementation</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.main</artifactId>
+            <version>1.0.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
+        </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>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>1.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-lib</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</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.1</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.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
new file mode 100644
index 0000000000..cfecd989fe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
new file mode 100644
index 0000000000..43bc26f2f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
new file mode 100644
index 0000000000..f78878ef47
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
new file mode 100644
index 0000000000..1c65ca573b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
new file mode 100644
index 0000000000..5383e1e268
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
new file mode 100644
index 0000000000..b2af2fa68d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
new file mode 100644
index 0000000000..c05a3f52a8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
new file mode 100644
index 0000000000..c92f078e49
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
new file mode 100644
index 0000000000..af269052c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
new file mode 100644
index 0000000000..5eb16be597
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
new file mode 100644
index 0000000000..8479624546
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
new file mode 100644
index 0000000000..3aedabc29c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
@@ -0,0 +1,254 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
new file mode 100644
index 0000000000..b12e094bc1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
@@ -0,0 +1,253 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
new file mode 100644
index 0000000000..59e128b993
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
new file mode 100644
index 0000000000..ff6f16cba3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
new file mode 100644
index 0000000000..4524c6bd3d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
new file mode 100644
index 0000000000..bcd24ef0b1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
new file mode 100644
index 0000000000..903f8bf229
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
new file mode 100644
index 0000000000..fe8bd23f07
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
new file mode 100644
index 0000000000..ec30d641ac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
new file mode 100644
index 0000000000..34baca71d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
new file mode 100644
index 0000000000..9285c0a8d5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
new file mode 100644
index 0000000000..16d0eae990
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
new file mode 100644
index 0000000000..3d0e045225
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
new file mode 100644
index 0000000000..c055aee142
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
new file mode 100644
index 0000000000..661eb5a8cb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
new file mode 100644
index 0000000000..0588da9a85
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
new file mode 100644
index 0000000000..fff67e1978
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
new file mode 100644
index 0000000000..98085449e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
new file mode 100644
index 0000000000..5089019671
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
new file mode 100644
index 0000000000..1aabf4d10c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
new file mode 100644
index 0000000000..039a214856
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
new file mode 100644
index 0000000000..4a3cd4aed2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
new file mode 100644
index 0000000000..2251bf5be6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
new file mode 100644
index 0000000000..e2d25bf47d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
new file mode 100644
index 0000000000..f2ae804ad1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
new file mode 100644
index 0000000000..a47f68c579
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
new file mode 100644
index 0000000000..25d7bcf2ff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
new file mode 100644
index 0000000000..2762bc62be
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..80346311b1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
new file mode 100644
index 0000000000..a879505610
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
new file mode 100644
index 0000000000..c8cb522cf4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
new file mode 100644
index 0000000000..546971860e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
new file mode 100644
index 0000000000..593e55f3f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
new file mode 100644
index 0000000000..18483817ad
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
new file mode 100644
index 0000000000..5ba42780f2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
new file mode 100644
index 0000000000..bc569d0ac0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
new file mode 100644
index 0000000000..599ab51a50
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
new file mode 100644
index 0000000000..df52c6c760
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
new file mode 100644
index 0000000000..aca5943552
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
new file mode 100644
index 0000000000..e71c624f49
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
new file mode 100644
index 0000000000..a036ecfc76
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
new file mode 100644
index 0000000000..db877bb366
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
new file mode 100644
index 0000000000..ee1f575e70
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
new file mode 100644
index 0000000000..09e60ca626
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
new file mode 100644
index 0000000000..7dd70889c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
new file mode 100644
index 0000000000..1e87d59af1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
new file mode 100644
index 0000000000..354f40a064
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
new file mode 100644
index 0000000000..d0cf43a960
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
new file mode 100644
index 0000000000..ff40a7ae36
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
new file mode 100644
index 0000000000..ef989d6fcf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
new file mode 100644
index 0000000000..effae8c246
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
new file mode 100644
index 0000000000..4effadf208
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
new file mode 100644
index 0000000000..13bce67bb4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
new file mode 100644
index 0000000000..071a131f40
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
new file mode 100644
index 0000000000..6ebd1f2894
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
new file mode 100644
index 0000000000..b66961b1c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
new file mode 100644
index 0000000000..2514928c10
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
new file mode 100644
index 0000000000..9edf3567e5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
new file mode 100644
index 0000000000..659f16be7f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
new file mode 100644
index 0000000000..7c9e102fd2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
new file mode 100644
index 0000000000..bb04ff42e0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
new file mode 100644
index 0000000000..3317816557
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
new file mode 100644
index 0000000000..6f1f6b8730
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
new file mode 100644
index 0000000000..6d1ad76796
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
new file mode 100644
index 0000000000..71e248590b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
new file mode 100644
index 0000000000..7c1125bbb5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
new file mode 100644
index 0000000000..8456b878f2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
new file mode 100644
index 0000000000..d5a47c6403
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
new file mode 100644
index 0000000000..e6391d2159
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
new file mode 100644
index 0000000000..c79ede815b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
new file mode 100644
index 0000000000..04cc73b85c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
new file mode 100644
index 0000000000..9ece700efe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
new file mode 100644
index 0000000000..52bc43478d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
new file mode 100644
index 0000000000..0b8d2e5851
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
new file mode 100644
index 0000000000..87370a6df4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
new file mode 100644
index 0000000000..127349eacf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
new file mode 100644
index 0000000000..7e3810c458
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
new file mode 100644
index 0000000000..fb9a112d18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
new file mode 100644
index 0000000000..ee732b5efc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
new file mode 100644
index 0000000000..b1723660d7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
new file mode 100644
index 0000000000..fb9a112d18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
new file mode 100644
index 0000000000..ee732b5efc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
new file mode 100644
index 0000000000..b1723660d7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
new file mode 100644
index 0000000000..5172cbe21e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
new file mode 100644
index 0000000000..b7591e732d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
new file mode 100644
index 0000000000..cf8717fcf5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
new file mode 100644
index 0000000000..785212fa6d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
new file mode 100644
index 0000000000..7a06030e32
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
new file mode 100644
index 0000000000..5c39b53b0a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
new file mode 100644
index 0000000000..b8bb809319
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
new file mode 100644
index 0000000000..26f32fe617
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
new file mode 100644
index 0000000000..1b9e0e847e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
new file mode 100644
index 0000000000..6066a38f29
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
new file mode 100644
index 0000000000..777edd3f7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
new file mode 100644
index 0000000000..d8adaa2ba3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
new file mode 100644
index 0000000000..e0bd9d8c10
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
new file mode 100644
index 0000000000..6005ae785c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
new file mode 100644
index 0000000000..6f0b79ebc2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
new file mode 100644
index 0000000000..d4b461460e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
new file mode 100644
index 0000000000..bb15e6e3aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
new file mode 100644
index 0000000000..7591201b8c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
new file mode 100644
index 0000000000..0e844fab99
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
new file mode 100644
index 0000000000..fc86a76784
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
new file mode 100644
index 0000000000..a8a87c5c8c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
new file mode 100644
index 0000000000..05bbf4db88
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
new file mode 100644
index 0000000000..a12d1a21ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
new file mode 100644
index 0000000000..2214db11a6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
new file mode 100644
index 0000000000..8d44067992
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
new file mode 100644
index 0000000000..60c0fb3fd3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
new file mode 100644
index 0000000000..ca1392d2b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
new file mode 100644
index 0000000000..7c9f67c36d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
new file mode 100644
index 0000000000..760c761666
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
new file mode 100644
index 0000000000..7d56770311
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
new file mode 100644
index 0000000000..321bdc713f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
new file mode 100644
index 0000000000..66f98011cb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
new file mode 100644
index 0000000000..6874a66db9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
new file mode 100644
index 0000000000..47d290eb1a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
@@ -0,0 +1,12 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
new file mode 100644
index 0000000000..c7f13a50a7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
new file mode 100644
index 0000000000..f4c102c4f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
@@ -0,0 +1,12 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
new file mode 100644
index 0000000000..cbebf7eec2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
new file mode 100644
index 0000000000..6a3c845cca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
@@ -0,0 +1,14 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
new file mode 100644
index 0000000000..cb6345432f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
new file mode 100644
index 0000000000..89871fa8f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
@@ -0,0 +1,13 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
new file mode 100644
index 0000000000..d968d1ffc5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
new file mode 100644
index 0000000000..fc762df8d5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
new file mode 100644
index 0000000000..02e42bc010
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
new file mode 100644
index 0000000000..390367b99b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
new file mode 100644
index 0000000000..4715cbd976
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
new file mode 100644
index 0000000000..932fb8a483
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
new file mode 100644
index 0000000000..b10d0416dc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
new file mode 100644
index 0000000000..c799f31606
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
new file mode 100644
index 0000000000..db68d7e333
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
new file mode 100644
index 0000000000..1aea3cf669
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
new file mode 100644
index 0000000000..106bd1b6aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
new file mode 100644
index 0000000000..1e3c915a59
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
new file mode 100644
index 0000000000..d7d0b41f5e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
new file mode 100644
index 0000000000..81c51e6804
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
new file mode 100644
index 0000000000..ca50b554df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
new file mode 100644
index 0000000000..14658127f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
new file mode 100644
index 0000000000..335bc419c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
new file mode 100644
index 0000000000..a68b9d6dbb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
new file mode 100644
index 0000000000..02f79c15f3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
new file mode 100644
index 0000000000..8428b08d96
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
new file mode 100644
index 0000000000..c81bf00d00
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
new file mode 100644
index 0000000000..61c161617c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
new file mode 100644
index 0000000000..fd6a26a65f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
new file mode 100644
index 0000000000..0168bc2435
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
new file mode 100644
index 0000000000..6674cdd7f2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
new file mode 100644
index 0000000000..72df35ef41
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
new file mode 100644
index 0000000000..724c8132df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
new file mode 100644
index 0000000000..1e5035d949
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
new file mode 100644
index 0000000000..85bfd86422
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
new file mode 100644
index 0000000000..6e51b3d6f2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
new file mode 100644
index 0000000000..9a87758ec2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
new file mode 100644
index 0000000000..e134bd1061
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
new file mode 100644
index 0000000000..c19895bab1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
new file mode 100644
index 0000000000..707609d2c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
new file mode 100644
index 0000000000..e084e5831a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
new file mode 100644
index 0000000000..d96f6481fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
new file mode 100644
index 0000000000..10ef690c9b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
new file mode 100644
index 0000000000..003f9dca5a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
new file mode 100644
index 0000000000..fefdea106d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
new file mode 100644
index 0000000000..f6b847ed59
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
new file mode 100644
index 0000000000..5cff2f573e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
new file mode 100644
index 0000000000..ca50b554df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
new file mode 100644
index 0000000000..14658127f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
new file mode 100644
index 0000000000..0fec68a725
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
new file mode 100644
index 0000000000..ca50b554df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
new file mode 100644
index 0000000000..14658127f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
new file mode 100644
index 0000000000..678014d48d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
new file mode 100644
index 0000000000..f0090fb52b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
new file mode 100644
index 0000000000..0b50923a05
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
new file mode 100644
index 0000000000..1000a5f974
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
new file mode 100644
index 0000000000..4e392a9ff1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
new file mode 100644
index 0000000000..b10d0416dc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
new file mode 100644
index 0000000000..788ec4f19a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
new file mode 100644
index 0000000000..1ba16d0693
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
new file mode 100644
index 0000000000..a55ebd02a8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
new file mode 100644
index 0000000000..e7459360e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
@@ -0,0 +1,10 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
new file mode 100644
index 0000000000..d518ecab62
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
new file mode 100644
index 0000000000..d7d0b41f5e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
new file mode 100644
index 0000000000..880304187b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
@@ -0,0 +1,11 @@
+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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
new file mode 100644
index 0000000000..d72db04425
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
new file mode 100644
index 0000000000..f9c1218f82
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
new file mode 100644
index 0000000000..d8e4c1cb7e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
@@ -0,0 +1,12 @@
+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.5.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
new file mode 100644
index 0000000000..a6de268bf6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
new file mode 100644
index 0000000000..660e277693
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
new file mode 100644
index 0000000000..02ae93aec2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
new file mode 100644
index 0000000000..c94504f07d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
new file mode 100644
index 0000000000..fea03404fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
new file mode 100644
index 0000000000..3c425fcbc9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
new file mode 100644
index 0000000000..f6c04de980
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
new file mode 100644
index 0000000000..87918132e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..9b00787162
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
new file mode 100644
index 0000000000..2ecc0bea43
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
new file mode 100644
index 0000000000..af79dc4bdf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
new file mode 100644
index 0000000000..c144a1bc18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/services/services-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/services-test.composite
new file mode 100644
index 0000000000..64f3b30f88
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/services-test.composite
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
new file mode 100644
index 0000000000..0b0aa0912b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
new file mode 100644
index 0000000000..7bcdc6a2bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
new file mode 100644
index 0000000000..eadb539ea5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
new file mode 100644
index 0000000000..532293b03f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
new file mode 100644
index 0000000000..877d0de1c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/version/version-test.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/version-test.composite
new file mode 100644
index 0000000000..bbb397ee70
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/version-test.composite
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
new file mode 100644
index 0000000000..1fd551be3b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
new file mode 100644
index 0000000000..5599c44bc3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
new file mode 100644
index 0000000000..8743f8c145
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
new file mode 100644
index 0000000000..d349edf265
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
new file mode 100644
index 0000000000..617200d8dd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
new file mode 100644
index 0000000000..213cde2c1d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
new file mode 100644
index 0000000000..0dca0da75e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
new file mode 100644
index 0000000000..953045fefa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
new file mode 100644
index 0000000000..c621d9aca0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
new file mode 100644
index 0000000000..6d3f853382
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
new file mode 100644
index 0000000000..d545c844d2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
new file mode 100644
index 0000000000..54b9b00bc8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
new file mode 100644
index 0000000000..b26bfbd98d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
new file mode 100644
index 0000000000..667df7aa12
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
new file mode 100644
index 0000000000..a95437f8c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
new file mode 100644
index 0000000000..c5d94df93d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
@@ -0,0 +1,325 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
new file mode 100644
index 0000000000..d340923938
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
new file mode 100644
index 0000000000..c1f11d0b6e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
new file mode 100644
index 0000000000..49afb3d8e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
new file mode 100644
index 0000000000..a858c18a90
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
new file mode 100644
index 0000000000..a9941aebcd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
new file mode 100644
index 0000000000..8e939b1a83
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
new file mode 100644
index 0000000000..39d90bb75c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
new file mode 100644
index 0000000000..5376687b61
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
new file mode 100644
index 0000000000..6d8dc1021e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
new file mode 100644
index 0000000000..e037ae9675
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
new file mode 100644
index 0000000000..eecf67913d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
new file mode 100644
index 0000000000..203bf5123c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
new file mode 100644
index 0000000000..429b1f10ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
new file mode 100644
index 0000000000..dbc980f8c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
new file mode 100644
index 0000000000..e39295a402
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
new file mode 100644
index 0000000000..c2f6bff4f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
new file mode 100644
index 0000000000..17ba7a2f14
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
new file mode 100644
index 0000000000..8c33720018
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
new file mode 100644
index 0000000000..0c6edd6691
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
new file mode 100644
index 0000000000..0b48ac90ba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
new file mode 100644
index 0000000000..c84741f34f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
new file mode 100644
index 0000000000..5a9b2a8b1d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
new file mode 100644
index 0000000000..7b95c12038
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
new file mode 100644
index 0000000000..8399991503
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
@@ -0,0 +1,45 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
new file mode 100644
index 0000000000..92c67c2bbc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5</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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
new file mode 100644
index 0000000000..2e3137239e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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);
+        
+        System.setProperty("org.osgi.framework.system.packages", getSystemPackages());
+        // 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
new file mode 100644
index 0000000000..0dafffdb8c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
@@ -0,0 +1,163 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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 = getSystemPackages() + 

+                ", 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
new file mode 100644
index 0000000000..6356718fe5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
@@ -0,0 +1,163 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+        }

+    }

+    

+    

+    /**

+     * @return the list of packages to be exported by the system bundle

+     */

+    protected String getSystemPackages() {

+        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.w3c.dom.bootstrap, " +

+            "org.w3c.dom.ls, " +

+            "org.xml.sax, " +

+            "org.xml.sax.ext, " +

+            "org.xml.sax.helpers, " +

+            "javax.security.auth, " +

+            "javax.security.auth.login, " +

+            "javax.security.auth.callback, " +

+            "javax.security.cert, " +

+            "javax.naming, " +

+            "javax.naming.spi, " +

+            "javax.naming.directory, " +

+            "javax.management, " + 

+            "javax.imageio, " +

+            "sun.misc, " +

+            "javax.net, " +

+            "javax.net.ssl, " +

+            "javax.crypto, " +

+            "javax.rmi, " +

+            "javax.transaction, " +

+            "javax.transaction.xa";

+        

+        return systemPackages;

+    

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
new file mode 100644
index 0000000000..c9f77b71cf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
@@ -0,0 +1,86 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
new file mode 100644
index 0000000000..1fba0d6dcd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
@@ -0,0 +1,136 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
new file mode 100644
index 0000000000..8bf7a1fb2f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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 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 {
+
+        int failures = 0;
+        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);
+            failures += runTestCase(testClass).getFailureCount();
+        }
+
+        Assert.assertEquals(0, failures);
+
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
new file mode 100644
index 0000000000..ba9b7007b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
@@ -0,0 +1,243 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.util.Enumeration;

+import java.util.jar.JarOutputStream;

+import java.util.jar.Manifest;

+import java.util.zip.ZipEntry;

+

+import junit.framework.Assert;

+import junit.framework.AssertionFailedError;

+

+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.runner.JUnitCore;

+import org.junit.runner.Request;

+import org.junit.runner.Result;

+import org.junit.runner.notification.Failure;

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

+        int failures = 0;

+        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);

+            failures += runTestCase(testClass).getFailureCount();

+        }

+

+        Assert.assertEquals(0, failures);

+

+    }

+

+    public Result runTestCase(Class testClass) throws Exception {

+

+        if (testClass.getName().endsWith("TestCase") && !testClass.getName()

+            .startsWith("org.apache.tuscany.sca.test.osgi.")) {

+            JUnitCore core = new JUnitCore();

+            System.out.println("Running test " + testClass.getName() + " ");

+            Result result = core.run(Request.aClass(testClass));

+            // long duration = result.getRunTime();

+            int runs = result.getRunCount();

+            int failures = 0, errors = 0;

+            int ignores = result.getIgnoreCount();

+

+            for (Failure f : result.getFailures()) {

+                if (f.getException() instanceof AssertionFailedError) {

+                    failures++;

+                } else {

+                    errors++;

+                }

+            }

+

+            System.out.println("Test Runs: " + runs

+                + ", Failures: "

+                + failures

+                + ", Errors: "

+                + errors

+                + ", Ignores: "

+                + ignores);

+

+            return result;

+

+        }

+        return new Result();

+

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
new file mode 100644
index 0000000000..85397195bd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
new file mode 100644
index 0000000000..9346fb8ed2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
@@ -0,0 +1,62 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
new file mode 100644
index 0000000000..501cded48d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
@@ -0,0 +1,63 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
new file mode 100644
index 0000000000..687335b3c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+    public void runTest() throws Exception {

+        

+        testHarness.runTest("../../../samples/" + "callback-ws-client", 

+                "../../../samples/" + "callback-ws-service");

+    }

+    

+}

diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
new file mode 100644
index 0000000000..f605e024ba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

+    public void runTest() throws Exception {

+        

+        testHarness.runTest("../../../samples/" + "callback-ws-service");

+        

+    }

+    

+}

diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
new file mode 100644
index 0000000000..4f5640960b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
new file mode 100644
index 0000000000..9a491304bf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
new file mode 100644
index 0000000000..2e0b49e693
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
new file mode 100644
index 0000000000..eac9979f56
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
new file mode 100644
index 0000000000..62c0eef16d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
@@ -0,0 +1,71 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
new file mode 100644
index 0000000000..155dd368a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
@@ -0,0 +1,137 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
new file mode 100644
index 0000000000..b45c062761
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
@@ -0,0 +1,93 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
new file mode 100644
index 0000000000..c2dae9eb97
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
@@ -0,0 +1,80 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * 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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..8985947286
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+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.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
new file mode 100644
index 0000000000..6a38f48c4a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
@@ -0,0 +1,45 @@
+#

+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-tuscany/pom.xml b/tags/java/sca/1.5.1/itest/osgi-tuscany/pom.xml
new file mode 100644
index 0000000000..688839adea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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-versioned</module>
+        <module>tuscany-osgi-installer</module>
+        <module>osgi-tuscany-test</module>
+    </modules>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/build-bundles.xml b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/build-bundles.xml
new file mode 100644
index 0000000000..c7ea66863f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/build-bundles.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-tuscany/test-bundles/pom.xml b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/pom.xml
new file mode 100644
index 0000000000..ebad8a3a0c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
new file mode 100644
index 0000000000..0ac96b35a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
@@ -0,0 +1,115 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
new file mode 100644
index 0000000000..a3aa2531fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
@@ -0,0 +1,37 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
new file mode 100644
index 0000000000..5f1342c40b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -0,0 +1,61 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
new file mode 100644
index 0000000000..f5708dec40
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -0,0 +1,59 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
new file mode 100644
index 0000000000..17b342f8dd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
new file mode 100644
index 0000000000..afaf7aea02
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
new file mode 100644
index 0000000000..cd204ebc2e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
new file mode 100644
index 0000000000..ca720085c5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -0,0 +1,49 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
new file mode 100644
index 0000000000..b4807b80d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
new file mode 100644
index 0000000000..f71d822bbe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
@@ -0,0 +1,12 @@
+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,

+                javax.xml.bind.annotation

+Export-Package: supplychain.customer, supplychain

+

diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
new file mode 100644
index 0000000000..13a3c9b82a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
@@ -0,0 +1,21 @@
+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,

+        javax.xml.bind.annotation

+Export-Package: supplychain.client

+Bundle-Activator: supplychain.client.SupplyChainClient

+

diff --git a/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b524abc2a6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
new file mode 100644
index 0000000000..5be79b741a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
new file mode 100644
index 0000000000..8549ca3409
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
new file mode 100644
index 0000000000..88d1e72efc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
new file mode 100644
index 0000000000..9ee565f629
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
@@ -0,0 +1,671 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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-monitor</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <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-feed</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-runtime</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-runtime</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-databinding-xstream</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-das</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-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-node-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-node-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.1</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.1</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.5.1/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
new file mode 100644
index 0000000000..0c26477a43
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
@@ -0,0 +1,405 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.util.ArrayList;
+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 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",
+        
+    };
+    
+    private static final String[] rebundleJars = {
+        "org.apache.tuscany.sca.3rdparty.org.apache.tuscany.sdo",   // Recreate export statements
+    };
+    
+	public void start(BundleContext bundleContext) throws Exception {
+        
+        String tuscanyHome = System.getProperty("TUSCANY_HOME");
+        if (tuscanyHome == null) {
+          File homeDir = new File("../tuscany-versioned/target/classes");
+          if (homeDir.exists()) {
+              tuscanyHome = homeDir.getCanonicalPath();
+          }
+        }
+		
+        System.out.println("Installing Tuscany from TUSCANY_HOME=" + tuscanyHome);
+        installVersionedTuscanyIntoOSGi(bundleContext, tuscanyHome);
+	}
+
+	public void stop(BundleContext bundleContext) throws Exception {
+        
+        for (Bundle bundle : tuscanyBundles) {
+            try {
+                bundle.stop();
+            } catch (Exception e) {
+                // Ignore error
+            }
+        }
+	}
+    
+    private void installVersionedTuscanyIntoOSGi(BundleContext bundleContext, String tuscanyHome) {
+        
+        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>();
+            HashSet<File> thirdPartyJars = new HashSet<File>();
+            
+
+            File tuscanyInstallDir = new File(tuscanyHome).getCanonicalFile();
+            findBundles(bundleContext, tuscanyInstallDir, tuscanyJars, thirdPartyJars);
+            
+            
+            for (File bundleFile : thirdPartyJars) {
+                
+                String bundleName = bundleFile.getName();
+                if (bundleName.startsWith("org.apache.felix"))
+                    continue;
+                
+                boolean installed = false;
+                for (String name : rebundleJars) {
+                  if (bundleName.startsWith(name)) {
+                      rebundleAndInstall(bundleContext, tuscanyInstallDir, bundleFile);
+                      installed = true;
+                  }
+                }
+                if (installed)
+                    continue;
+                
+                bundleContext.installBundle(bundleFile.toURI().toURL().toString());
+               
+            }
+            
+            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 rebundleAndInstall(BundleContext bundleContext, File tuscanyInstallDir, File bundleFile) throws Exception {
+        String bundleSymbolicName = bundleFile.getName();
+        if (bundleSymbolicName.endsWith(".jar")) bundleSymbolicName = bundleSymbolicName.substring(0, bundleSymbolicName.length()-4);
+        
+        String bundleLocation = bundleFile.toURI().toURL().toString();
+        InputStream bundleManifestStream = updateBundleManifest(bundleFile, bundleSymbolicName);
+        HashSet<File> jarSet = new HashSet<File>();
+        jarSet.add(bundleFile);
+
+        File newBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca." + bundleFile.getName());
+        createAndInstallBundle(bundleContext, bundleLocation, newBundleFile, bundleManifestStream, jarSet);
+        bundleManifestStream.close();
+    }
+	
+    
+    private void findBundles(BundleContext bundleContext, 
+            File tuscanyInstallDir,
+            HashSet<File> tuscanyJars, 
+            HashSet<File> thirdPartyJars) 
+    throws IOException
+    {
+        
+        File[] jars = tuscanyInstallDir.listFiles();
+        for (File jar : jars) {
+            String jarName = jar.getName();
+            if (!jarName.endsWith(".jar"))
+                continue;
+            
+            if (!jarName.startsWith("org.apache.tuscany.sca")||jarName.startsWith("org.apache.tuscany.sca.3rdparty")) {
+                if (jarName.endsWith(".jar"))
+                { 
+                    thirdPartyJars.add(jar);
+                }
+            } else {
+                boolean installTuscanyJar = true;
+                for (String name : tuscanyModulesToIgnore) {
+                    name = name.replaceAll("-", ".");
+                    if (jarName.startsWith("org.apache.tuscany.sca." + name)) {
+                        installTuscanyJar = false;
+                        break;
+                    }
+                }
+                if (installTuscanyJar)
+                    tuscanyJars.add(jar);
+            }
+        }
+    }
+    
+
+    private InputStream updateBundleManifest(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) {
+            ZipEntry ze;
+            while ((ze = jar.getNextEntry()) != null) {
+                if (ze.getName().equals("META-INF/MANIFEST.MF"))
+                    break;
+            }
+            if (ze != null) {
+                byte[] bytes = new byte[(int)ze.getSize()];
+                jar.read(bytes);
+                manifest = new Manifest(new ByteArrayInputStream(bytes));
+            }
+        }
+        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 (isImmutableJar)
+            attributes.putValue("Bundle-ClassPath", bundleName);
+        
+
+        attributes.remove(new Attributes.Name("Require-Bundle"));
+        attributes.putValue("DynamicImport-Package", "*");   
+        
+        // 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("org.apache.tuscany.sca.3rdparty.org.apache.tuscany.sdo.tuscany-sdo-impl")) {
+        
+            HashSet<String> packages = getPackagesInJar(bundleName, jar);
+            String version = getJarVersion(bundleName);
+            
+            attributes.putValue("Export-Package", packagesToString(packages, version));
+            attributes.putValue("Import-Package", packagesToString(packages, null));
+        }
+        
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        manifest.write(out);
+        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+        out.close();
+               
+        return in;
+        
+    }
+    
+    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 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.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml b/tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml
new file mode 100644
index 0000000000..8f98a6cf98
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml
@@ -0,0 +1,644 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-osgi-tuscany-versioned</artifactId>
+    <name>Apache Tuscany OSGi - Versioned Tuscany Bundles</name>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <tuscany.version>${pom.version}</tuscany.version>
+
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <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-feed</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-runtime</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-runtime</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-databinding-xstream</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-das</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-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-node-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-node-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>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                <version>1.5.1</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <goals>
+                              <goal>execute</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/policy-security-basicauth/pom.xml b/tags/java/sca/1.5.1/itest/policy-security-basicauth/pom.xml
new file mode 100644
index 0000000000..7366fcf066
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-basicauth/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-policy-security-basicauth</artifactId>
+    <name>Apache Tuscany SCA iTest Policy Security Basic Authentication</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>  
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+            <version>1.6.1</version>
+            <scope>test</scope>
+        </dependency>        
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..7345af7f7c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldClientImpl implements HelloWorldService {
+    
+    @Reference
+    protected HelloWorldService helloworldWS;
+    
+
+
+    public String getGreetings(String name) {
+        return "Hello " + 
+                helloworldWS.getGreetings(name);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..268d90e910
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..6372570d1f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.security.auth.Subject;
+
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    @Context
+    protected RequestContext requestContext;
+    
+    public String getGreetings(String name) {
+        Subject subject = requestContext.getSecuritySubject();
+        
+        if (subject == null){
+            return "Hello " + name + " null subject";
+        } else {
+            return "Hello " + name + " " + subject.toString();
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..dbdf0cd263
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/definitions.xml
@@ -0,0 +1,44 @@
+<?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" >
+
+
+    <sca:policySet name="BasicAuthenticationPolicySet"
+                   provides="authentication"
+                   appliesTo="sca:binding.ws">
+        <tuscany:basicAuthentication>
+          <tuscany:userName>myname</tuscany:userName>
+          <tuscany:password>mypassword</tuscany:password>
+        </tuscany:basicAuthentication>
+    </sca:policySet>
+    
+    <sca:policySet name="ImplementationIdentityPolicySet"
+                    provides="tuscany:identity"
+                   appliesTo="sca:implementation.java">
+        <securityIdentity>
+            <useCallerIdentity/>
+        </securityIdentity>  
+    </sca:policySet>      
+      
+</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..f883629180
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/helloworld.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloWorldClientComponent">
+        <implementation.java class="helloworld.HelloWorldClientImpl" />
+        <service name="HelloWorldService">
+            <interface.java interface="helloworld.HelloWorldService"/>
+            <binding.sca/>
+        </service>
+        <reference name="helloworldWS" requires="authentication">
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
+        </reference>
+    </component>           
+
+    <component name="HelloWorldServiceWSComponent">
+        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
+        <service name="HelloWorldService" requires="authentication">
+        	<interface.java interface="helloworld.HelloWorldService"/>
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
+        </service>
+    </component>
+    
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
new file mode 100644
index 0000000000..b6e0444d2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.ByteArrayInputStream;
+
+import junit.framework.Assert;
+import helloworld.HelloWorldService;
+
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.ws.security.util.Base64;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+public class BasicAuthTestCase {
+    private static SCANode node;
+    private static HelloWorldService service;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            SCANodeFactory factory = SCANodeFactory.newInstance();
+            node = factory.createSCANodeFromClassLoader("helloworld.composite", 
+                                                        BasicAuthTestCase.class.getClassLoader());
+            node.start();
+            
+            service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        node.stop();
+    }
+    
+    @Test
+    //@Ignore
+    public void testViaSCAClient() {
+        String greetings = service.getGreetings("Simon");
+        System.out.println(">>>" + greetings);
+    } 
+    
+    @Test
+    @Ignore
+    public void testWSViaNonSCAClient() {
+        
+        try {
+            String token ="MyToken";
+            String encToken = Base64.encode(token.getBytes());
+            
+            String response = callService("http://L3AW203:8085/HelloWorldServiceWSComponent",
+                                          "<?xml version='1.0' encoding='UTF-8'?>" +
+                                            "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + 
+                                             "<soapenv:Header>" + 
+                                               "<ns2:Token xmlns:ns2=\"http://helloworld/\">" + encToken + "</ns2:Token>" + 
+                                             "</soapenv:Header>" + 
+                                             "<soapenv:Body>" + 
+                                               "<ns2:getGreetings xmlns:ns2=\"http://helloworld/\">" + 
+                                                 "<arg0>Simon</arg0>" + 
+                                               "</ns2:getGreetings>" + 
+                                             "</soapenv:Body>" + 
+                                            "</soapenv:Envelope>" );
+            System.out.println(">>>" + response);
+        } catch(Exception ex) {
+            System.out.println(ex.toString());
+        }
+    } 
+    
+    @Test
+    public void testJMSViaNonSCAClient() {
+        // TODO
+    }
+    
+    public String callService(String url, String requestString) throws Exception {
+        System.out.println("Request = " + requestString);
+        WebConversation wc   = new WebConversation();
+        wc.setAuthorization("Me", "MyPasswd");
+        WebRequest request   = new PostMethodWebRequest( url, 
+                                                         new ByteArrayInputStream(requestString.getBytes("UTF-8")),"text/xml");
+        request.setHeaderField("SOAPAction", "");
+        WebResponse response = wc.getResource(request);
+        System.out.println("Response= " + response.getText());               
+        Assert.assertEquals(200, response.getResponseCode());
+        return response.getText(); 
+    }    
+}
diff --git a/tags/java/sca/1.5.1/itest/policy-security-jsr250/pom.xml b/tags/java/sca/1.5.1/itest/policy-security-jsr250/pom.xml
new file mode 100644
index 0000000000..273cd2cd8f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-jsr250/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-policy-security-jsr250</artifactId>
+    <name>Apache Tuscany SCA iTest Policy Security JSR250</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>            
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security-jsr250</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>   
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..3569410e7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..3e752144a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy-security-jsr250/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..64b8a95d18
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/resources/definitions.xml
@@ -0,0 +1,29 @@
+<?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.5.1/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..456ca450f1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/resources/helloworld.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
new file mode 100644
index 0000000000..da5f6409ba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/policy-security-token/pom.xml b/tags/java/sca/1.5.1/itest/policy-security-token/pom.xml
new file mode 100644
index 0000000000..4566d62d40
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-policy-security-token</artifactId>
+    <name>Apache Tuscany SCA iTest Policy Security Token Authentication</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-policy</artifactId>
+            <version>1.5.1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jms_1.1_spec</artifactId>
+           <version>1.1</version>
+           <scope>provided</scope>
+           <exclusions>
+               <exclusion>
+                   <groupId>org.apache.geronimo.specs</groupId>
+                   <artifactId>geronimo-jms_1.1_spec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>  
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+            <version>1.6.1</version>
+            <scope>test</scope>
+        </dependency>        
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..769be60538
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldClientImpl implements HelloWorldService {
+    
+    @Reference
+    protected HelloWorldService helloworldWS;
+    
+    @Reference
+    protected HelloWorldService helloworldJMS;    
+
+    public String getGreetings(String name) {
+        return  helloworldWS.getGreetings(name) + 
+                helloworldJMS.getGreetings(name);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..268d90e910
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..60c07f6f73
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.security.Principal;
+
+import javax.security.auth.Subject;
+
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    @Context
+    protected RequestContext requestContext;
+    
+    public String getGreetings(String name) {
+        Subject subject = requestContext.getSecuritySubject();
+        
+        if (subject == null){
+            return "Hello " + name + " null subject";
+        } else {
+        	String response = "Hello " + name + " ";
+        	
+        	for (Principal principal : subject.getPrincipals()){
+        		response += principal.getName();
+        	}
+        	
+            return response + " ";
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..f7bb9bc374
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/definitions.xml
@@ -0,0 +1,49 @@
+<?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" >
+
+
+    <sca:policySet name="Axis2TokenAuthenticationPolicySet"
+                   provides="authentication"
+                   appliesTo="sca:binding.ws">
+                
+        <tuscany:axis2TokenAuthentication xmlns:foo="http://tuscany.apache.org/foo" tokenName="foo:myname"/>
+    </sca:policySet>
+    
+    <sca:policySet name="JMSTokenAuthenticationPolicySet"
+                   provides="authentication"
+                   appliesTo="sca:binding.jms">
+                
+        <tuscany:jmsTokenAuthentication xmlns:foo="http://tuscany.apache.org/foo" tokenName="foo:myname"/>
+    </sca:policySet>
+    
+    <sca:policySet name="ImplementationIdentityPolicySet"
+                    provides="tuscany:identity"
+                   appliesTo="sca:implementation.java">
+        <securityIdentity>
+            <useCallerIdentity/>
+        </securityIdentity>  
+    </sca:policySet>    
+      
+</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..1db89fd502
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/helloworld.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="HelloWorldClientComponent">
+        <implementation.java class="helloworld.HelloWorldClientImpl"/>
+        <service name="HelloWorldService">
+            <interface.java interface="helloworld.HelloWorldService"/>
+            <binding.sca/>
+        </service>
+        <reference name="helloworldWS" requires="authentication">
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
+        </reference>
+        <reference name="helloworldJMS" requires="authentication">
+            <binding.jms uri="jms:HelloWorldService"/>
+        </reference>
+    </component>           
+
+    <component name="HelloWorldServiceWSComponent">
+        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
+        <service name="HelloWorldService" requires="authentication">
+        	<interface.java interface="helloworld.HelloWorldService"/>
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
+        </service>
+    </component>
+    
+    <component name="HelloWorldServiceJMSComponent">
+        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
+        <service name="HelloWorldService" requires="authentication">
+            <interface.java interface="helloworld.HelloWorldService"/>
+            <binding.jms/>
+        </service>
+    </component>    
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/jndi.properties b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/jndi.properties
new file mode 100644
index 0000000000..9abdff215d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/jndi.properties
@@ -0,0 +1,39 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+## 
+## http://www.apache.org/licenses/LICENSE-2.0
+## 
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT 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.5.1/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java b/tags/java/sca/1.5.1/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
new file mode 100644
index 0000000000..b0ae00b639
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.ByteArrayInputStream;
+
+import junit.framework.Assert;
+import helloworld.HelloWorldService;
+
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.ws.security.util.Base64;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+public class TokenAuthTestCase {
+    private static SCANode node;
+    private static HelloWorldService service;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            SCANodeFactory factory = SCANodeFactory.newInstance();
+            node = factory.createSCANodeFromClassLoader("helloworld.composite", 
+                                                        TokenAuthTestCase.class.getClassLoader());
+            node.start();
+            
+            service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        node.stop();
+    }
+    
+    @Test
+    //@Ignore
+    public void testViaSCAClient() {
+        String greetings = service.getGreetings("Simon");
+        System.out.println("Tokens reported at component context security subject = ");
+        System.out.println(greetings);
+        Assert.assertEquals("Hello Simon SomeWSAuthorizationToken Hello Simon DummyTokenID ", greetings);
+    } 
+    
+    @Test
+    @Ignore
+    public void testWSViaNonSCAClient() {
+        
+        try {
+            String token ="MyToken";
+            String encToken = Base64.encode(token.getBytes());
+            
+            String response = callService("http://L3AW203:8085/HelloWorldServiceWSComponent",
+                                          "<?xml version='1.0' encoding='UTF-8'?>" +
+                                            "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + 
+                                             "<soapenv:Header>" + 
+                                               "<ns2:Token xmlns:ns2=\"http://helloworld/\">" + encToken + "</ns2:Token>" + 
+                                             "</soapenv:Header>" + 
+                                             "<soapenv:Body>" + 
+                                               "<ns2:getGreetings xmlns:ns2=\"http://helloworld/\">" + 
+                                                 "<arg0>Simon</arg0>" + 
+                                               "</ns2:getGreetings>" + 
+                                             "</soapenv:Body>" + 
+                                            "</soapenv:Envelope>" );
+            System.out.println(">>>" + response);
+        } catch(Exception ex) {
+            System.out.println(ex.toString());
+        }
+    } 
+    
+    @Test
+    @Ignore
+    public void testJMSViaNonSCAClient() {
+        // TODO
+    }
+    
+    public String callService(String url, String requestString) throws Exception {
+        System.out.println("Request = " + requestString);
+        WebConversation wc   = new WebConversation();
+        wc.setAuthorization("Me", "MyPasswd");
+        WebRequest request   = new PostMethodWebRequest( url, 
+                                                         new ByteArrayInputStream(requestString.getBytes("UTF-8")),"text/xml");
+        request.setHeaderField("SOAPAction", "");
+        WebResponse response = wc.getResource(request);
+        System.out.println("Response= " + response.getText());               
+        Assert.assertEquals(200, response.getResponseCode());
+        return response.getText(); 
+    }    
+}
diff --git a/tags/java/sca/1.5.1/itest/policy-security/pom.xml b/tags/java/sca/1.5.1/itest/policy-security/pom.xml
new file mode 100644
index 0000000000..9a5dcf627b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-policy-security</artifactId>
+    <name>Apache Tuscany SCA iTest Policy Security</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>            
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>   
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..0de3c70303
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..268d90e910
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy-security/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/policy-security/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..c8118a0caf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security/src/main/resources/definitions.xml
@@ -0,0 +1,33 @@
+<?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.5.1/itest/policy-security/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/policy-security/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..9e0f289f87
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security/src/main/resources/helloworld.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/tags/java/sca/1.5.1/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
new file mode 100644
index 0000000000..9dad17741e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/policy/pom.xml b/tags/java/sca/1.5.1/itest/policy/pom.xml
new file mode 100644
index 0000000000..7b69be8a08
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-policy</artifactId>
+    <name>Apache Tuscany SCA iTest Policy Framework</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>            
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>   
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+        </dependency>
+
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/AddService.java
new file mode 100644
index 0000000000..3e56bf3fad
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/AddService.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/AddServiceImpl.java
new file mode 100644
index 0000000000..7ca8fb04b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/AddServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorClient.java
new file mode 100644
index 0000000000..9abc488523
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorClient.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorService.java
new file mode 100644
index 0000000000..a1880698ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..28ce0ec78a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/DivideService.java
new file mode 100644
index 0000000000..f72b05cece
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/DivideService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java
new file mode 100644
index 0000000000..1323edf55a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/MultiplyService.java
new file mode 100644
index 0000000000..5290605938
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/MultiplyService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..91b803bc9e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/PolicyQNames.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/PolicyQNames.java
new file mode 100644
index 0000000000..3e1bc45842
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/PolicyQNames.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/SubtractService.java
new file mode 100644
index 0000000000..bf0d1882b6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/SubtractService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
new file mode 100644
index 0000000000..58cc4a3547
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
new file mode 100644
index 0000000000..4b04a4d0b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
new file mode 100644
index 0000000000..3dcadd724e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
new file mode 100644
index 0000000000..3d314a9d14
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/policy/src/main/resources/Calculator.composite b/tags/java/sca/1.5.1/itest/policy/src/main/resources/Calculator.composite
new file mode 100644
index 0000000000..aed7684099
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/resources/Calculator.composite
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..a20489035b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.itest.TestPolicyProcessor;qname=http://schemas.xmlsoap.org/ws/2004/09/policy#Policy,model=org.apache.tuscany.sca.itest.Policy
diff --git a/tags/java/sca/1.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
new file mode 100644
index 0000000000..d9f144b3ff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT 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.5.1/itest/policy/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/policy/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..0009d712f3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/main/resources/definitions.xml
@@ -0,0 +1,147 @@
+<?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" />
+    <sca:intent name="TestIntent_4.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:intent name="TestIntent_4.Qualifier_1" />
+
+    <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.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
new file mode 100644
index 0000000000..885e8314ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
new file mode 100644
index 0000000000..ba17755b88
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 javax.xml.namespace.QName;
+
+/**
+ * Interface that will abstract various types of policy specifications
+ * and attachments for example WS-Policy
+ *
+ * @version $Rev$ $Date$
+ */
+public interface Policy {
+    QName getSchemaName();
+    void setUnresolved(boolean unresolved);
+    boolean isUnresolved();
+}
diff --git a/tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
new file mode 100644
index 0000000000..ff47988bce
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.policy.Policy;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+/**
+ * A PolicyProcessor used for testing.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {
+    
+    public TestPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+        
+    }
+
+    public QName getArtifactType() {
+        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "Policy");
+    }
+
+    public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
+        return new MockPolicyImplOne();
+    }
+
+    public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException,
+                                                        XMLStreamException {
+    }
+
+    public Class<Policy> getModelType() {
+        // TODO Auto-generated method stub
+        return Policy.class;
+    }
+
+    public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException {
+
+    }
+
+    
+    public class MockPolicyImplOne implements Policy {
+        public QName getSchemaName() {
+            return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "Policy");
+        }
+
+        public boolean isUnresolved() {
+            return false;
+        }
+
+        public void setUnresolved(boolean unresolved) {
+        }
+        
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/pom.xml b/tags/java/sca/1.5.1/itest/pom.xml
new file mode 100644
index 0000000000..14361f3354
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/pom.xml
@@ -0,0 +1,734 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</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.5</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.4</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>atom</module>
+                <module>bpel</module>
+                <module>builder</module>
+                <module>callablereferences</module>
+                <module>callablereferences-ws</module>
+                <module>callback-api</module>
+                <module>callback-basic</module>
+                <module>callback-complex-type</module>
+                <module>callback-composite-scope</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> 
+                -->
+                <!-- TUSCANY-3165 - waiting for OpenEJB 3.0.2 release
+                <module>contribution-jee</module>
+                -->
+                <module>contribution-jee-samples</module>
+                <module>conversations</module>
+                <module>corba</module>
+                <module>conversations-ws</module>
+                <module>databindings</module>
+                <!--module>domain</module-->
+                <module>domainmgr</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>http-jsonrpc</module>
+                <module>interfaces</module>
+                <!--
+                <module>interop-soap-client</module>
+                <module>interop-soap-round2-client</module>
+                <module>interop-soap-service</module>
+                -->
+                <module>jaxws</module>
+                <module>jms</module>
+                <module>jms-args</module>
+                <module>jms-callbacks</module>
+                <module>jms-definitions</module>
+                <module>jms-format</module>
+                <module>jms-oneway-nocf</module>
+                <module>jms-noreplyto</module>
+                <module>jms-nonscaclient-exceptions</module>
+                <module>jms-nulls</module>
+                <module>jms-selectors</module>
+                <module>jms-ttl</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-basicauth</module>
+                <module>policy-security-jsr250</module>
+                <module>policy-security-token</module>
+                <module>properties</module>
+                <module>recursive</module>
+                <module>recursive-multi-level</module>
+                <module>recursive-ws</module>
+                <module>references-collection</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>workspace-manager</module>
+                <module>wsdl</module>
+                <module>wsdlgen</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.5.1</version>
+                    <scope>runtime</scope>
+	    	</dependency>
+                <dependency>
+	    	    <groupId>org.apache.tuscany.sca</groupId>
+	    	    <artifactId>tuscany-host-webapp-junit</artifactId>
+	    	    <version>1.5.1</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>
+            </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.5.1</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.5.1</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.5.1</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.5.1</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.5.1</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.5.1/itest/promotion-interface-missmatch/pom.xml b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/pom.xml
new file mode 100644
index 0000000000..6352916998
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
new file mode 100644
index 0000000000..764f31b7cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
new file mode 100644
index 0000000000..0c72b52ed9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
new file mode 100644
index 0000000000..d6545b5a23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
new file mode 100644
index 0000000000..30ea559694
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
new file mode 100644
index 0000000000..b3b6f033e5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/promotion-interface-missmatch/src/main/resources/example.composite b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/example.composite
new file mode 100644
index 0000000000..cddf951d65
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/example.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
new file mode 100644
index 0000000000..a8ccde2e11
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
new file mode 100644
index 0000000000..2caec0f20d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
@@ -0,0 +1,45 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
new file mode 100644
index 0000000000..740af4f43d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/properties/pom.xml b/tags/java/sca/1.5.1/itest/properties/pom.xml
new file mode 100644
index 0000000000..a521782737
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-properties</artifactId>
+    <name>Apache Tuscany SCA iTest Properties</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+		    <plugin>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-plugin</artifactId>
+                <version>1.1.1</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.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
new file mode 100644
index 0000000000..b0fd64c9da
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
new file mode 100644
index 0000000000..51d064ba81
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
new file mode 100644
index 0000000000..38c26e70d6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
new file mode 100644
index 0000000000..68ce5a3cb6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
new file mode 100644
index 0000000000..6b714c0d67
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
new file mode 100644
index 0000000000..586d4864a9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
new file mode 100644
index 0000000000..5e3c985144
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
new file mode 100644
index 0000000000..52f9871d1b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
new file mode 100644
index 0000000000..5b93bd8b8a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
new file mode 100644
index 0000000000..c0c068d12e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
@@ -0,0 +1,151 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
new file mode 100644
index 0000000000..acd1f26670
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
new file mode 100644
index 0000000000..71dce41efc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
new file mode 100644
index 0000000000..17b4e582d6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
@@ -0,0 +1,134 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
new file mode 100644
index 0000000000..eb642b6637
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
@@ -0,0 +1,188 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
new file mode 100644
index 0000000000..a57ccd90c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
new file mode 100644
index 0000000000..c147a2affe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
new file mode 100644
index 0000000000..0a84e93828
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
new file mode 100644
index 0000000000..6344a8aa83
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
new file mode 100644
index 0000000000..11a0a758cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
new file mode 100644
index 0000000000..76bcd06fca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
new file mode 100644
index 0000000000..7a809ebf1e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/properties/src/main/java/test/jaxb/props/package-info.java b/tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/package-info.java
new file mode 100644
index 0000000000..f726552a62
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/tags/java/sca/1.5.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
new file mode 100644
index 0000000000..70a251fa16
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+	* Licensed to the Apache Software Foundation (ASF) under one

+	* or more contributor license agreements.  See the NOTICE file

+	* distributed with this work for additional information

+	* regarding copyright ownership.  The ASF licenses this file

+	* to you under the Apache License, Version 2.0 (the

+	* "License"); you may not use this file except in compliance

+	* with the License.  You may obtain a copy of the License at

+	* 

+	*   http://www.apache.org/licenses/LICENSE-2.0

+	* 

+	* Unless required by applicable law or agreed to in writing,

+	* software distributed under the License is distributed on an

+	* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/properties/src/main/resources/Outer.composite b/tags/java/sca/1.5.1/itest/properties/src/main/resources/Outer.composite
new file mode 100644
index 0000000000..b3e529e8b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/Outer.composite
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed 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.5.1/itest/properties/src/main/resources/OuterPropertyTest.composite b/tags/java/sca/1.5.1/itest/properties/src/main/resources/OuterPropertyTest.composite
new file mode 100644
index 0000000000..5237e964a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/OuterPropertyTest.composite
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed 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.5.1/itest/properties/src/main/resources/PropertyTest.composite b/tags/java/sca/1.5.1/itest/properties/src/main/resources/PropertyTest.composite
new file mode 100644
index 0000000000..75deddbdad
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/PropertyTest.composite
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed 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.5.1/itest/properties/src/main/resources/customer.xsd b/tags/java/sca/1.5.1/itest/properties/src/main/resources/customer.xsd
new file mode 100644
index 0000000000..8861d7e7b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/customer.xsd
@@ -0,0 +1,30 @@
+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/properties/src/main/resources/fileProperty.txt b/tags/java/sca/1.5.1/itest/properties/src/main/resources/fileProperty.txt
new file mode 100644
index 0000000000..0d3d9ead83
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/fileProperty.txt
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/properties/src/main/resources/manyValuesFileProperty.txt b/tags/java/sca/1.5.1/itest/properties/src/main/resources/manyValuesFileProperty.txt
new file mode 100644
index 0000000000..450f397b30
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/manyValuesFileProperty.txt
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/properties/src/main/resources/mySimpleService.composite b/tags/java/sca/1.5.1/itest/properties/src/main/resources/mySimpleService.composite
new file mode 100644
index 0000000000..75fdd24add
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/mySimpleService.composite
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/properties/src/main/resources/rcProps.txt b/tags/java/sca/1.5.1/itest/properties/src/main/resources/rcProps.txt
new file mode 100644
index 0000000000..052c291fd0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/rcProps.txt
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed 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.5.1/itest/properties/src/main/resources/rcprops.xsd b/tags/java/sca/1.5.1/itest/properties/src/main/resources/rcprops.xsd
new file mode 100644
index 0000000000..21289fa7b2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/main/resources/rcprops.xsd
@@ -0,0 +1,55 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed 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.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
new file mode 100644
index 0000000000..8cf182e24a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
new file mode 100644
index 0000000000..28357c5bbe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
@@ -0,0 +1,164 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
new file mode 100644
index 0000000000..6979659ece
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
@@ -0,0 +1,468 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
new file mode 100644
index 0000000000..8ee5dce91f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/recursive-multi-level/pom.xml b/tags/java/sca/1.5.1/itest/recursive-multi-level/pom.xml
new file mode 100644
index 0000000000..3f19bcdda3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <!--relativePath>../pom.xml</relativePath-->
+    </parent>
+    <artifactId>itest-recursive-multi-level</artifactId>
+    <name>Apache Tuscany SCA iTest Recusive Multi-Level</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>       
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
new file mode 100644
index 0000000000..214d4d8a1f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
new file mode 100644
index 0000000000..51948a3b81
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
new file mode 100644
index 0000000000..08df8ade17
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
new file mode 100644
index 0000000000..2ad9f815f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
new file mode 100644
index 0000000000..975f61c664
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR 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.5.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
new file mode 100644
index 0000000000..f9bbcc76d8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR 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.5.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
new file mode 100644
index 0000000000..09fd10fb7e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR 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.5.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
new file mode 100644
index 0000000000..d8d6fe0dc5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/pom.xml b/tags/java/sca/1.5.1/itest/recursive-ws/pom.xml
new file mode 100644
index 0000000000..d77d50994c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-recursive-ws</artifactId>
+    <name>Apache Tuscany SCA iTest Recursive WS</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</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.5.1</version>
+                    <scope>runtime</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/Target.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/Target.java
new file mode 100644
index 0000000000..c77fcea868
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/Target.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
new file mode 100644
index 0000000000..87e412829e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
new file mode 100644
index 0000000000..e565055252
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/java/recursive/Composer.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/Composer.java
new file mode 100644
index 0000000000..e53f99d9c3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/Composer.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
new file mode 100644
index 0000000000..7956d153cb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
new file mode 100644
index 0000000000..3d75b7b165
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
new file mode 100644
index 0000000000..8b77484922
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
new file mode 100644
index 0000000000..5035d1cbd9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/main/resources/Client.composite b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Client.composite
new file mode 100644
index 0000000000..56d7c01377
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Client.composite
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive-ws/src/main/resources/Inner.composite b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Inner.composite
new file mode 100644
index 0000000000..b054ae0944
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Inner.composite
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive-ws/src/main/resources/Outer.composite b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Outer.composite
new file mode 100644
index 0000000000..3c3f327b28
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Outer.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
new file mode 100644
index 0000000000..b5c180919c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
new file mode 100644
index 0000000000..891cac0b79
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
new file mode 100644
index 0000000000..4b398743eb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
new file mode 100644
index 0000000000..b50bc29a1f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive-ws/src/main/resources/policy/definitions.xml b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/definitions.xml
new file mode 100644
index 0000000000..3ae202f4aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/definitions.xml
@@ -0,0 +1,39 @@
+<?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.5.1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
new file mode 100644
index 0000000000..c6e46564f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
new file mode 100644
index 0000000000..3e71246da2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
new file mode 100644
index 0000000000..6638d65551
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
new file mode 100644
index 0000000000..214379bcea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/pom.xml b/tags/java/sca/1.5.1/itest/recursive/pom.xml
new file mode 100644
index 0000000000..21b5613c8a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-recursive</artifactId>
+    <name>Apache Tuscany SCA iTest Recursive Composition</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/recursive/src/main/java/circular/include/DemoClass.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/circular/include/DemoClass.java
new file mode 100644
index 0000000000..fe42911486
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/circular/include/DemoClass.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/composite/CompositeClient.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/CompositeClient.java
new file mode 100644
index 0000000000..5edc305970
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/CompositeClient.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/composite/Source.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/Source.java
new file mode 100644
index 0000000000..d0efcc1df1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/Source.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/composite/SourceCallback.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/SourceCallback.java
new file mode 100644
index 0000000000..baa95a8e39
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/SourceCallback.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/composite/SourceImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/SourceImpl.java
new file mode 100644
index 0000000000..72bf552a1e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/SourceImpl.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 {
+
+    public static int callbackCount = 0;
+    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) {
+        synchronized(this) {
+            callbackCount += 1;
+        }
+        System.out.println("Work thread " + Thread.currentThread());
+        System.out.println("Result: " + result);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/Target.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/Target.java
new file mode 100644
index 0000000000..9a8f68a7fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/Target.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/composite/TargetImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/TargetImpl.java
new file mode 100644
index 0000000000..e744aa7967
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/TargetImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.ComponentContext;
+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(Target.class)
+@Scope("COMPOSITE")
+public class TargetImpl implements Target {
+
+    private ComponentContext ctx; 
+
+    @Context 
+    public void setContext(ComponentContext context) {
+        ctx = context;
+    }
+
+    public void someMethod(String arg) {
+        System.out.println("Target: " + arg);
+        SourceCallback sourceCallback = (SourceCallback)ctx.getRequestContext().getCallbackReference().getService();
+        sourceCallback.receiveResult(arg + " -> Target.someMethod");
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/A.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/A.java
new file mode 100644
index 0000000000..e87cbde26d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/A.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/foo/B.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/B.java
new file mode 100644
index 0000000000..9d060cab59
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/B.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/foo/I.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/I.java
new file mode 100644
index 0000000000..f6d55baef3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/I.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/policy/Target.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/Target.java
new file mode 100644
index 0000000000..c77fcea868
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/Target.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/policy/TargetClientImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/TargetClientImpl.java
new file mode 100644
index 0000000000..87e412829e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/TargetClientImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/TargetServiceImpl.java
new file mode 100644
index 0000000000..e565055252
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/TargetServiceImpl.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/sample/ComponentAImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentAImpl.java
new file mode 100644
index 0000000000..f513949105
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentAImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/sample/ComponentCImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentCImpl.java
new file mode 100644
index 0000000000..586a9ee6a7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentCImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/sample/ComponentEImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentEImpl.java
new file mode 100644
index 0000000000..dbf2735aa7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentEImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/sample/ComponentFImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentFImpl.java
new file mode 100644
index 0000000000..5e136e536c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentFImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/sample/Service1.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/Service1.java
new file mode 100644
index 0000000000..81bdce79f1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/Service1.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test/Aggregator.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/Aggregator.java
new file mode 100644
index 0000000000..88b3bed1b2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/Aggregator.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test/AggregatorImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/AggregatorImpl.java
new file mode 100644
index 0000000000..f6ac6c8741
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/AggregatorImpl.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test/InnerSourceImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/InnerSourceImpl.java
new file mode 100644
index 0000000000..c8dad5ae35
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/InnerSourceImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test/OuterSourceImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/OuterSourceImpl.java
new file mode 100644
index 0000000000..11816e82cf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/OuterSourceImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test/Source.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/Source.java
new file mode 100644
index 0000000000..9b93740d9d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test/Source.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test1/composite/Target.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/Target.java
new file mode 100644
index 0000000000..4883e12f49
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/Target.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test1/composite/TargetOne.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/TargetOne.java
new file mode 100644
index 0000000000..a7c68f4ffd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/TargetOne.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java
new file mode 100644
index 0000000000..7fff8e2e9b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/main/resources/AComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/AComposite.composite
new file mode 100644
index 0000000000..1b5dee8762
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/AComposite.composite
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/BComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/BComposite.composite
new file mode 100644
index 0000000000..7d4588eba4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/BComposite.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/CComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/CComposite.composite
new file mode 100644
index 0000000000..6d7b4ec600
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/CComposite.composite
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/Composite1.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite1.composite
new file mode 100644
index 0000000000..56fd7c621f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite1.composite
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/Composite2.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite2.composite
new file mode 100644
index 0000000000..54f10673a4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite2.composite
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/Composite3.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite3.composite
new file mode 100644
index 0000000000..040653493f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite3.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/Demo1Composite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Demo1Composite.composite
new file mode 100644
index 0000000000..6b2a964b9b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Demo1Composite.composite
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/Demo2Composite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Demo2Composite.composite
new file mode 100644
index 0000000000..6b8c0a348e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Demo2Composite.composite
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/Inner.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Inner.composite
new file mode 100644
index 0000000000..398ebdf6e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Inner.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/InnerComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/InnerComposite.composite
new file mode 100644
index 0000000000..3376ac8ff5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/InnerComposite.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/InnerComposite2.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/InnerComposite2.composite
new file mode 100644
index 0000000000..c9eff4fa9d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/InnerComposite2.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..289b92a3f2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/recursive/src/main/resources/Outer.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Outer.composite
new file mode 100644
index 0000000000..987990d854
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/Outer.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/OuterComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/OuterComposite.composite
new file mode 100644
index 0000000000..cb1c1e13d4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/OuterComposite.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/foo/foo.png b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/foo.png
new file mode 100644
index 0000000000..0f2ec78aaf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/foo.png
diff --git a/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o1.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o1.composite
new file mode 100644
index 0000000000..1d31c2f424
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o1.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/foo/o2.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o2.composite
new file mode 100644
index 0000000000..4f21c21860
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o2.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/foo/o3.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o3.composite
new file mode 100644
index 0000000000..72c732c03e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o3.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/foo/o4.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o4.composite
new file mode 100644
index 0000000000..f8f07eed09
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o4.composite
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
new file mode 100644
index 0000000000..4a6df023b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
new file mode 100644
index 0000000000..25007aebb2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/policy/definitions.xml b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/definitions.xml
new file mode 100644
index 0000000000..957028e3bd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/definitions.xml
@@ -0,0 +1,46 @@
+<?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.5.1/itest/recursive/src/main/resources/test1/InnerComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/test1/InnerComposite.composite
new file mode 100644
index 0000000000..177fa10550
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/test1/InnerComposite.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/main/resources/test1/OuterComposite.composite b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/test1/OuterComposite.composite
new file mode 100644
index 0000000000..d05a67f45f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/main/resources/test1/OuterComposite.composite
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
new file mode 100644
index 0000000000..1f7c35dd91
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/composite/CompositeTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/CompositeTestCase.java
new file mode 100644
index 0000000000..928cb3fea9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/CompositeTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 {
+        System.out.println("Main thread " + Thread.currentThread());
+        source.clientMethod("Client.main");
+        System.out.println("Sleeping ...");
+        Thread.sleep(1000);
+        if (SourceImpl.callbackCount != 2) {
+            throw new IllegalStateException("Expected callbacks not received");
+        }
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
new file mode 100644
index 0000000000..f042113f7a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
@@ -0,0 +1,113 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
new file mode 100644
index 0000000000..87eb948452
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
@@ -0,0 +1,73 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/foo/O2TestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/foo/O2TestCase.java
new file mode 100644
index 0000000000..d617ec8592
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/foo/O2TestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/foo/O4TestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/foo/O4TestCase.java
new file mode 100644
index 0000000000..15626c75ac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/foo/O4TestCase.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/policy/PolicyTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/policy/PolicyTestCase.java
new file mode 100644
index 0000000000..c9cc84f7d4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/policy/PolicyTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/C.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/C.java
new file mode 100644
index 0000000000..bf8391348b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/C.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/CImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/CImpl.java
new file mode 100644
index 0000000000..466284983e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/CImpl.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/NestedTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/NestedTestCase.java
new file mode 100644
index 0000000000..fc5d251460
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/NestedTestCase.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
new file mode 100644
index 0000000000..a543add69b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/X.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/X.java
new file mode 100644
index 0000000000..e3a9335068
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/X.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/XImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/XImpl.java
new file mode 100644
index 0000000000..e430807568
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/XImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/Y.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/Y.java
new file mode 100644
index 0000000000..c15a4f635a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/Y.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/sample/YImpl.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/YImpl.java
new file mode 100644
index 0000000000..994c9eb95f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/YImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/test/InnerTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/test/InnerTestCase.java
new file mode 100644
index 0000000000..ebb4bc7acb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/test/InnerTestCase.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/recursive/src/test/java/test/OuterTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/test/OuterTestCase.java
new file mode 100644
index 0000000000..6e95f5808b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/test/OuterTestCase.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.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;
+
+public class OuterTestCase {
+
+    private SCADomain domain;
+    private Aggregator aggregator;
+
+    @Before
+    public void setUp() throws Exception {
+        domain = SCADomain.newInstance("Outer.composite");
+        aggregator = domain.getService(Aggregator.class, "Inner");
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        domain.close();
+    }
+
+    @Ignore("TUSCANY-2484")
+    @Test
+    public void test() throws Exception {
+        String result = aggregator.getAggregatedData();
+        Assert.assertTrue(result.contains("InnerSource"));
+        Assert.assertTrue(result.contains("OuterSource"));
+        System.out.println(result);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/tags/java/sca/1.5.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
new file mode 100644
index 0000000000..b3abcac06e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/references-collection/pom.xml b/tags/java/sca/1.5.1/itest/references-collection/pom.xml
new file mode 100644
index 0000000000..5e7e9487d4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-references-collection</artifactId>
+    <name>Apache Tuscany SCA iTest References Collection</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/Crawler.java b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/Crawler.java
new file mode 100644
index 0000000000..2607e9aabc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/Crawler.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package crawler;
+
+import org.osoa.sca.annotations.Conversational;
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+@Conversational
+public interface Crawler
+{
+    /**
+     * Returns the crawler Id.
+     * @return a String containing the CrawlerId
+     */
+    String getCrawlerId();
+
+    /**
+     * Starts a crawl process.
+     * @return a message that the crawl was started
+     */
+    String crawl();
+    
+    /**
+     * Closes the conversation.
+     */
+    @EndsConversation
+    String close();   
+}
diff --git a/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/CrawlerController.java b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/CrawlerController.java
new file mode 100644
index 0000000000..11b1b6b580
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/CrawlerController.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package crawler;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface CrawlerController
+{
+    /**
+     * Tries to return a Crawler with the given Id in the list of crawlers.
+     * It uses the getServiceReference() method which should throw an exception because of multiplicity 0..n
+     * @param crawlerId the id of the Crawler
+     * @return the Crawler
+     */
+    Crawler getCrawler(String crawlerId);
+
+    /**
+     * Tries to return a Crawler with the given Id in the list of crawlers.
+     * It uses the getServiceReferences() method which shoulkd work properly with multiplicity 0..n
+     * @param crawlerId the id of the Crawler
+     * @return the Crawler
+     */
+    Crawler findCrawler(String crawlerId);
+}
diff --git a/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
new file mode 100644
index 0000000000..1ca2a3797a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package crawler.impl;
+
+import crawler.Crawler;
+import crawler.CrawlerController;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.tuscany.sca.api.ComponentContextExtension;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.AllowsPassByReference;
+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(CrawlerController.class)
+@Scope("COMPOSITE")
+@AllowsPassByReference
+public class CrawlerControllerImpl implements CrawlerController
+{
+    @Context
+    protected ComponentContext componentContext;
+
+    @Reference
+    public List<Crawler> crawlers;
+
+    /**
+     * @see CrawlerController#getCrawler(String)
+     */
+    public Crawler getCrawler(String crawlerId)
+    {
+        for (int i = 0; i < crawlers.size(); i++)
+        {
+            Crawler crawler = crawlers.get(i);
+            String id = crawler.getCrawlerId();
+            if (crawlerId.equals(id))
+            {
+                Crawler newCrawler = componentContext.getService(Crawler.class, "crawlers");
+                return newCrawler;
+            }
+        }
+        throw new RuntimeException("No crawler with id " + crawlerId + " found");
+    }
+
+    /**
+     * @see CrawlerController#findCrawler(String)
+     */
+    public Crawler findCrawler(String crawlerId)
+    {
+        Collection<Crawler> crawlers = ((ComponentContextExtension)componentContext).getServices(Crawler.class, "crawlers");
+        for (Crawler crawler : crawlers)
+        {
+            String id = crawler.getCrawlerId();
+            if (crawlerId.equals(id))
+            {
+                return crawler;
+            }
+        }
+        throw new RuntimeException("No crawler with id " + crawlerId + " found");
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
new file mode 100644
index 0000000000..0224d7750e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package crawler.impl;
+
+import crawler.Crawler;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.AllowsPassByReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(Crawler.class)
+@AllowsPassByReference
+@Scope("CONVERSATION")
+public class CrawlerImpl implements Crawler
+{
+    @ConversationID
+    protected String conversationId;
+    
+    @Property
+    protected String crawlerId;
+
+    @Context
+    protected ComponentContext componentContext;
+
+    /**
+     * @see Crawler#getCrawlerId()
+     */
+    public String getCrawlerId()
+    {
+        return crawlerId;
+    }
+
+    /**
+     * @see Crawler#crawl()
+     */
+    public String crawl()
+    {
+        System.out.println("started crawl with conversation " + conversationId);
+        return "started crawl with id " + getCrawlerId();
+    }
+    
+    /**
+     * @see Crawler#close()
+     */
+    public String close()
+    {
+        return "ended conversation with id " + getCrawlerId();
+    }
+}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
new file mode 100644
index 0000000000..e486a23e23
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package crawler.impl;
+
+import crawler.Crawler;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.AllowsPassByReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(Crawler.class)
+@AllowsPassByReference
+@Scope("CONVERSATION")
+public class SpecialCrawlerImpl implements Crawler
+{
+    @ConversationID
+    protected String conversationId;
+
+    @Property
+    protected String crawlerId;
+
+    @Context
+    protected ComponentContext componentContext;
+
+    /**
+     * @see Crawler#getCrawlerId()
+     */
+    public String getCrawlerId()
+    {
+        return crawlerId;
+    }
+
+    /**
+     * @see Crawler#crawl()
+     */
+    public String crawl()
+    {
+        System.out.println("started crawl with conversation " + conversationId);
+        return "started crawl with id " + getCrawlerId();
+    }
+    
+    /**
+     * @see Crawler#close()
+     */
+    public String close()
+    {
+        return "ended conversation with id " + getCrawlerId();
+    }
+}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/references-collection/src/main/resources/test.composite b/tags/java/sca/1.5.1/itest/references-collection/src/main/resources/test.composite
new file mode 100644
index 0000000000..ed3adfc7ae
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/src/main/resources/test.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"
+           targetNamespace="http://crawler"
+           xmlns:crawler="http://crawler"
+           name="crawler">
+
+    <component name="CrawlerControllerComponent">
+        <implementation.java class="crawler.impl.CrawlerControllerImpl"/>
+            <service name="CrawlerController">
+                <interface.java interface="crawler.CrawlerController" />
+            </service>
+        <reference name="crawlers" multiplicity="1..n" target="CrawlerComponent SpecialCrawlerComponent" />
+    </component>
+	       
+    <component name="CrawlerComponent">
+        <implementation.java class="crawler.impl.CrawlerImpl"/>
+        <property name="crawlerId">normalcrawler</property>  
+        <service name="Crawler">
+            <interface.java interface="crawler.Crawler" />									
+        </service>	
+    </component>	
+	
+    <component name="SpecialCrawlerComponent">
+        <implementation.java class="crawler.impl.SpecialCrawlerImpl"/>
+        <property name="crawlerId">specialcrawler</property>
+        <service name="Crawler">
+            <interface.java interface="crawler.Crawler" />			
+        </service>
+    </component>
+
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java b/tags/java/sca/1.5.1/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
new file mode 100644
index 0000000000..1fc0e758c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package crawler;
+
+import crawler.Crawler;
+import crawler.CrawlerController;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.osoa.sca.ServiceRuntimeException;
+
+import junit.framework.TestCase;
+
+public class ReferenceMultiplicityTestCase extends TestCase
+{
+    private final String CRAWLER_ID = "normalcrawler";
+    private final String SPECIAL_CRAWLER_ID = "specialcrawler";
+
+    private static SCANode _scaDomain;
+    private CrawlerController _controller;
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        _scaDomain = nodeFactory.createSCANode("test.composite", 
+                                               new SCAContribution("crawler", "./target/classes"));
+        assertNotNull(_scaDomain);
+        _scaDomain.start();
+        _controller = ((SCAClient)_scaDomain).getService(CrawlerController.class, "CrawlerControllerComponent");
+        assertNotNull(_controller);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @see junit.framework.TestCase#tearDown()
+     */
+    protected void tearDown() throws Exception
+    {
+        _controller = null;
+        if (_scaDomain != null)
+        {
+            _scaDomain.stop();
+            _scaDomain = null;
+        }
+    }
+
+    public void testGetCrawler() throws Exception
+    {
+        try
+        {
+            _controller.getCrawler(CRAWLER_ID);
+            fail("Expected exception");
+        }
+        catch (ServiceRuntimeException e)
+        {
+            assertEquals("Unexpected error message", "Reference crawlers has multiplicity ONE_N", e.getMessage());
+        }
+        catch (Exception e)
+        {
+            fail("Expected ServiceRuntimeException, not a " + e.getClass());
+        }
+
+        try
+        {
+            _controller.getCrawler(SPECIAL_CRAWLER_ID);
+            fail("Expected exception");
+        }
+        catch (ServiceRuntimeException e)
+        {
+            assertEquals("Unexpected error message", "Reference crawlers has multiplicity ONE_N", e.getMessage());
+        }
+        catch (Exception e)
+        {
+            fail("Expected ServiceRuntimeException, not a " + e.getClass());
+        }
+    }
+/*
+    public void testFindCrawler() throws Exception
+    {
+        try
+        {
+            Crawler crawler = _controller.findCrawler(CRAWLER_ID);
+            assertNotNull(crawler);
+            String msg = crawler.crawl();
+            assertEquals("Received unexpected msg", "started crawl with id " + CRAWLER_ID, msg);
+            msg = crawler.close();
+            assertEquals("Received unexpected msg", "ended conversation with id " + CRAWLER_ID, msg);
+        }        
+        catch (Exception e)
+        {
+            fail("Unexpected Exception " + e.getClass());
+        }
+
+        try
+        {
+            Crawler crawler = _controller.findCrawler(SPECIAL_CRAWLER_ID);
+            assertNotNull(crawler);
+            String msg = crawler.crawl();
+            assertEquals("Received unexpected msg", "started crawl with id " + SPECIAL_CRAWLER_ID, msg);
+            msg = crawler.close();
+            assertEquals("Received unexpected msg", "ended conversation with id " + SPECIAL_CRAWLER_ID, msg);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected Exception " + e.getClass());
+        }
+    }
+*/
+}
diff --git a/tags/java/sca/1.5.1/itest/references/pom.xml b/tags/java/sca/1.5.1/itest/references/pom.xml
new file mode 100644
index 0000000000..c46d570acb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-references</artifactId>
+    <name>Apache Tuscany SCA iTest References</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
new file mode 100644
index 0000000000..f8c0850118
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
new file mode 100644
index 0000000000..647fff0159
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
new file mode 100644
index 0000000000..785920bb2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
new file mode 100644
index 0000000000..6b1065ab0d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
new file mode 100644
index 0000000000..1cd7cb7fe5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 BComponentWrongTargetImpl implements BComponent {
+
+    protected CComponent cReference;
+
+    public BComponentWrongTargetImpl(@Reference(name = "cReference") CComponent cReference) {
+        this.cReference = cReference;
+    }
+
+    public String bFoo() {
+        return "BComponentWrongTarget";
+    }
+
+    public String fooC() {
+        return "B" + cReference.cFoo();
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
new file mode 100644
index 0000000000..d436c28adc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
new file mode 100644
index 0000000000..a1823e1cdc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
new file mode 100644
index 0000000000..2618ec7095
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
new file mode 100644
index 0000000000..79c802bc97
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/tags/java/sca/1.5.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
new file mode 100644
index 0000000000..894f6681c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed 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="AComponentAutowire" autowire="true">

+        <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />

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

+    </component>    

+

+    <component name="BComponentWrongTarget">

+        <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentWrongTargetImpl" />

+    </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.5.1/itest/references/src/main/resources/InnerReferencesTest.composite b/tags/java/sca/1.5.1/itest/references/src/main/resources/InnerReferencesTest.composite
new file mode 100644
index 0000000000..6cadc52c13
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/resources/InnerReferencesTest.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed 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.5.1/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/tags/java/sca/1.5.1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
new file mode 100644
index 0000000000..708960974b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed 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/CComponentImpl">
+        <!-- reference name="cReference" target="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.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
new file mode 100644
index 0000000000..bfd542e2f2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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;
+    private static AComponent acomponentAutowire;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        domain = SCADomain.newInstance("AutoWiredReferencesTest.composite");
+        acomponent = domain.getService(AComponent.class, "AComponent");
+        acomponentAutowire = domain.getService(AComponent.class, "AComponentAutowire");
+    }
+
+    @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);
+        }
+    }
+    
+    @Test
+    public void testTargetPrecendence() {
+        try {
+            assertEquals("BComponent", acomponentAutowire.fooB());
+        } catch (Exception e) {
+            Assert.assertTrue(true);
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
new file mode 100644
index 0000000000..1d8284f0fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
new file mode 100644
index 0000000000..4b3a745a19
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/scopes/pom.xml b/tags/java/sca/1.5.1/itest/scopes/pom.xml
new file mode 100644
index 0000000000..12b2da72fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/scopes/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-scopes</artifactId>    
+    <name>Apache Tuscany SCA iTest Scopes</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
new file mode 100644
index 0000000000..4aa414be8e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
new file mode 100644
index 0000000000..fae4dcd586
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
new file mode 100644
index 0000000000..878f7e4cc6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/scopes/src/main/resources/scopes.composite b/tags/java/sca/1.5.1/itest/scopes/src/main/resources/scopes.composite
new file mode 100644
index 0000000000..54a1b66830
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/scopes/src/main/resources/scopes.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/tags/java/sca/1.5.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
new file mode 100644
index 0000000000..ce2519cbc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.5.1/itest/serialization/pom.xml b/tags/java/sca/1.5.1/itest/serialization/pom.xml
new file mode 100644
index 0000000000..21218c7a7f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-serialization</artifactId>
+    <name>Apache Tuscany SCA iTest Serialization</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>       
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>  
+           
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
new file mode 100644
index 0000000000..fa0f1c88d6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
new file mode 100644
index 0000000000..85d5dd860c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
new file mode 100644
index 0000000000..50c98d1afc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
new file mode 100644
index 0000000000..c268f9bda7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 Nested Stateless ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeNestedStatelessServiceReference() 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
new file mode 100644
index 0000000000..cf0307eb8e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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;
+
+    /**
+     * Injected reference to the Nested StatelessService.
+     */
+    @Reference(name = "nestedStatelessService")
+    protected ServiceReference<StatelessService> nestedStatelessServiceRef;
+
+    /**
+     * Tests Serializing a Stateless ServiceReference
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeStatelessServiceReference() throws Exception {
+        doTestSerializeStatelessServiceReference(statelessServiceRef);
+    }
+    
+    /**
+     * Tests Serializing a Nested Stateless ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeNestedStatelessServiceReference() throws Exception {
+        doTestSerializeStatelessServiceReference(nestedStatelessServiceRef);
+    }
+
+    /**
+     * Tests Serializing a Stateless ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    private void doTestSerializeStatelessServiceReference(
+            ServiceReference<StatelessService> aServiceRef) throws Exception {
+        Assert.assertNotNull(aServiceRef);
+
+        StatelessService service = aServiceRef.getService();
+        service.getCurrentTime();
+        
+        // Serialize the ServiceReference
+        byte[] serializedSR = ServiceReferenceUtils.serialize(aServiceRef);
+        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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
new file mode 100644
index 0000000000..deb8f75816
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 Nested Conversational ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeNestedConversationalServiceReference() 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
new file mode 100644
index 0000000000..60ecb7717a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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;
+
+    /**
+     * Injected reference to the ConversationalService.
+     */
+    @Reference(name = "nestedConversationalService")
+    protected ServiceReference<ConversationalService> nestedConversationalServiceRef;
+
+    /**
+     * 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 {
+        doTestSerializeConversationalServiceReference(conversationalServiceRef);
+    }
+
+    /**
+     * Tests Serializing a Nested Conversational ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeNestedConversationalServiceReference() throws Exception {
+        doTestSerializeConversationalServiceReference(nestedConversationalServiceRef);
+    }
+
+    /**
+     * Test Serializing a Conversational ServiceReference.
+     * 
+     * @param aServiceRef The Reference to Serialize
+     * @throws Exception Test failed.
+     */
+    private void doTestSerializeConversationalServiceReference(ServiceReference<ConversationalService> aServiceRef) throws Exception {
+        Assert.assertNotNull(aServiceRef);
+
+        ConversationalService service = aServiceRef.getService();
+        Object origConvID = service.getConversationID();
+        Assert.assertNotNull(origConvID);
+
+        // Serialize the ServiceReference
+        byte[] serializedSR = ServiceReferenceUtils.serialize(aServiceRef);
+        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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
new file mode 100644
index 0000000000..8a1fe48436
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
new file mode 100644
index 0000000000..ffe3a3b8ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
new file mode 100644
index 0000000000..24d43f79e3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
new file mode 100644
index 0000000000..2749891bd4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/tags/java/sca/1.5.1/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
new file mode 100644
index 0000000000..28c32d6fa4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed 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"/>
+        <reference name="nestedStatelessService" target="NestedComponent/StatelessNestedService"/>
+    </component>
+
+    <component name="SCAManagedConversationalClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedConversationalClientImpl" />
+        <reference name="conversationalService" target="ConversationalComponent"/>
+        <reference name="nestedConversationalService" target="NestedComponent/ConversationalNestedService"/>
+    </component>
+
+    <component name="NestedComponent">
+        <implementation.composite name="foo:NestedComposite" />
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/serialization/src/main/resources/nestedcomposite.composite b/tags/java/sca/1.5.1/itest/serialization/src/main/resources/nestedcomposite.composite
new file mode 100644
index 0000000000..8e1a132b0a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/main/resources/nestedcomposite.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed 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="NestedComposite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <service name="StatelessNestedService" promote = "StatelessNestedComponent"/>
+    
+    <service name="ConversationalNestedService" promote = "ConversationalNestedComponent"/>
+
+    <component name="StatelessNestedComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.StatelessServiceImpl" />
+    </component>
+
+    <component name="ConversationalNestedComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.ConversationalServiceImpl" />
+    </component>
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/tags/java/sca/1.5.1/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
new file mode 100644
index 0000000000..76e77284fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 Nested Stateless ServiceReference as managed
+     * SCA code.
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeNestedStatelessServiceReferenceInsideSCA() throws Exception {
+        SCAManagedClient client = domain.getService(
+                SCAManagedClient.class, "SCAManagedClientComponent");
+
+        client.testSerializeNestedStatelessServiceReference();
+    }
+
+    /**
+     * 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 Nested Conversational ServiceReference as managed
+     * SCA code.
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeNestedConversationalServiceReferenceInsideSCA() throws Exception {
+        SCAManagedConversationalClient client = domain.getService(
+                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
+
+        client.testSerializeNestedConversationalServiceReference();
+    }
+
+    /**
+     * 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.5.1/itest/services/pom.xml b/tags/java/sca/1.5.1/itest/services/pom.xml
new file mode 100644
index 0000000000..f69d66b9b6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-services</artifactId>
+    <name>Apache Tuscany SCA iTest Services</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
new file mode 100644
index 0000000000..1304ba4288
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
new file mode 100644
index 0000000000..3577e09add
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
new file mode 100644
index 0000000000..2e9b56d64d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
new file mode 100644
index 0000000000..cda3f38636
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
new file mode 100644
index 0000000000..39806a8101
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
new file mode 100644
index 0000000000..8713e5ab22
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
new file mode 100644
index 0000000000..aa745deb63
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
new file mode 100644
index 0000000000..83da15089f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
new file mode 100644
index 0000000000..36189f94bb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/services/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/services/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..37ea8f677d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/services/src/main/resources/ServicesTest.composite b/tags/java/sca/1.5.1/itest/services/src/main/resources/ServicesTest.composite
new file mode 100644
index 0000000000..eda885f9ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/main/resources/ServicesTest.composite
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/tags/java/sca/1.5.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
new file mode 100644
index 0000000000..ba6cac279c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/spring/pom.xml b/tags/java/sca/1.5.1/itest/spring/pom.xml
new file mode 100644
index 0000000000..ee822830ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-spring</artifactId>
+    <name>Apache Tuscany SCA iTest Spring Implementation</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-resource</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+            
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+	  <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-logging</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <!-- Spring dependencies... -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>2.5.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>2.5.5</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
new file mode 100644
index 0000000000..81c47a78d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.stockquote;

+

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

+

+/**

+ * This class implements the StockQuote service.

+ */

+@Service(StockQuoteService.class)

+public class StockQuoteImpl implements StockQuoteService {

+

+    public double getQuote(String symbol) {

+        double price = 104.0 + Math.random();

+        price = ((int)(price * 100)) / 100.0;

+

+        System.out.println("Getting stock quote for: " + symbol + ", value: "+ price);

+

+        return price;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
new file mode 100644
index 0000000000..d4b3fe9035
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
@@ -0,0 +1,30 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.stockquote;

+

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

+

+/**

+ * This is the business interface of the StockQuote service.

+ */

+@Remotable

+public interface StockQuoteService {

+

+    public double getQuote(String symbol);

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/AddService.java
new file mode 100644
index 0000000000..5a1e7a638a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/AddService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java
new file mode 100644
index 0000000000..a597691905
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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;

+    }

+

+}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java
new file mode 100644
index 0000000000..ad87375529
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..4363650e52
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
@@ -0,0 +1,79 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 AddService getAddService() {

+        return addService;

+    }

+

+    public void setSubtractService(SubtractService subtractService) {

+        this.subtractService = subtractService;

+    }

+    

+    public SubtractService getSubtractService() {

+        return subtractService;

+    }

+    

+    public void setDivideService(DivideService divideService) {

+        this.divideService = divideService;

+    }

+    

+    public DivideService getDivideService() {

+        return divideService;

+    }

+    

+    public void setMultiplyService(MultiplyService multiplyService) {

+        this.multiplyService = multiplyService;

+    }

+    

+    public MultiplyService getMultiplyService() {

+        return 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.5.1/itest/spring/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/DivideService.java
new file mode 100644
index 0000000000..ef6a8b375b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/DivideService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java
new file mode 100644
index 0000000000..cd91935f08
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/MultiplyService.java
new file mode 100644
index 0000000000..db568cc762
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/MultiplyService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..c85357fcd8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/SubtractService.java
new file mode 100644
index 0000000000..56ee372fc4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/SubtractService.java
@@ -0,0 +1,28 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
new file mode 100644
index 0000000000..1b669084d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
@@ -0,0 +1,35 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
new file mode 100644
index 0000000000..b48fb90148
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.security;

+

+import java.io.IOException;

+

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.NameCallback;

+import javax.security.auth.callback.PasswordCallback;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+/**

+ * @version $Rev$ $Date$

+ */

+public class CalculatorCallbackHandler implements CallbackHandler {

+

+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {

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

+            if (callbacks[i] instanceof NameCallback) {

+                NameCallback nc = (NameCallback)callbacks[i];

+                nc.setName("CalculatorUser");

+            } else if (callbacks[i] instanceof PasswordCallback) {

+                PasswordCallback pc = (PasswordCallback)callbacks[i];

+                pc.setPassword("CalculatorUserPasswd".toCharArray());

+            } else {

+                throw new UnsupportedCallbackException

+                 (callbacks[i], "Unsupported Callback!");

+            }

+          }

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
new file mode 100644
index 0000000000..fe4097640b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
@@ -0,0 +1,178 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.security;

+

+import java.security.Principal;

+import java.util.Map;

+

+import javax.security.auth.Subject;

+import javax.security.auth.callback.Callback;

+import javax.security.auth.callback.CallbackHandler;

+import javax.security.auth.callback.NameCallback;

+import javax.security.auth.callback.PasswordCallback;

+import javax.security.auth.login.LoginException;

+import javax.security.auth.spi.LoginModule;

+

+/**

+ * @version $Rev$ $Date$

+ */

+public class JaasLoginModule implements LoginModule {

+

+    private CallbackHandler callbackHandler;

+    private Subject subject;

+    private Principal userPrincipal;

+    private String userId;

+    private String password;

+    private boolean succeeded;

+    private boolean commitSucceeded;

+

+    public void initialize(Subject subject,

+                           CallbackHandler callbackHandler,

+                           Map<String, ?> sharedState,

+                           Map<String, ?> options) {

+        this.callbackHandler = callbackHandler;

+        this.subject = subject;

+    }

+

+    public boolean login() throws LoginException {

+        Callback[] callbacks = new Callback[2];

+        callbacks[0] = new NameCallback("UserId:");

+        callbacks[1] = new PasswordCallback("Password:", false);

+

+        try {

+            callbackHandler.handle(callbacks);

+            userId = ((NameCallback)callbacks[0]).getName();

+            password = new String(((PasswordCallback)callbacks[1]).getPassword());

+

+            if (userId.equals("CalculatorUser") && password.equals("CalculatorUserPasswd")) {

+                System.out.println("Successfully AUTHENTICATED!!");

+                succeeded = true;

+                return true;

+            } else {

+                System.out.println("Incorrect userId / password! AUTHENTICATION FAILED!!");

+                return false;

+            }

+        } catch (Exception e) {

+            e.printStackTrace();

+            return false;

+        }

+    }

+

+    /**

+     * <p> This method is called if the LoginContext's

+     * overall authentication succeeded

+     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules

+     * succeeded).

+     *

+     * <p> If this LoginModule's own authentication attempt

+     * succeeded (checked by retrieving the private state saved by the

+     * <code>login</code> method), then this method associates a

+     * <code>UserPrincipal</code>

+     * with the <code>Subject</code> located in the

+     * <code>LoginModule</code>.  If this LoginModule's own

+     * authentication attempted failed, then this method removes

+     * any state that was originally saved.

+     *

+     * <p>

+     *

+     * @exception LoginException if the commit fails.

+     *

+     * @return true if this LoginModule's own login and commit

+     *          attempts succeeded, or false otherwise.

+     */

+    public boolean commit() throws LoginException {

+        if (succeeded == false) {

+            return false;

+        } else {

+            // add a Principal (authenticated identity) to the Subject

+

+            // assume the user we authenticated is the UserPrincipal

+            userPrincipal = new UserPrincipal(userId);

+            if (!subject.getPrincipals().contains(userPrincipal))

+                subject.getPrincipals().add(userPrincipal);

+

+            // in any case, clean out state

+            userId = null;

+            password = null;

+            commitSucceeded = true;

+            return true;

+        }

+    }

+

+    /**

+     * <p> This method is called if the LoginContext's

+     * overall authentication failed.

+     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules

+     * did not succeed).

+     *

+     * <p> If this LoginModule's own authentication attempt

+     * succeeded (checked by retrieving the private state saved by the

+     * <code>login</code> and <code>commit</code> methods),

+     * then this method cleans up any state that was originally saved.

+     *

+     * <p>

+     *

+     * @exception LoginException if the abort fails.

+     *

+     * @return false if this LoginModule's own login and/or commit attempts

+     *          failed, and true otherwise.

+     */

+    public boolean abort() throws LoginException {

+        if (succeeded == false) {

+            return false;

+        } else if (succeeded == true && commitSucceeded == false) {

+            // login succeeded but overall authentication failed

+            succeeded = false;

+            userId = null;

+            password = null;

+            userPrincipal = null;

+        } else {

+            // overall authentication succeeded and commit succeeded,

+            // but someone else's commit failed

+            logout();

+        }

+        return true;

+    }

+

+    /**

+     * Logout the user.

+     *

+     * <p> This method removes the <code>SimplePrincipal</code>

+     * that was added by the <code>commit</code> method.

+     *

+     * <p>

+     *

+     * @exception LoginException if the logout fails.

+     *

+     * @return true in all cases since this <code>LoginModule</code>

+     *          should not be ignored.

+     */

+    public boolean logout() throws LoginException {

+        subject.getPrincipals().remove(userPrincipal);

+        succeeded = false;

+        succeeded = commitSucceeded;

+        userId = null;

+        if (password != null)

+            password = null;

+        userPrincipal = null;

+        return true;

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java
new file mode 100644
index 0000000000..09024197db
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java
@@ -0,0 +1,66 @@
+/**

+ * Licensed to the Apache Software Foundation (ASF) under one or more

+ * contributor license agreements.  See the NOTICE file distributed with

+ * this work for additional information regarding copyright ownership.

+ * The ASF licenses this file to You under the Apache License, Version 2.0

+ * (the "License"); you may not use this file except in compliance with

+ * the License.  You may obtain a copy of the License at

+ *

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ *

+ *  Unless required by applicable law or agreed to in writing, software

+ *  distributed under the License is distributed on an "AS IS" BASIS,

+ *  WITHOUT WARRANTIES 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.security;

+

+import java.security.Principal;

+

+/**

+ * @version $Rev: 637276 $ $Date: 2008-03-15 03:05:34 +0530 (Sat, 15 Mar 2008) $

+ */

+public class UserPrincipal implements Principal {

+

+    private final String name;

+

+    public UserPrincipal(String name) {

+        if (name == null)

+            throw new IllegalArgumentException("name cannot be null");

+        this.name = name;

+    }

+

+    public String getName() {

+        return name;

+    }

+

+    public String toString() {

+        return name;

+    }

+

+    @Override

+    public int hashCode() {

+        final int prime = 31;

+        int result = 1;

+        result = prime * result + ((name == null) ? 0 : name.hashCode());

+        return result;

+    }

+

+    @Override

+    public boolean equals(Object obj) {

+        if (this == obj)

+            return true;

+        if (obj == null)

+            return false;

+        if (getClass() != obj.getClass())

+            return false;

+        final UserPrincipal other = (UserPrincipal)obj;

+        if (name == null) {

+            if (other.name != null)

+                return false;

+        } else if (!name.equals(other.name))

+            return false;

+        return true;

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
new file mode 100644
index 0000000000..77d98d50aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
@@ -0,0 +1,37 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package context.access;

+

+import org.springframework.beans.BeansException;   

+import org.springframework.context.ApplicationContext;   

+import org.springframework.context.ApplicationContextAware;

+

+public class SCAApplicationContextProvider implements ApplicationContextAware {

+    

+    private static ApplicationContext ctx;

+    

+    public void setApplicationContext(ApplicationContext appContext) throws BeansException {

+        // Wiring the ApplicationContext into a static method           

+        ctx = appContext;      

+    }

+    

+    public static ApplicationContext getApplicationContext() {           

+        return ctx;       

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java
new file mode 100644
index 0000000000..46f8facf78
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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;

+

+/**

+ * Interface for the "hello world" service - predictably simple with a single operation

+ * "sayHello"

+ *

+ * @version $Rev$ $Date$

+ */

+public interface HelloWorld {

+

+    String sayHello(String s);

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..73939693a4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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;

+

+/**

+ * A simple proxy Java class which implements the HelloWorld interface but which uses

+ * a reference "delegate" to actually provide the HelloWorld service

+ *

+ * @version $Rev$ $Date$

+ */

+public class HelloWorldImpl implements HelloWorld {

+

+    static String hello = "Hello ";

+

+    public String sayHello(String s) {

+        // Simply call the reference to satisfy the service request...

+        System.out.println("HelloWorldImpl - sayHello called");

+        return (hello + s);

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
new file mode 100644
index 0000000000..4d4b5a2931
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
@@ -0,0 +1,42 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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;

+

+/**

+ * A simple proxy Java class which implements the HelloWorld interface but which uses

+ * a reference "delegate" to actually provide the HelloWorld service

+ *

+ * @version $Rev$ $Date$

+ */

+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.5.1/itest/spring/src/main/java/mock/TestBean.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestBean.java
new file mode 100644
index 0000000000..96df81fc0c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestBean.java
@@ -0,0 +1,31 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package mock;

+

+/**

+ * @version $Rev: 430937 $ $Date: 2006-08-12 02:17:56 +0100 (Sat, 12 Aug 2006) $

+ */

+public interface TestBean {

+    String echo(String msg);

+

+    TestBean getBean();

+

+    void setBean(TestBean bean);

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java
new file mode 100644
index 0000000000..538d3547f4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java
@@ -0,0 +1,42 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package mock;

+

+/**

+ * @version $Rev: 441406 $ $Date: 2006-09-08 08:20:10 +0100 (Fri, 08 Sep 2006) $

+ */

+public class TestBeanImpl implements TestBean {

+

+    private TestBean bean;

+

+    public TestBeanImpl() {

+    }

+

+    public String echo(String msg) {

+        return msg;

+    }

+

+    public TestBean getBean() {

+        return bean;

+    }

+

+    public void setBean(TestBean bean) {

+        this.bean = bean;

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java
new file mode 100644
index 0000000000..5c9dede7ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java
@@ -0,0 +1,39 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+package mock;

+

+/**

+ * A simple test Spring bean which provides the HelloWorld service

+ *

+ * @version $Rev$ $Date$

+ */

+

+import helloworld.HelloWorld;

+

+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.5.1/itest/spring/src/main/java/mock/TestReference.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestReference.java
new file mode 100644
index 0000000000..0a8742d242
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestReference.java
@@ -0,0 +1,27 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package mock;

+

+/**

+ * @version $Rev: 536115 $ $Date: 2007-05-08 09:04:20 +0100 (Tue, 08 May 2007) $

+ */

+public interface TestReference {

+    String echo(String msg);

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java
new file mode 100644
index 0000000000..27ccdbdd77
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java
@@ -0,0 +1,57 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+package mock;

+

+/**

+ * A test Spring bean which provides the HelloWorld service by calling a reference

+ * to provide the content of the response

+ *

+ * @version $Rev$ $Date$

+ */

+

+import helloworld.HelloWorld;

+

+public class TestReferenceBean implements HelloWorld {

+

+    // The reference

+    private HelloWorld bean;

+

+    // Classic "Hello xxx" response to any input message

+    public String sayHello(String message) {

+        System.out.println("TestReferenceBean - sayHello called");

+        return (bean.sayHello(message));

+    }

+

+    /**

+     * Setter for the bean reference

+     * @param theBean

+     */

+    public void setBean(HelloWorld theBean) {

+        this.bean = theBean;

+    }

+

+    /**

+     * Getter for the reference

+     * @return

+     */

+    public HelloWorld getBean() {

+        return this.bean;

+    }

+

+} // end class TestReferenceBean

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
new file mode 100644
index 0000000000..881ca8bb7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
@@ -0,0 +1,55 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+package mock;

+

+/**

+ * A test Spring bean which provides the HelloWorld service.

+ * This bean has a single String property called "hello" which must be set through

+ * external configuration to give the correct response message, otherwise an (incorrect)

+ * default message is generated

+ *

+ * @version $Rev$ $Date$

+ */

+

+import helloworld.HelloWorld;

+

+public class TestSCAPropertyBean implements HelloWorld {

+

+    private String hello = "Go away";

+

+    /**

+     * Provides the operation of the "HelloWorld" interface - a simple string response

+     * to a string input message, where the response is a greeting followed by the original

+     * input message.

+     */

+    public String sayHello(String message) {

+        System.out.println("TestHelloWorldBean - sayHello called");

+        return (hello + " " + message);

+    }

+

+    /**

+     * Public setter for the (unannotated) field "hello" which constitutes an SCA

+     * property

+     * @param message - the message to use for the response to "sayHello"

+     */

+    public void setHello(String message) {

+        hello = message;

+    }

+

+} // end class TestSCAPropertyBean

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..0206849a53
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
@@ -0,0 +1,131 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package spring.annotations;

+

+import org.osoa.sca.annotations.Destroy;

+import org.osoa.sca.annotations.Init;

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

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

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

+import org.osoa.sca.annotations.ComponentName;

+

+import calculator.AddService;

+import calculator.CalculatorService;

+import calculator.DivideService;

+import calculator.MultiplyService;

+import calculator.SubtractService;

+

+/**

+ * An implementation of the Calculator service.

+ */

+@Service(CalculatorService.class)

+public class CalculatorServiceImpl implements AddService, SubtractService, MultiplyService, DivideService {

+    

+    public AddService addService;  // setter injection

+    

+    @Reference

+    public SubtractService subtractService;  // field injection

+    

+    @Reference(name="multiplyService", required=false)

+    public MultiplyService multiply;  // field injection (different reference and field name)

+    

+    public DivideService divide;  // setter injection (different reference and field name)

+    

+    public String message;  // setter injection

+    

+    @Property(name="message", required=false)

+    public String message2;  // field injection

+    

+    public String componentName;

+    

+    @Init

+    public void initMethod () {

+        System.out.println("Init method is sucessfully called.....");

+        // Property value should be null here.

+        System.out.println("Property Value message is...." + message);

+    }

+    

+    @Destroy

+    public void destroyMethod () {

+        System.out.println("Component Name is...." + componentName);

+        System.out.println("Property Value message is...." + message);

+        System.out.println("Property Value message2 is...." + message2);

+        System.out.println("Destroy method is sucessfully called.....");

+    }

+

+    @Reference

+    public void setAddService(AddService addService) {

+        this.addService = addService;

+    }

+    

+    public AddService getAddService() {

+        return addService;

+    }

+

+    /*public void setSubtractService(SubtractService subtractService) {

+        this.subtractService = subtractService;

+    }

+    

+    public SubtractService getSubtractService() {

+        return subtractService;

+    }*/    

+    

+    @Reference(name="divideService", required=false)

+    public void setDivideService(DivideService divide) {

+        this.divide = divide;

+    }

+    

+    public DivideService getDivideService() {

+        return divide;

+    }

+    

+    /*public void setMultiplyService(MultiplyService multiplyService) {

+        this.multiplyService = multiplyService;

+    }

+    

+    public MultiplyService getMultiplyService() {

+        return multiplyService;

+    }*/

+    

+    @ComponentName

+    public void setComponentName(String componentName) {

+        this.componentName = componentName;

+    }

+    

+    @Property

+    public void setMessage(String message) {

+        this.message = message;

+    }    

+

+    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 multiply.multiply(n1, n2);

+    }

+

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

+        return divide.divide(n1, n2);

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite
new file mode 100644
index 0000000000..4704239620
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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">

+

+    <component name="CalculatorServiceComponent">

+        <implementation.spring location="CalculatorService-context.xml"/>

+        <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.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.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
new file mode 100644
index 0000000000..87458b99a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+  

+    <sca:service name="CalculatorService"

+        type="calculator.CalculatorService" target="CalculatorServiceBean"/>

+

+    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

+        <property name="addService" ref="addService"/>

+        <property name="subtractService" ref="subtractService"/>

+        <property name="multiplyService" ref="multiplyService"/>

+        <property name="divideService" ref="divideService"/>

+    </bean>

+    

+    <bean id="contextAccess" class="context.access.SCAApplicationContextProvider">

+    </bean>

+    

+    <sca:reference name="addService" type="calculator.AddService"/>

+    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

+    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

+    <sca:reference name="divideService" type="calculator.DivideService"/>

+

+</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite
new file mode 100644
index 0000000000..6662531971
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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">

+

+    <component name="CalculatorServiceComponent">

+        <implementation.spring location="META-INF/spring/SpringImport-context.xml"/>

+        <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.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.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
new file mode 100644
index 0000000000..4532810433
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

+        <property name="addService" ref="addService"/>

+        <property name="subtractService" ref="subtractService"/>

+        <property name="multiplyService" ref="multiplyService"/>

+        <property name="divideService" ref="divideService"/>

+    </bean>

+

+    <sca:reference name="addService" type="calculator.AddService"/>

+    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

+    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

+    <sca:reference name="divideService" type="calculator.DivideService"/>

+    

+    <bean id="AddServiceBean" class="calculator.AddServiceImpl">

+    </bean>

+

+</beans>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
new file mode 100644
index 0000000000..f99eacf9d5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+       

+    <import resource="CalculatorService-context.xml"/>

+    

+    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

+        <property name="addService" ref="addService"/>

+        <property name="subtractService" ref="subtractService"/>

+        <property name="multiplyService" ref="multiplyService"/>

+        <property name="divideService" ref="divideService"/>

+    </bean>

+    

+    <sca:reference name="addService" type="calculator.AddService"/>

+    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

+    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

+    <sca:reference name="divideService" type="calculator.DivideService"/>

+    

+</beans>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
new file mode 100644
index 0000000000..c20679241f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.osoa.org/xmlns/sca/1.0/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.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
new file mode 100644
index 0000000000..0b8ee44e85
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+       

+    <sca:service name="StockQuoteService"

+        type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/>

+

+    <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl">

+    </bean>

+

+</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
new file mode 100644
index 0000000000..f547b179ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+       

+    <bean id="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext">

+	   <constructor-arg>

+		  <list>			 

+			 <value>META-INF/spring/SpringHelloWorld-context.xml</value>

+			 <value>META-INF/spring/StockQuoteService-context.xml</value>

+		  </list>

+	   </constructor-arg>

+    </bean>

+</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite
new file mode 100644
index 0000000000..eb40f30b3c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://stockquote"

+	xmlns:hw="http://stockquote"

+    name="StockQuote">

+    

+    <service name="StockQuoteService" promote="StockQuoteServiceComponent">

+        <interface.java interface="bigbank.stockquote.StockQuoteService"/>

+        <binding.ws uri="http://localhost:8085/services/StockQuoteWebService"/>

+    </service>

+

+    <component name="StockQuoteServiceComponent">

+        <implementation.spring location="META-INF/spring/beanRefContext.xml"/>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite
new file mode 100644
index 0000000000..98cd9ec225
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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">

+

+    <component name="CalculatorServiceComponent">

+        <implementation.spring location="META-INF/spring/CalculatorService-context.xml">		

+			<operation name="divide" requires="tuscany:logging"/>

+			<operation name="subtract" requires="tuscany:logging"/>

+		</implementation.spring>

+        <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.AddServiceImpl"/>

+    </component>

+

+    <component name="SubtractServiceComponent">

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

+    </component>

+

+    <component name="MultiplyServiceComponent">

+        <implementation.java class="calculator.MultiplyServiceImpl" requires="tuscany:jaasAuthentication"/>

+    </component>

+

+    <component name="DivideServiceComponent">

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

+    </component>

+    

+    <component name="AnotherCalculatorServiceComponent">

+        <implementation.spring location="META-INF/spring/CalculatorService-context.xml" requires="tuscany:logging"/>		

+        <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.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
new file mode 100644
index 0000000000..0e7cb86633
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
@@ -0,0 +1,3 @@
+Calculator {

+  calculator.security.JaasLoginModule required debug=true;

+};

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
new file mode 100644
index 0000000000..f62125eaa9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License.    

+CALLING_OPERATION=Inovoking operation {0} with arguments {1}

+OPERATION_RETURNED=Returning from operation {0} with return value {1}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
new file mode 100644
index 0000000000..7c84965629
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

+        <property name="addService" ref="addService"/>

+        <property name="subtractService" ref="subtractService"/>

+        <property name="multiplyService" ref="multiplyService"/>

+        <property name="divideService" ref="divideService"/>

+    </bean>

+

+    <sca:reference name="addService" type="calculator.AddService"/>

+    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

+    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

+    <sca:reference name="divideService" type="calculator.DivideService"/>

+

+</beans>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml
new file mode 100644
index 0000000000..992c1b92f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml
@@ -0,0 +1,40 @@
+<?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">

+

+    <!-- PolicySets -->

+    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java"

+        xmlns="http://www.osoa.org/xmlns/sca/1.0">

+        <tuscany:jaasAuthentication>

+            <tuscany:configurationName>Calculator</tuscany:configurationName>

+            <tuscany:callbackHandler>calculator.security.CalculatorCallbackHandler</tuscany:callbackHandler>

+        </tuscany:jaasAuthentication>

+    </policySet>

+

+    <!-- PolicySets -->

+    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.spring"

+        xmlns="http://www.osoa.org/xmlns/sca/1.0">

+        <tuscany:jdkLogger name="calculator">

+            <logLevel>FINER</logLevel>

+        </tuscany:jdkLogger>

+    </policySet>

+</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
new file mode 100644
index 0000000000..c6f2111d0e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<!-- Composite for the SpringSCAPropertyTestCase         

+ * This composite has the HelloWorldComponent implemented with a Spring implementation where

+ * the Spring application context uses an explicit SCA property.  The value of the property

+ * is set in this composite and is used to compute the response to a service invocation from

+ * the ClientComponent.

+ -->

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

+           name="SpringFolderLocation">

+    

+    <component name="ClientComponent">

+        <implementation.java class="helloworld.HelloWorldProxy"/>

+        <reference name="delegate" target="HelloWorldComponent/testBean1"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+        <implementation.spring location="springapp"/>        

+        <property name="TestProperty">Hello</property>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..950dbeba4c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Spring-Context: META-INF/spring/SpringSCAProperty-context.xml

+

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
new file mode 100644
index 0000000000..d2f406294d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+    <bean id="testBean1" class="mock.TestSCAPropertyBean" lazy-init="true">
+    	<property name="hello" ref="TestProperty"/>
+    </bean>
+    
+    <bean id="testBean2" class="mock.TestSCAPropertyBean" lazy-init="true">
+    	<property name="hello"><ref bean="TestProperty"/></property>
+    </bean>
+    
+    <sca:property id="foo" name="TestProperty" type="java.lang.String"/>
+
+</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
new file mode 100644
index 0000000000..7b16c221cf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<!-- Composite for the SpringSCAPropertyTestCase         

+ * This composite has the HelloWorldComponent implemented with a Spring implementation where

+ * the Spring application context uses an explicit SCA property.  The value of the property

+ * is set in this composite and is used to compute the response to a service invocation from

+ * the ClientComponent.

+ -->

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

+           name="SpringJarLocation">

+    

+    <component name="ClientComponent">

+        <implementation.java class="helloworld.HelloWorldProxy"/>

+        <reference name="delegate" target="HelloWorldComponent/testBean1"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+        <implementation.spring location="spring-context.jar"/>

+        <property name="TestProperty">Hello</property>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar
new file mode 100644
index 0000000000..d8ee59a610
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
new file mode 100644
index 0000000000..932ebb1361
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.osoa.org/xmlns/sca/1.0/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.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
new file mode 100644
index 0000000000..c20679241f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.osoa.org/xmlns/sca/1.0/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.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
new file mode 100644
index 0000000000..7d72242df3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="helloworld.HelloWorldProxy"/>
+        <reference name="delegate" target="HelloWorldComponent/testBean"/>
+    </component>
+
+    <component name="HelloWorldComponent">
+        <implementation.spring location="META-INF/spring/SpringDelegationHelloWorld-context.xml"/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
new file mode 100644
index 0000000000..847056adf6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="helloworld.HelloWorldProxy"/>
+        <reference name="delegate" target="HelloWorldComponent"/>
+    </component>
+
+    <component name="HelloWorldComponent">
+        <implementation.spring location="META-INF/spring/SpringHelloWorld-context.xml"/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
new file mode 100644
index 0000000000..d18d8312e3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="testBean" class="mock.TestReferenceBean">

+        <property name="bean" ref="testReference"/>

+    </bean>

+

+    <sca:reference name="testReference" type="helloworld.HelloWorld"/>

+

+</beans>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
new file mode 100644
index 0000000000..df4b9b28cf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="testBean" class="mock.TestReferenceBean">

+        <!-- Here is the implicit reference - a property with a ref not satisifed within the

+         * Spring application context.

+         -->

+        <property name="bean" ref="testReference"/>

+    </bean>

+

+</beans>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
new file mode 100644
index 0000000000..25adcc183e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SpringExplicitReference">

+

+    <component name="ClientComponent">

+        <implementation.spring location="META-INF/spring/SpringExplicitReference-context.xml"/>

+        <reference name="testReference" target="ReferenceComponent"/>

+    </component>

+

+    <component name="ReferenceComponent">

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

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
new file mode 100644
index 0000000000..31429e5f63
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<!-- Composite for the SpringImplicitReferenceTestCase         

+ * This composite has a ClientComponent implemented with a Spring implementation where

+ * Spring application context uses an implicit reference definition through a Bean with

+ * a property with an unsatisfied ref attribute, which forms the reference.

+ * The reference is satisified by a wire to a ReferenceComponent which is implemented

+ * by a plain Java POJO.

+-->

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

+           name="SpringImplicitReference">

+

+    <component name="ClientComponent">

+        <implementation.spring location="META-INF/spring/SpringImplicitReference-context.xml"/>

+        <reference name="testReference" target="ReferenceComponent"/>

+    </component>

+

+    <component name="ReferenceComponent">

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

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
new file mode 100644
index 0000000000..194bc4bcc9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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 SpringExplicitHelloWorld testcase 

+In this case, the service offered by the Spring application is specified

+explicitly using an sca:service element                                  -->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <sca:service name="fooService" 

+                 type="helloworld.HelloWorld" 

+                 target="testBean"/>

+

+    <bean id="testBean" 

+          class="mock.TestHelloWorldBean" 

+          lazy-init="true">

+    </bean>

+

+</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
new file mode 100644
index 0000000000..1c63311367
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT 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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="testBean" class="mock.TestHelloWorldBean" lazy-init="true">

+    </bean>

+

+</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
new file mode 100644
index 0000000000..6958c28361
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SpringExplicitService">

+

+    <component name="ClientComponent">

+        <implementation.java class="helloworld.HelloWorldProxy"/>

+        <reference name="delegate" target="HelloWorldComponent"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+        <implementation.spring location="META-INF/spring/SpringExplicitService-context.xml"/>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
new file mode 100644
index 0000000000..3969eef213
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="SpringImplicitService">

+

+    <component name="ClientComponent">

+        <implementation.java class="helloworld.HelloWorldProxy"/>

+        <reference name="delegate" target="HelloWorldComponent"/>

+    </component>

+

+    <component name="HelloWorldComponent">

+        <implementation.spring location="META-INF/spring/SpringImplicitService-context.xml"/>

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/tags/java/sca/1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite
new file mode 100644
index 0000000000..2c0de830ab
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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">

+

+    <component name="CalculatorServiceComponent">

+        <implementation.spring location="META-INF/spring/CalculatorService-context.xml"/>

+        <property name="message">HelloWorld</property>

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

+    

+    <!--<component name="AnotherCalculatorServiceComponent">

+        <implementation.spring location="META-INF/sca/spring-annotation/CalculatorService-context.xml"/>

+        <property name="message">HelloWorld</property>       

+        <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.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml b/tags/java/sca/1.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
new file mode 100644
index 0000000000..4110a9a7b7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="CalculatorServiceBean" class="spring.annotations.CalculatorServiceImpl">        

+        <property name="addService" ref="addService"/>

+        <!-- <property name="subtractService" ref="subtractService"/>

+        <property name="multiplyService" ref="multiplyService"/> -->

+        <property name="divideService" ref="divideService"/>

+    </bean>   

+    

+    <sca:reference name="addService" type="calculator.AddService"/>

+    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

+    <sca:reference name="multiplyService" type="calculator.MultiplyService"/> 

+    <sca:reference name="divideService" type="calculator.DivideService"/>

+    

+    <sca:property id="msg" name="message" type="java.lang.String"/>

+

+</beans>

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/CalculatorClient.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/CalculatorClient.java
new file mode 100644
index 0000000000..9b7202d951
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/CalculatorClient.java
@@ -0,0 +1,60 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package context.access;

+

+import java.io.File;

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

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

+import org.springframework.context.ApplicationContext;

+

+import context.access.SCAApplicationContextProvider;

+import calculator.CalculatorService;

+

+/**

+ * 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 {        

+        

+        SCANodeFactory factory = SCANodeFactory.newInstance();

+        SCANode node = factory.createSCANode(new File("src/main/resources/context/access/Calculator.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/context/access/").toURL().toString()));

+        node.start();

+        

+        // Code: To access the Spring Application Context instance

+        ApplicationContext ctx = SCAApplicationContextProvider.getApplicationContext();

+        if (ctx.containsBean("CalculatorServiceBean"))

+            System.out.println("CalculatorServiceBean is now available for use...");

+              

+        CalculatorService calculatorService = 

+            ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

+                

+        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));

+

+        node.stop();

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/ContextAccessTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
new file mode 100644
index 0000000000..5feb293bc8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package context.access;

+

+import junit.framework.TestCase;

+

+/**

+ * Tests out the big bank service

+ *

+ */

+public class ContextAccessTestCase extends TestCase {

+

+    public void testServer() throws Exception {

+        CalculatorClient.main(new String[] {""});

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java
new file mode 100644
index 0000000000..12ced16785
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java
@@ -0,0 +1,54 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package context.imports;

+

+import java.io.File;

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

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

+

+import calculator.CalculatorService;

+

+

+/**

+ * 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 {        

+        

+        SCANodeFactory factory = SCANodeFactory.newInstance();

+        SCANode node = factory.createSCANode(new File("src/main/resources/context/imports/Calculator.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/context/imports/").toURL().toString()));

+        node.start();        

+              

+        CalculatorService calculatorService = 

+            ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorServiceBean");

+        

+        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));

+

+        node.stop();

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
new file mode 100644
index 0000000000..3940bf65fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package context.imports;

+

+import junit.framework.TestCase;

+

+/**

+ * Tests out the big bank service

+ *

+ */

+public class ContextImportsTestCase extends TestCase {

+

+    public void testServer() throws Exception {

+        CalculatorClient.main(new String[] {""});

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
new file mode 100644
index 0000000000..75b296bf32
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package context.multiple;

+

+import junit.framework.TestCase;

+

+/**

+ * Tests out the big bank service

+ *

+ */

+public class MultipleContextTestCase extends TestCase {

+

+    public void testServer() throws Exception {

+        StockQuoteServer.main(new String[] {"1000"});

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
new file mode 100644
index 0000000000..18c7ca6a74
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
@@ -0,0 +1,50 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+package context.multiple;

+

+import java.io.File;

+

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.springframework.context.ApplicationContext;

+import context.access.SCAApplicationContextProvider;

+

+/**

+ * This server program shows how to bootstrap SCA from a simple J2SE program

+ * and start it which activates the StockQuote Web service endpoint.

+ */

+public class StockQuoteServer {

+

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

+

+        System.out.println("Starting the Sample SCA StockQuote Service...");

+

+        SCANodeFactory factory = SCANodeFactory.newInstance();

+        SCANode node = factory.createSCANode(new File("src/main/resources/context/multiple/StockQuote.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/context/multiple/").toURL().toString()));

+        node.start();      

+        

+        System.out.println("Press Enter to Exit...");

+        Thread.sleep(1000);

+

+        node.stop();

+        System.out.println("Bye");

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
new file mode 100644
index 0000000000..bc29f54d86
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
@@ -0,0 +1,79 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package implementation.policies;

+

+import java.io.File;

+

+import javax.security.auth.login.Configuration;

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

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

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+

+import calculator.CalculatorService;

+import calculator.CalculatorServiceImpl;

+

+

+/**

+ * 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) {

+            System.setProperty("java.security.auth.login.config", CalculatorClient.class.getClassLoader()

+                .getResource("implementation/policies/CalculatorJass.config").toString());

+        }

+

+        SCANodeFactory factory = SCANodeFactory.newInstance();

+        SCANode node = factory.createSCANode(new File("src/main/resources/implementation/policies/Calculator.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/implementation/policies/").toURL().toString()));

+        node.start();       

+              

+        CalculatorService calculatorService = 

+            ((SCAClient)node).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 = 

+            ((SCAClient)node).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));

+

+        node.stop();

+        System.out.println("Bye");

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
new file mode 100644
index 0000000000..1e759f98a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package implementation.policies;

+

+import junit.framework.TestCase;

+

+/**

+ * Tests out the big bank service

+ *

+ */

+public class ImplementationPoliciesTestCase extends TestCase {

+

+    public void testServer() throws Exception {

+        CalculatorClient.main(new String[] {""});

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
new file mode 100644
index 0000000000..bd1150e99a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
@@ -0,0 +1,45 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package location.folder;

+

+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;

+

+/**

+ * A test case designed to test the implementation of Properties from a Spring application

+ * context, where the properties are explicit, through the presence of an sca:property

+ * element within the Spring application context

+ *

+ * The artifacts involved in this test are:

+ *

+ * 1) A composite containing a component with a Spring implementation

+ * 2) The <implementation.spring.../> element references an application context that

+ * uses an explicit sca:property element which is used to compute the response to an invocation

+ * of the service of the implementation

+ *

+ * @version $Rev$ $Date$

+ */

+public class SpringFolderLocationTestCase extends AbstractHelloWorldTestCase {

+    // super class does it all getting composite based on this class name

+	

+	public SpringFolderLocationTestCase() {

+        super("SpringFolderLocation.composite", "location/folder");        

+    }

+}

+

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
new file mode 100644
index 0000000000..102cd69874
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
@@ -0,0 +1,45 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package location.jar;

+

+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;

+

+/**

+ * A test case designed to test the implementation of Properties from a Spring application

+ * context, where the properties are explicit, through the presence of an sca:property

+ * element within the Spring application context

+ *

+ * The artifacts involved in this test are:

+ *

+ * 1) A composite containing a component with a Spring implementation

+ * 2) The <implementation.spring.../> element references an application context that

+ * uses an explicit sca:property element which is used to compute the response to an invocation

+ * of the service of the implementation

+ *

+ * @version $Rev$ $Date$

+ */

+public class SpringJarLocationTestCase extends AbstractHelloWorldTestCase {

+    // super class does it all getting composite based on this class name

+	

+	public SpringJarLocationTestCase() {

+        super("SpringJarLocation.composite", "location/jar");        

+    }

+}

+

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
new file mode 100644
index 0000000000..aa63fbd5c2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 AbstractHelloWorldTestCase(String compositeName, String contributionLocation) {
+        super(compositeName, contributionLocation);        
+    }
+	
+    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.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
new file mode 100644
index 0000000000..a2698cf9a3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 java.io.File;
+import java.net.MalformedURLException;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public abstract class AbstractSCATestCase<T> extends TestCase {
+
+    protected SCADomain domain;
+    protected String compositeName;
+    protected String contributionLocation;
+    protected T service;
+    
+    public AbstractSCATestCase(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();
+        }
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+    	domain = SCADomain.newInstance("http://localhost", contributionLocation, compositeName);
+        service = domain.getService(getServiceClass(), "ClientComponent");
+    }
+
+    abstract protected Class<T> 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.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
new file mode 100644
index 0000000000..1405310100
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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;
+
+/**
+ * Interface for the "hello world" service - predictably simple with a single operation
+ * "sayHello"
+ *
+ */
+public interface HelloWorld {
+
+    public String sayHello(String s);
+
+}
diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
new file mode 100644
index 0000000000..d75d19295d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
new file mode 100644
index 0000000000..11ed16e6b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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
+	
+	public SpringDelegationHelloWorldTestCase() {
+        super("SpringDelegationHelloWorld.composite", "org/apache/tuscany/sca/itest/spring");        
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
new file mode 100644
index 0000000000..bec19b76de
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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
+	
+	public SpringHelloWorldTestCase() {
+        super("SpringHelloWorld.composite", "org/apache/tuscany/sca/itest/spring");        
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
new file mode 100644
index 0000000000..45b47b47a8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 helloworld.HelloWorld;
+
+/**
+ * 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.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
new file mode 100644
index 0000000000..5dfeeffd97
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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 helloworld.HelloWorld;
+
+/**
+ * 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.5.1/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
new file mode 100644
index 0000000000..603d2524f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
@@ -0,0 +1,45 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package sca.references;

+

+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;

+

+/**

+ * A test case designed to test the implementation of References from a Spring application

+ * context, where the references are explicit, through the presence of an sca:reference

+ * element within the Spring application context

+ *

+ * The artifacts involved in this test are:

+ *

+ * 1) A composite containing a component with a Spring implementation which makes

+ * a reference to a second component

+ * 2) The composite has a component with a Java POJO implementation which satisfies the reference

+ * 3) The <implementation.spring.../> element references an application context that

+ * uses an explicit sca:reference element to identify the reference made by the Spring application

+ *

+ * @version $Rev$ $Date$

+ */

+public class SpringExplicitReferenceTestCase extends AbstractHelloWorldTestCase {

+    // super class does it all getting composite based on this class name

+	

+	public SpringExplicitReferenceTestCase() {

+        super("SpringExplicitReference.composite", "sca/references");        

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
new file mode 100644
index 0000000000..757f12c08b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
@@ -0,0 +1,48 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package sca.references;

+

+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;

+

+/**

+ * A test case designed to test the implementation of References from a Spring application

+ * context, where the references are implicit, through the presence of Bean properties with a

+ * ref attribute which is not satisfied by a Bean within the application context.

+ *

+ * The artifacts involved in this test are:

+ *

+ * 1) A composite containing a component with a Spring implementation which makes

+ * a reference to a second component

+ * 2) The composite has a component with a Java POJO implementation which satisfies the reference

+ * 3) The <implementation.spring.../> element references an application context that

+ * does not use an explicit sca:reference element to identify the reference made by the

+ * Spring application, but relies on an unsatisfied Bean property with a ref attribute.

+ *

+ * @version $Rev$ $Date$

+ */

+public class SpringImplicitReferenceTestCase extends AbstractHelloWorldTestCase {

+    // super class does it all getting composite based on this class name

+	

+	public SpringImplicitReferenceTestCase() {

+        super("SpringImplicitReference.composite", "sca/references");        

+    }

+}

+

+

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
new file mode 100644
index 0000000000..03af1e6b12
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
@@ -0,0 +1,40 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package sca.services;

+

+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;

+

+/**

+ * 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 <implementation.spring.../> element references an application context that

+ * uses an explicit sca: element to identify the service offered by the Spring application

+ *

+ * @version $Rev$ $Date$

+ */

+public class SpringExplicitServiceTestCase extends AbstractHelloWorldTestCase {

+    // super class does it all getting composite based on this class name

+	

+	public SpringExplicitServiceTestCase() {

+        super("SpringExplicitService.composite", "sca/services");        

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
new file mode 100644
index 0000000000..6f17be1970
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
@@ -0,0 +1,38 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package sca.services;

+

+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;

+

+/**

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

+ *

+ * @version $Rev$ $Date$

+ */

+public class SpringImplicitServiceTestCase extends AbstractHelloWorldTestCase {

+    // super class does it all getting composite based on this class name

+	

+	public SpringImplicitServiceTestCase() {

+        super("SpringImplicitService.composite", "sca/services");        

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
new file mode 100644
index 0000000000..34e10de85b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
@@ -0,0 +1,64 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package spring.annotations;

+

+import java.io.File;

+

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

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+

+import calculator.CalculatorService;

+

+

+/**

+ * 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 {        

+

+        SCANodeFactory factory = SCANodeFactory.newInstance();

+        SCANode node = factory.createSCANode(new File("src/main/resources/spring/annotations/Calculator.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/spring/annotations/").toURL().toString()));

+        node.start();        

+              

+        CalculatorService calculatorService = 

+            ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

+        

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

+            ((SCAClient)node).getService(CalculatorService.class, "AnotherCalculatorServiceComponent");

+

+        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));*/

+

+        node.stop();

+        System.out.println("Bye");

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
new file mode 100644
index 0000000000..3a9ec4bbb2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package spring.annotations;

+

+import junit.framework.TestCase;

+

+/**

+ * Tests out the big bank service

+ *

+ */

+public class SpringAnnotationsTestCase extends TestCase {

+

+    public void testServer() throws Exception {

+        CalculatorClient.main(new String[] {""});

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/transaction/pom.xml b/tags/java/sca/1.5.1/itest/transaction/pom.xml
new file mode 100644
index 0000000000..a1ec39dfd1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-transaction</artifactId>
+    <name>Apache Tuscany SCA iTest Transaction Policy</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-transaction</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>5.2.0</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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
new file mode 100644
index 0000000000..d7d18181d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
new file mode 100644
index 0000000000..ac986dd417
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
new file mode 100644
index 0000000000..a6ea036da7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
new file mode 100644
index 0000000000..3e1cb29f33
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
new file mode 100644
index 0000000000..4d504a6a36
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
new file mode 100644
index 0000000000..156b34227d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
new file mode 100644
index 0000000000..b7ea5f2663
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
new file mode 100644
index 0000000000..341a7e53e3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/main/resources/accounts.composite b/tags/java/sca/1.5.1/itest/transaction/src/main/resources/accounts.composite
new file mode 100644
index 0000000000..f4c6b650c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/resources/accounts.composite
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/transaction/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/transaction/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..8aa6ba313a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/resources/definitions.xml
@@ -0,0 +1,99 @@
+<?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.5.1/itest/transaction/src/main/resources/log4j.properties b/tags/java/sca/1.5.1/itest/transaction/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..698ee41d7e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/main/resources/log4j.properties
@@ -0,0 +1,29 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT 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.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/tags/java/sca/1.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
new file mode 100644
index 0000000000..c23628ff91
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/tags/java/sca/1.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
new file mode 100644
index 0000000000..36884f6098
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/validation/pom.xml b/tags/java/sca/1.5.1/itest/validation/pom.xml
new file mode 100644
index 0000000000..fe88fc3aba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/pom.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-validation</artifactId>
+    <name>Apache Tuscany SCA iTest Validation</name>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-resource</artifactId>
+            <version>1.5.1</version>
+        </dependency>        
+            
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-workspace-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>         
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>1.5.1</version>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-xquery</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-ejb</artifactId>
+            <version>1.5.1</version>
+            <exclusions>
+                <exclusion>
+                	<groupId>org.apache.openejb</groupId>
+                	<artifactId>javaee-api</artifactId>
+                </exclusion>            
+            </exclusions>            
+        </dependency>
+
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
+            <version>1.5.1</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.5.1</version>
+        </dependency>  
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb-runtime</artifactId>
+            <version>1.5.1</version>
+            <exclusions>
+                <exclusion>
+                	<groupId>org.apache.openejb</groupId>
+                	<artifactId>javaee-api</artifactId>
+                </exclusion>            
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+               
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/account/Customer.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/account/Customer.java
new file mode 100644
index 0000000000..acb74c38ae
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/account/Customer.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
new file mode 100644
index 0000000000..52ddfa9aba
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
new file mode 100644
index 0000000000..aec8998083
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
new file mode 100644
index 0000000000..5df24b6379
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java
new file mode 100644
index 0000000000..33bfe1d0ea
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..a6a40b0ed1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/AddService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddService.java
new file mode 100644
index 0000000000..35ba2cbfac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddService.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
new file mode 100644
index 0000000000..ef305370cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
new file mode 100644
index 0000000000..aacde27842
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
new file mode 100644
index 0000000000..185f17a5ca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java
new file mode 100644
index 0000000000..f472d6aaf6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..77aafe83de
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/DivideService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/DivideService.java
new file mode 100644
index 0000000000..a93d23e61c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/DivideService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
new file mode 100644
index 0000000000..080594034b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java
new file mode 100644
index 0000000000..20d48e93d5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..96f0b55fa2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/PropertyService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/PropertyService.java
new file mode 100644
index 0000000000..4f1ccc96f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/PropertyService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
new file mode 100644
index 0000000000..429daf5f2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/SubtractService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractService.java
new file mode 100644
index 0000000000..40e382dc74
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
new file mode 100644
index 0000000000..8cdbe0813d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
new file mode 100644
index 0000000000..d5e9fcf020
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/AddService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/AddService.java
new file mode 100644
index 0000000000..0db8ce4f5c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/AddService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java
new file mode 100644
index 0000000000..83f2685d54
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/CalculatorClient.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorClient.java
new file mode 100644
index 0000000000..e34ce3db26
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorClient.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/CalculatorService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorService.java
new file mode 100644
index 0000000000..5d583fd604
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..0183e2a259
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/DivideService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/DivideService.java
new file mode 100644
index 0000000000..85ebadc9a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/DivideService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
new file mode 100644
index 0000000000..863c298234
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/MultiplyService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/MultiplyService.java
new file mode 100644
index 0000000000..e1bf7fbddc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/MultiplyService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
new file mode 100644
index 0000000000..6346ea3582
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/SubtractService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/SubtractService.java
new file mode 100644
index 0000000000..57759bb496
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/SubtractService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
new file mode 100644
index 0000000000..16e3e6a23d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
new file mode 100644
index 0000000000..6f9df2c034
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
new file mode 100644
index 0000000000..bafff878cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
new file mode 100644
index 0000000000..e44d93e6be
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/spring/HelloWorld.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/HelloWorld.java
new file mode 100644
index 0000000000..ef0b491617
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/HelloWorld.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
new file mode 100644
index 0000000000..2e3458f0d3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
new file mode 100644
index 0000000000..87904f2a72
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
new file mode 100644
index 0000000000..fa1a621f12
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
new file mode 100644
index 0000000000..ebf7a79589
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
new file mode 100644
index 0000000000..b2e7da05a2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
new file mode 100644
index 0000000000..4ba9f0724b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
new file mode 100644
index 0000000000..b935dd194a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
new file mode 100644
index 0000000000..2b633f3139
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
new file mode 100644
index 0000000000..940e27a1e7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
new file mode 100644
index 0000000000..50d78cb2a6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
new file mode 100644
index 0000000000..bd788e47b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
new file mode 100644
index 0000000000..7281878c0f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
new file mode 100644
index 0000000000..609ffed02d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.osoa.org/xmlns/sca/1.0/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.5.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
new file mode 100644
index 0000000000..08e18decc1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
new file mode 100644
index 0000000000..36e71e398b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
new file mode 100644
index 0000000000..9a46e09363
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
new file mode 100644
index 0000000000..59017f0c09
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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 uri="http://localhost:8085/AddServiceComponent"/>
+        </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.5.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
new file mode 100644
index 0000000000..462a95dd02
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
new file mode 100644
index 0000000000..4b6c44bd58
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
new file mode 100644
index 0000000000..a397e3384c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
new file mode 100644
index 0000000000..08fab865fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
new file mode 100644
index 0000000000..3a5f59b17c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
new file mode 100644
index 0000000000..8221e41430
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
new file mode 100644
index 0000000000..9c5ae7027f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
new file mode 100644
index 0000000000..3c85ed32e2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
new file mode 100644
index 0000000000..2d1a1e01f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
new file mode 100644
index 0000000000..efb457ac9e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
new file mode 100644
index 0000000000..a5beaf4ec9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
new file mode 100644
index 0000000000..06c3eeeaca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
new file mode 100644
index 0000000000..821ce570c8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite
new file mode 100644
index 0000000000..63ccaa9957
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
new file mode 100644
index 0000000000..da565081f3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
new file mode 100644
index 0000000000..6153d40c3d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
new file mode 100644
index 0000000000..a3eb60bf58
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
new file mode 100644
index 0000000000..6233d47d8d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
new file mode 100644
index 0000000000..6a9af9e070
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
new file mode 100644
index 0000000000..49b26c78f8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
new file mode 100644
index 0000000000..c34a160b61
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
new file mode 100644
index 0000000000..ce3689afff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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" xmlns="http://www.w3.org/2001/XMLSchema">

+            <import namespace="http://helloworld" schemaLocation="missing.xsd" />

+        </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.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
new file mode 100644
index 0000000000..61a9dae367
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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(HelloWorldService)"

+                    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.5.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
new file mode 100644
index 0000000000..293c4d725d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
new file mode 100644
index 0000000000..013a55b61e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
new file mode 100644
index 0000000000..b7ff1e304f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
new file mode 100644
index 0000000000..218dbc47c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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:HelloWorldSoapBinding" name="HelloWorldSoapPort">

+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>

+        </wsdl:port>

+    </wsdl:service>

+

+</wsdl:definitions>

diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
new file mode 100644
index 0000000000..5975c27663
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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="helloworldwsclient">

+    

+    <!-- A component with an embedded reference definition connecting to an external webservice 

+         The wsdl interface for the reference is derived from the information specified by the 'wsdlElement'

+     -->

+    <component name="HelloTuscanyServiceComponent">

+      <implementation.java class="binding.jms.HelloWorldServiceImpl"/>

+      <reference name="helloWorldService">

+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort2)"/>

+      </reference>

+    </component>

+    

+    <!-- A component with a reference promoted as a composite reference -->

+    <component name="HelloWorldServiceComponent">

+      <implementation.java class="binding.jms.HelloWorldServiceImpl"/>

+    </component>

+    

+    <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">

+        <interface.java interface="binding.jms.HelloWorldService" />

+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort2)"/>

+    </reference>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
new file mode 100644
index 0000000000..013a55b61e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
new file mode 100644
index 0000000000..8cda0b007e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
new file mode 100644
index 0000000000..781319d619
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
new file mode 100644
index 0000000000..8a0dfac98b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
new file mode 100644
index 0000000000..fcfe408582
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
new file mode 100644
index 0000000000..ede3b3fd40
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
new file mode 100644
index 0000000000..a8c89a0bf5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
new file mode 100644
index 0000000000..b4e56d1789
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
new file mode 100644
index 0000000000..e68eb75d64
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
new file mode 100644
index 0000000000..00c7a3f86b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
new file mode 100644
index 0000000000..d656d47cfd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
new file mode 100644
index 0000000000..ad1daacfcf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
new file mode 100644
index 0000000000..145aea9fbc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" JMSDeliveryMode="NON_PERSISTENTS" JMSPriority="8"/>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
new file mode 100644
index 0000000000..c52da84a0c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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" JMSDeliveryMode="NON_PERSISTENT" JMSPriority="20"/>

+            </binding.jms>  

+        </service> 

+    </component>       

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
new file mode 100644
index 0000000000..fb35f5d1b8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
new file mode 100644
index 0000000000..fcdf25455c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
new file mode 100644
index 0000000000..14f1314a1b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
new file mode 100644
index 0000000000..1a3cb21ac6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
new file mode 100644
index 0000000000..80b8f9d938
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
new file mode 100644
index 0000000000..8fd1e2f554
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
new file mode 100644
index 0000000000..3077c328b6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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"
+           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>
+               <UnexpectedElement/>
+            </binding.jms>  
+        </service> 
+    </component>       
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
new file mode 100644
index 0000000000..e22f30152e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
new file mode 100644
index 0000000000..6ef7558d95
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
new file mode 100644
index 0000000000..77a2715373
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
new file mode 100644
index 0000000000..6e5fcf1286
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..d3ce4d91c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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:calc="http://calc">
+   <deployable composite="calc:Calculator"/>
+   <import.resource xmlns="http://www.osoa.org/xmlns/sca/1.0"/>
+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
new file mode 100644
index 0000000000..70f91d1a7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
new file mode 100644
index 0000000000..7f5eb546e0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
new file mode 100644
index 0000000000..70f91d1a7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
new file mode 100644
index 0000000000..c1ff61f07c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+
+<!-- to test TUSCANY-2631 -->
+
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	          targetNamespace="http://sample"
+              xmlns:sample="http://sample">
+    <deployable xmlns:ns1="http://temp"></deployable>              
+	<deployable composite="ns1:aaaa" xmlns:ns1="http://temp"></deployable>
+	<deployable xmlns:ns1="http://temp"></deployable>
+	<deployable composite="ns1:dfsdf" xmlns:ns1="x"></deployable>
+	<deployable composite="ns1:dsfs" xmlns:ns1="http://temp"></deployable> 
+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
new file mode 100644
index 0000000000..0dfe52985a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
new file mode 100644
index 0000000000..d3f249720d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
new file mode 100644
index 0000000000..a8eb389704
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
new file mode 100644
index 0000000000..575927a5de
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
new file mode 100644
index 0000000000..46cf381577
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
new file mode 100644
index 0000000000..a8eb389704
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
new file mode 100644
index 0000000000..b4623b5c2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
new file mode 100644
index 0000000000..973d1f618a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
new file mode 100644
index 0000000000..b4623b5c2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
new file mode 100644
index 0000000000..46cf381577
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
new file mode 100644
index 0000000000..5d2aeddc3d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
@@ -0,0 +1,68 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
new file mode 100644
index 0000000000..b4623b5c2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
new file mode 100644
index 0000000000..46cf381577
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
new file mode 100644
index 0000000000..68df3156a8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
new file mode 100644
index 0000000000..b4623b5c2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
new file mode 100644
index 0000000000..46cf381577
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
new file mode 100644
index 0000000000..a8eb389704
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
new file mode 100644
index 0000000000..b4623b5c2d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
new file mode 100644
index 0000000000..695fd60887
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
new file mode 100644
index 0000000000..94ee650207
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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/ejb"
+	xmlns:sc="http://sample/composite"
+	name="TestEJB">
+
+    <component name="TestEJB">
+        <implementation.ejb/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
new file mode 100644
index 0000000000..f3cf93ddaa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
new file mode 100644
index 0000000000..f9016219a5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
new file mode 100644
index 0000000000..634c13b3cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
new file mode 100644
index 0000000000..0d1861f2f5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
new file mode 100644
index 0000000000..9b3adc4828
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://tuscany.apache.org/validation"
+           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.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
new file mode 100644
index 0000000000..634c13b3cc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
new file mode 100644
index 0000000000..881c24854b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
new file mode 100644
index 0000000000..4e680f1200
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
new file mode 100644
index 0000000000..e01643ed8f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
new file mode 100644
index 0000000000..d776882ed0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
new file mode 100644
index 0000000000..0d1ffc97e4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
new file mode 100644
index 0000000000..99c529d77f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
new file mode 100644
index 0000000000..c75f209b6d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
@@ -0,0 +1,27 @@
+<?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.5.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
new file mode 100644
index 0000000000..a5874707da
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
new file mode 100644
index 0000000000..393b9fe674
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
new file mode 100644
index 0000000000..1dca444938
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
new file mode 100644
index 0000000000..9a60183c5c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
new file mode 100644
index 0000000000..70f91d1a7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
new file mode 100644
index 0000000000..bc7bf3f250
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
@@ -0,0 +1,27 @@
+<?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.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
new file mode 100644
index 0000000000..a1a699fc75
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
new file mode 100644
index 0000000000..7446e4f06a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
@@ -0,0 +1,27 @@
+<?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.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
new file mode 100644
index 0000000000..0bbb10706e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
new file mode 100644
index 0000000000..9d9376ad6c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
new file mode 100644
index 0000000000..3885357625
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
new file mode 100644
index 0000000000..013a55b61e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
new file mode 100644
index 0000000000..d9252ba54f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
new file mode 100644
index 0000000000..53d1a581f0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
@@ -0,0 +1,78 @@
+<?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.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
new file mode 100644
index 0000000000..ac45d95ce8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
@@ -0,0 +1,78 @@
+<?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.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
new file mode 100644
index 0000000000..5cf6963a96
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
@@ -0,0 +1,63 @@
+<?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.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
new file mode 100644
index 0000000000..d31c705fb5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
@@ -0,0 +1,76 @@
+<?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.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
new file mode 100644
index 0000000000..d214a7f40a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
@@ -0,0 +1,175 @@
+<?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.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
new file mode 100644
index 0000000000..ede1786942
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
@@ -0,0 +1,63 @@
+<?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.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
new file mode 100644
index 0000000000..fcb43c949b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
@@ -0,0 +1,70 @@
+<?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.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
new file mode 100644
index 0000000000..8346dcc01a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
@@ -0,0 +1,242 @@
+<?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:test="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="test: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"
+    appliesTo="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="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"
+ appliesTo="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.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
new file mode 100644
index 0000000000..48c3c5ffc0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
new file mode 100644
index 0000000000..60f4de5cd3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
@@ -0,0 +1,68 @@
+<?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.5.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
new file mode 100644
index 0000000000..0b3a828a41
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("ContributionReadException", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
new file mode 100644
index 0000000000..14e47f464a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("PolicyImplValidationException", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
new file mode 100644
index 0000000000..c4cdc2358d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("PolicyServiceValidationException", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
new file mode 100644
index 0000000000..18d9820d10
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("UnexpectedBindingElement", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
new file mode 100644
index 0000000000..bd211aad97
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("UnexpectedImplementationElement", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
new file mode 100644
index 0000000000..61956a8712
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("UnexpectedInterfaceElement", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
new file mode 100644
index 0000000000..773f347170
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 {
+        System.clearProperty("java.naming.factory.initial");
+        System.clearProperty("java.naming.provider.url");
+        System.clearProperty("managed");
+        //node.stop();
+    }
+
+    public void testCalculator() {
+        Monitor monitor = customDomain.getMonitorInstance();
+        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+
+        assertNotNull(problem);
+        assertEquals("UnknownEJBSessionType", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
new file mode 100644
index 0000000000..9ebfa0637b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 {
+        System.clearProperty("java.naming.factory.initial");
+        System.clearProperty("java.naming.provider.url");
+        System.clearProperty("managed");
+        //node.stop();
+    }
+
+    public void testCalculator() {
+    	Monitor monitor = customDomain.getMonitorInstance();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("UnknownEJBVersion", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
new file mode 100644
index 0000000000..d32bb33d93
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("DoesntProcessDestinationType", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
new file mode 100644
index 0000000000..2ba2e6cd12
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.junit.Ignore;
+
+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();
+    }
+
+    @Ignore("TUSCANY-2532")
+    public void testCalculator() {
+    	Monitor monitor = customDomain.getMonitorInstance();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+//       assertEquals("DoesntProcessHeaders", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
new file mode 100644
index 0000000000..011d9e427d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
new file mode 100644
index 0000000000..f0b798c2e4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("InvalidCorrelationScheme", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
new file mode 100644
index 0000000000..a114501098
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
@@ -0,0 +1,60 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;

+

+import domain.CustomCompositeBuilder;

+

+/**

+ * This shows how to test the Calculator service component.

+ */

+public class InvalidJMSDeliveryModeTestCase extends TestCase {

+

+    private CustomCompositeBuilder customDomain;

+

+    @Override

+    protected void setUp() throws Exception 

+    {

+        customDomain = CustomCompositeBuilder.getInstance();

+        try {

+              customDomain.loadContribution("src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite", 

+                        "TestContribution", "src/main/resources/bindingjms/InvalidJMSDeliveryMode/");

+        } catch (Exception ex){

+            //throw ex;

+        }

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        //node.stop();

+    }

+

+    public void testCalculator() {

+    	Monitor monitor = customDomain.getMonitorInstance();

+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();

+        

+    	assertNotNull(problem);

+        assertEquals("InvalidJMSDeliveryMode", problem.getMessageId()); 

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
new file mode 100644
index 0000000000..d31e02054a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
@@ -0,0 +1,60 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;

+

+import domain.CustomCompositeBuilder;

+

+/**

+ * This shows how to test the Calculator service component.

+ */

+public class InvalidJMSPriorityTestCase extends TestCase {

+

+    private CustomCompositeBuilder customDomain;

+

+    @Override

+    protected void setUp() throws Exception 

+    {

+        customDomain = CustomCompositeBuilder.getInstance();

+        try {

+              customDomain.loadContribution("src/main/resources/bindingjms/InvalidJMSPriority/service.composite", 

+                        "TestContribution", "src/main/resources/bindingjms/InvalidJMSPriority/");

+        } catch (Exception ex){

+            //throw ex;

+        }

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        //node.stop();

+    }

+

+    public void testCalculator() {

+    	Monitor monitor = customDomain.getMonitorInstance();

+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();

+        

+    	assertNotNull(problem);

+        assertEquals("InvalidJMSPriority", problem.getMessageId()); 

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
new file mode 100644
index 0000000000..1727217fe0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("InvalidResponseDestinationType", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
new file mode 100644
index 0000000000..33bf2882e5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getProblems().get(1);
+        
+    	assertNotNull(problem);
+        assertEquals("MissingActivationSpecName", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
new file mode 100644
index 0000000000..fcb4345293
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getProblems().get(1);
+        
+    	assertNotNull(problem);
+        assertEquals("MissingConnectionFactoryName", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
new file mode 100644
index 0000000000..04d1ba1055
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getProblems().get(1);
+        
+    	assertNotNull(problem);
+        assertEquals("MissingResponseActivationSpec", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
new file mode 100644
index 0000000000..8725a714e8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getProblems().get(1);
+        
+    	assertNotNull(problem);
+        assertEquals("MissingResponseConnectionFactory", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
new file mode 100644
index 0000000000..b62cd22d6f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("MustStartWithSchema", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
new file mode 100644
index 0000000000..90a82ebe1f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("UnexpectedElement", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
new file mode 100644
index 0000000000..df86fe1564
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("UnknownTokenInURI", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
new file mode 100644
index 0000000000..00e6873361
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("InvalidWsdlElementAttr", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
new file mode 100644
index 0000000000..0ceae597fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
@@ -0,0 +1,64 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;

+

+import domain.CustomCompositeBuilder;

+

+/**

+ * This shows how to test the Calculator service component.

+ */

+public class MissingImportedXSDTestCase extends TestCase {

+	

+    private CustomCompositeBuilder customDomain;

+    

+    @Override

+    protected void setUp() throws Exception 

+    {

+        customDomain = CustomCompositeBuilder.getInstance();

+        try {

+            customDomain.loadContribution("src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite", 

+                    "TestContribution", "src/main/resources/binding/wsxml/MissingImportedXSD/");

+        } catch (Exception ex) {

+            //throw ex;

+        }

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        //node.stop();

+    }

+

+    public void testCalculator() {

+    	Monitor monitor = customDomain.getMonitorInstance();

+

+    	Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(0);

+    	assertNotNull(problem);

+        assertEquals("ContributionResolveException", problem.getMessageId());

+

+        problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();

+        assertNotNull(problem);

+        assertEquals("InvalidInterfaceException", problem.getMessageId());

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
new file mode 100644
index 0000000000..6b2bf20329
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("MustUseWsdlBinding", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
new file mode 100644
index 0000000000..8c21abb896
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
new file mode 100644
index 0000000000..83b4722b60
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
@@ -0,0 +1,60 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;

+

+import domain.CustomCompositeBuilder;

+

+/**

+ * This shows how to test the Calculator service component.

+ */

+public class WsdlPortTypeDoesNotMatchTestCase extends TestCase {

+	

+    private CustomCompositeBuilder customDomain;

+    

+    @Override

+    protected void setUp() throws Exception 

+    {

+        customDomain = CustomCompositeBuilder.getInstance();

+        try {

+             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite", 

+                       "TestContribution", "src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/");

+        } catch (Exception ex){

+            //throw ex;

+        }

+    }

+

+    @Override

+    protected void tearDown() throws Exception {

+        //node.stop();

+    }

+

+    public void testCalculator() {

+        Monitor monitor = customDomain.getMonitorInstance();

+        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();

+        

+        assertNotNull(problem);

+        assertEquals("WsdlPortTypeDoesNotMatch", problem.getMessageId()); 

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
new file mode 100644
index 0000000000..8f7786f08a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
new file mode 100644
index 0000000000..6426e8599b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("ComponentReferenceTargetNotFound", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
new file mode 100644
index 0000000000..5e41d1d1ed
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 junit.framework.TestCase;
+
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
+
+import domain.CustomCompositeBuilder;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class DuplicateComponentNameTestCase extends TestCase {
+
+    private CustomCompositeBuilder customDomain;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        customDomain = CustomCompositeBuilder.getInstance();
+        try {
+            customDomain.loadContribution("src/main/resources/DuplicateComponentName/Calculator.composite", 
+                    "TestContribution", "src/main/resources/DuplicateComponentName/");
+            customDomain.buildContribution();
+        } catch (Exception ex){
+            //throw ex;
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        //nothing to do
+    }
+
+    public void testCalculator() {
+        Monitor monitor = customDomain.getMonitorInstance();
+        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("DuplicateComponentName", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
new file mode 100644
index 0000000000..173d1e4a20
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class DuplicateImplementationPropertyNameTestCase extends TestCase {
+    private SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("DuplicateImplementationPropertyName", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
new file mode 100644
index 0000000000..e016a1465b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class DuplicateImplementationReferenceNameTestCase extends TestCase {
+
+    private SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("DuplicateImplementationReferenceName", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
new file mode 100644
index 0000000000..2e4a3daeca
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("DuplicateComponentPropertyName", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
new file mode 100644
index 0000000000..61c30913cf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
+import org.osoa.sca.ServiceRuntimeException;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class DuplicateReferenceNameTestCase extends TestCase {
+
+    private CalculatorService calculatorService;
+    private SCANode node;
+    private boolean duplicateReferenceException = false;
+
+    @Override
+    protected void setUp() throws Exception {
+        try {
+            SCANodeFactory nodeFactory = SCANodeFactory.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");
+        } catch (ServiceRuntimeException ex) {
+            if (ex.getMessage().equals("org.apache.tuscany.sca.monitor.MonitorRuntimeException: Duplicate component reference name: Component = CalculatorServiceComponent Reference = addService")){
+                duplicateReferenceException = true;
+            }
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (node != null){
+            node.stop();
+        }
+    }
+
+    public void testCalculator() throws Exception {
+        assertTrue(duplicateReferenceException); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
new file mode 100644
index 0000000000..0bbb3a5074
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("MultipleBindingsForService", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
new file mode 100644
index 0000000000..d8a19eb5c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("NoComponentImplementation", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
new file mode 100644
index 0000000000..313c8fdbe0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("NoCompositeNamespace", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
new file mode 100644
index 0000000000..cf86d01f3d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class NoMatchingBindingTestCase extends TestCase {
+
+    private CalculatorService calculatorService;
+    private SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        node =
+            nodeFactory.createSCANode("Calculator.composite", new SCAContribution("TestContribution", new File("src/main/resources/NoMatchingBinding")
+                .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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+
+        assertNotNull(problem);
+        assertEquals("NoMatchingBinding", problem.getMessageId());
+
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
new file mode 100644
index 0000000000..3578567b2a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("PromotedReferenceNotFound", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
new file mode 100644
index 0000000000..4688f836e0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("PromotedServiceNotFound", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
new file mode 100644
index 0000000000..b0883a5227
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("PropertyMustSupplyNull", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
new file mode 100644
index 0000000000..1d6f905c20
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("PropertyMustSupplyIncompatible", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
new file mode 100644
index 0000000000..4d91dfb79c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("PropertyNotFound", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
new file mode 100644
index 0000000000..73a83dd074
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("PropertyOverrideManyAttribute", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
new file mode 100644
index 0000000000..993ccde9fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("ReferenceIncompatibleComponentInterface", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
new file mode 100644
index 0000000000..6dc8a321fc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("ReferenceIncompatibleInterface", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
new file mode 100644
index 0000000000..66b233b87a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("ReferenceIncompatibleMultiplicity", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
new file mode 100644
index 0000000000..2e676282ae
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
+
+import domain.CustomCompositeBuilder;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class ReferenceNotFoundTestCase extends TestCase {
+
+    private CustomCompositeBuilder customDomain;
+
+    @Override
+    protected void setUp() throws Exception {
+        customDomain = CustomCompositeBuilder.getInstance();
+        try {
+            customDomain.loadContribution("src/main/resources/ReferenceNotFound/Calculator.composite", 
+                                          "TestContribution", 
+                                          "src/main/resources/ReferenceNotFound/");
+            customDomain.buildContribution();
+        } catch (Exception ex){
+            throw ex;
+        }   
+        
+        
+        /*
+        SCANodeFactory nodeFactory = SCANodeFactory.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 {
+        Monitor monitor = customDomain.getMonitorInstance();
+        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("ReferenceNotFound", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
new file mode 100644
index 0000000000..ef67ece5e9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("ReferenceWithoutTargets", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
new file mode 100644
index 0000000000..b9bbd3fdd3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("ServiceNotFoundForComponentService", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
new file mode 100644
index 0000000000..040adc09c7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+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 SCANode node;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("UnresolvedComponentImplementation", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
new file mode 100644
index 0000000000..91c7e41e9e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class XSDValidationTestCase extends TestCase {
+
+    private CalculatorService calculatorService;
+    private SCANode node;
+    private Exception startUpException;
+
+    @Override
+    protected void setUp() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.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.apache.tuscany.sca.monitor.MonitorRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage());
+   
+    }
+ 
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
new file mode 100644
index 0000000000..c306373ecb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("AttributePackageMissing", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
new file mode 100644
index 0000000000..c412a16f24
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
new file mode 100644
index 0000000000..8a3687e618
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getProblems().get(1);
+        
+    	assertNotNull(problem);
+        assertEquals("AttributeURIMissing", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
new file mode 100644
index 0000000000..e966c5104a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("AttributeCompositeMissing", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
new file mode 100644
index 0000000000..28bc3af4e3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+import domain.CustomCompositeBuilder;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class MultipleCompositeErrorsTestCase extends TestCase {
+	
+	private CustomCompositeBuilder customDomain;
+    
+    @Override
+    protected void setUp() throws Exception 
+    {
+    	customDomain = CustomCompositeBuilder.getInstance();
+        try {
+        	customDomain.loadContribution("src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite", 
+        			                      "TestContribution", 
+        			                      "src/main/resources/contribution/xml/MultipleCompositeErrors/");
+        } catch (Exception ex){
+            //throw ex;
+        	System.out.println("Got Exception");
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        //node.stop();
+    }
+
+    public void testCalculator() {
+    	Monitor monitor = customDomain.getMonitorInstance();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+    	assertEquals(5, monitor.getProblems().size());
+        assertEquals("AttributeCompositeMissing", problem.getMessageId());
+ 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
new file mode 100644
index 0000000000..7f3199d472
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
@@ -0,0 +1,227 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
+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.DefaultValidatingXMLInputFactory;
+import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint;
+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.processor.ValidationSchemaExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+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 ExtensionPointRegistry extensionPoints;
+    private URLArtifactProcessor<Contribution> contributionProcessor;
+    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 
+        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);
+        
+        // create the validating input factory out here just so that the 
+        // monitor can be passed in
+        ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
+        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, monitor);
+        modelFactories.addFactory(validatingInputFactory);
+        
+        // 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);
+        
+        // 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, extensionPoints));
+
+        // 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 buildContribution() throws Exception {
+        // Create a composite model for the domain
+        Composite domainComposite = assemblyFactory.createComposite();
+        domainComposite.setName(new QName("http://customdomain", "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 void readContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
+    	init();
+
+        // Create workspace model
+        workspace = workspaceFactory.createWorkspace();
+        workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints));
+
+        // 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.5.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
new file mode 100644
index 0000000000..cbc9e199e3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        System.out.println("AttributeUnrecognizedNamespaceTestCase problem:" +  problem.getMessageId());
+        assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
new file mode 100644
index 0000000000..eb2eedb340
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("AttributeWithoutNamespace", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
new file mode 100644
index 0000000000..e93918a94c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("BPELProcessNotFound", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
new file mode 100644
index 0000000000..d711758a21
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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() {
+// TUSCANY-2970:tests don't work in continuum build
+
+//    	Monitor monitor = customDomain.getMonitorInstance();
+//    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+//    	assertNotNull(problem);
+//        assertEquals("CannotResolveWSDLReference", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
new file mode 100644
index 0000000000..b6c3b6c7c9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
new file mode 100644
index 0000000000..c623c2b157
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
+    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
+    	assertNotNull(problem);
+        assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
new file mode 100644
index 0000000000..311a1fd8e7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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() {
+// TUSCANY-2970:tests don't work in continuum build
+//    	Monitor monitor = customDomain.getMonitorInstance();
+//    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+//    	assertNotNull(problem);
+//        assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
new file mode 100644
index 0000000000..999f4a4955
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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() {
+// TUSCANY-2970:tests don't work in continuum build
+//    	Monitor monitor = customDomain.getMonitorInstance();
+//    	assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
+    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
+    	assertNotNull(problem);
+        assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/
+        
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
new file mode 100644
index 0000000000..e0a3216d52
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.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.impl.DefaultMonitorImpl;
+
+import domain.CustomCompositeBuilder;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class EJBLinkAttributeMissingTestCase extends TestCase {
+
+    private CustomCompositeBuilder customDomain;
+	
+    @Override
+    protected void setUp() throws Exception 
+    {
+        customDomain = CustomCompositeBuilder.getInstance();
+        try {
+            customDomain.loadContribution("src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite", 
+                      "TestContribution", "src/main/resources/impl/ejb/EJBLinkAttributeMissing/");
+        } catch (Exception ex){
+            //throw ex;
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+    	//nothing to do
+    }
+
+    public void testCalculator() {
+        Monitor monitor = customDomain.getMonitorInstance();
+        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("EJBLinkAttributeMissing", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
new file mode 100644
index 0000000000..24d1c197a6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("ClassNotFoundException", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
new file mode 100644
index 0000000000..e3e38e86c3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	
+    	assertNotNull(problem);
+        assertEquals("ContributionResolveException", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
new file mode 100644
index 0000000000..b51403fec1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("CouldNotLocateOSGiBundle", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
new file mode 100644
index 0000000000..1939455192
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+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){
+            System.out.println(ex.toString());
+            ex.printStackTrace();
+            //throw ex;
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+    	//nothing to do
+    	OSGiRuntime.stop();
+    }
+
+    public void testCalculator() {
+    	Monitor monitor = customDomain.getMonitorInstance();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("MissingComponentTypeFile", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
new file mode 100644
index 0000000000..398c028dd8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
new file mode 100644
index 0000000000..4a82f569de
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("PropertyShouldSpecifySR", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
new file mode 100644
index 0000000000..5881d866a0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        Assert.assertNotNull(problem);
+        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
new file mode 100644
index 0000000000..8fefaa05eb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("LocationAttributeMissing", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
new file mode 100644
index 0000000000..ebdd05d980
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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(((DefaultMonitorImpl)monitor).isMessageLogged("ContributionResolveException"));
+        //assertEquals("ContributionResolveException", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
new file mode 100644
index 0000000000..7974aa5daf
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("LocationAttributeMissing", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
new file mode 100644
index 0000000000..0ad7bc0918
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	//assertNotNull(problem);
+        //assertEquals("UnableToResolveComponentType", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
new file mode 100644
index 0000000000..3935afa79c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        Assert.assertNotNull(problem);
+        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
new file mode 100644
index 0000000000..daf8eab56f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+        assertNotNull(problem);
+        assertEquals("LocationAttributeMissing", problem.getMessageId());
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
new file mode 100644
index 0000000000..3dbbc61d9c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("CouldNotLocateFile", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
new file mode 100644
index 0000000000..584c11c061
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("LocationAttributeMissing", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
new file mode 100644
index 0000000000..d941f41d2e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("ClassNotFoundException", problem.getMessageId()); 
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
new file mode 100644
index 0000000000..0fb397011b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	//assertNotNull(problem);
+        //assertEquals("ContributionResolveException", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
new file mode 100644
index 0000000000..ecd2e0a760
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getProblems().get(0);
+        
+    	assertNotNull(problem);
+        assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
new file mode 100644
index 0000000000..2149942c25
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
new file mode 100644
index 0000000000..1254f273b7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
new file mode 100644
index 0000000000..150a9267c1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+        assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
new file mode 100644
index 0000000000..1e243689d6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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(((DefaultMonitorImpl)monitor).isMessageLogged("IntentNotSpecified"));
+       /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); 
+       assertNotNull(problem);
+       assertEquals("IntentNotSpecified", problem.getMessageId());*/  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
new file mode 100644
index 0000000000..f2b0b7222f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("MayProvideIntentNotFound", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
new file mode 100644
index 0000000000..e5aba5b481
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+       assertNotNull(problem);
+       assertEquals("RequiredAttributeMissing", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
new file mode 100644
index 0000000000..5bfc77d267
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+import org.junit.Ignore;
+
+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();
+    }
+
+    @Ignore("TUSCANY-2538")
+    public void testCalculator() {
+    	//FIXME This needs to be fixed, as it was working based on processor ignoring
+    	//elements... 
+        /*
+    	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.5.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
new file mode 100644
index 0000000000..64b527e131
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.impl.DefaultMonitorImpl;
+
+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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        
+    	assertNotNull(problem);
+       assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId());  
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/wasAdmin.py b/tags/java/sca/1.5.1/itest/wasAdmin.py
new file mode 100644
index 0000000000..2be2b1eff7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wasAdmin.py
@@ -0,0 +1,91 @@
+"""
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/wires/pom.xml b/tags/java/sca/1.5.1/itest/wires/pom.xml
new file mode 100644
index 0000000000..b60661538b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wires/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-wires</artifactId>
+    <name>Apache Tuscany SCA iTest Wires Basics</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
new file mode 100644
index 0000000000..09d5b0278e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
new file mode 100644
index 0000000000..f0964ebb93
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
new file mode 100644
index 0000000000..c19a0b4f74
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
new file mode 100644
index 0000000000..b7ccdbf8d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wires/src/main/resources/WireTest.composite b/tags/java/sca/1.5.1/itest/wires/src/main/resources/WireTest.composite
new file mode 100644
index 0000000000..8b764d0e7d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wires/src/main/resources/WireTest.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/tags/java/sca/1.5.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
new file mode 100644
index 0000000000..95f721cd8e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/workspace-manager/pom.xml b/tags/java/sca/1.5.1/itest/workspace-manager/pom.xml
new file mode 100644
index 0000000000..81e77d38b3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-workspace-manager</artifactId>
+    <name>Apache Tuscany SCA iTest Workspace Manager</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-workspace-manager</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.5.1</version>
+        </dependency>         
+                        
+    </dependencies>
+</project>
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java
new file mode 100644
index 0000000000..3d12ddfdd2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.artifact.xyz;
+
+import org.apache.tuscany.sca.assembly.impl.BaseImpl;
+
+
+public class XYZ extends BaseImpl  {
+    
+    private String anAttribute;
+    
+    /**
+     * Get the module name
+     * @return
+     */
+    public String getAnAttribute(){
+        return anAttribute;
+    }
+
+    /**
+     * Sets the module name
+     * @param pojoName
+     */
+    public void setAnAttribute(String anAttribute){
+        this.anAttribute = anAttribute;
+    }
+
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java
new file mode 100644
index 0000000000..ee8c881d22
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.artifact.xyz;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.Import;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.imprt.xyz.ImportXYZ;
+
+/**
+ * A Model Resolver for Composite models.
+ *
+ * @version $Rev$ $Date$
+ */
+public class XYZModelResolver implements ModelResolver {
+
+    private Map<String, XYZ> map = new HashMap<String, XYZ>();
+    private Contribution contribution;
+    
+    public XYZModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
+        this.contribution = contribution;
+    }
+
+    public void addModel(Object resolved) {
+        XYZ xyz = (XYZ)resolved;
+        map.put(xyz.getAnAttribute(), xyz);
+    }
+    
+    public Object removeModel(Object resolved) {
+        return map.remove(((XYZ)resolved).getAnAttribute());
+    }
+    
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        
+        XYZ xyz = (XYZ)unresolved;
+        
+        XYZ resolved = map.get(xyz.getAnAttribute());
+        if (resolved != null) {
+            return modelClass.cast(resolved);
+        }
+       
+        // No definition found, delegate the resolution to the imports
+        for (Import import_ : this.contribution.getImports()) {
+            if (import_ instanceof ImportXYZ) {
+                ImportXYZ importXYZ = (ImportXYZ)import_;
+                
+                if (xyz.getAnAttribute().equals(importXYZ.getAnAttribute())) {
+                    
+                    // Delegate the resolution to the import resolver
+                    resolved = importXYZ.getModelResolver().resolveModel(XYZ.class, (XYZ)unresolved);
+                    if (!resolved.isUnresolved()) {
+                        return modelClass.cast(resolved);
+                    }
+                }
+            }
+        }
+
+        return (T)unresolved;
+    }
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java
new file mode 100644
index 0000000000..a0c7c899ec
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.artifact.xyz;
+
+import java.net.URI;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
+
+/**
+ * An ArtifactProcessor for XYZ documents.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class XYZProcessor implements URLArtifactProcessor<XYZ> {
+
+    private XMLInputFactory inputFactory;
+    private Monitor monitor;
+
+    public XYZProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+        this.inputFactory = modelFactories.getFactory(XMLInputFactory.class);
+        this.monitor = monitor;
+    }
+    
+    /**
+     * Report a exception.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+     */
+    private void error(String message, Object model, Exception ex) {
+        if (monitor != null) {
+            Problem problem = new ProblemImpl(this.getClass().getName(), "xsd-xml-validation-messages", Severity.ERROR, model, message, ex);
+            monitor.problem(problem);
+        }        
+    }
+
+    public XYZ read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
+        try {
+            XYZ xyz = new XYZ();
+            String attribute = artifactURL.toString();
+            xyz.setAnAttribute(attribute.substring(attribute.lastIndexOf('/') + 1));
+            return xyz;
+        } catch (Exception e) {
+            ContributionReadException ce = new ContributionReadException(e);
+            error("ContributionReadException", artifactURL, ce);
+            throw ce;
+        }
+    }
+
+    public void resolve(XYZ model, ModelResolver resolver) throws ContributionResolveException {
+    }
+
+    public String getArtifactType() {
+        return ".xyz";
+    }
+
+    public Class<XYZ> getModelType() {
+        return XYZ.class;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java
new file mode 100644
index 0000000000..c7df99691b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import org.apache.tuscany.sca.assembly.Implementation;
+
+
+public interface ImplementationXYZ extends Implementation {
+    
+    /**
+     * Get the module name
+     * @return
+     */
+    public String getAnAttribute();
+
+    /**
+     * Sets the module name
+     * @param pojoName
+     */
+    public void setAnAttribute(String anAttribute);
+    
+  
+    /**
+     * Returns the modules methods.
+     * @return
+     */
+    public Map<String, Method> getMethods();
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java
new file mode 100644
index 0000000000..f0e3f20c15
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+
+/**
+ * Factory for the implementation model. 
+ *
+ * @version $Rev$ $Date$
+ */
+public interface ImplementationXYZFactory {
+
+    /**
+     * Creates a new implementation model object.
+     * @return a new implementation model object
+     */
+    ImplementationXYZ createImplementationXYZ();
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java
new file mode 100644
index 0000000000..1e457d2786
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+
+/**
+ * A factory for the implementation model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ImplementationXYZFactoryImpl implements ImplementationXYZFactory {
+
+	public ImplementationXYZ createImplementationXYZ() {
+		return new ImplementationXYZImpl();
+	}
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java
new file mode 100644
index 0000000000..42dcc2419d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+
+
+/**
+ * Represents an implementation in an SCA assembly.
+ *
+ * @version $Rev$ $Date$
+ */
+class ImplementationXYZImpl implements ImplementationXYZ {
+    
+    private String anAttribute;
+    private String uri;
+    private Map<String, Method> methods;
+    private List<Service> services = new ArrayList<Service>();
+    private List<Reference> references = new ArrayList<Reference>();
+    private List<Property> properties = new ArrayList<Property>();
+    private boolean unresolved;
+
+    ImplementationXYZImpl() {
+    }
+    
+    /**
+     * Returns the module name
+     * @return
+     */
+    public String getAnAttribute() {
+        return anAttribute;
+    }
+
+    /**
+     * Sets the module name
+     * @param pojoName
+     */
+    public void setAnAttribute(String anAttribute) {
+        this.anAttribute = anAttribute;
+        uri = anAttribute;
+    }
+    
+    
+    /**
+     * Returns the methods.
+     * @return
+     */
+    public Map<String, Method> getMethods() {
+        return methods;
+    }
+
+    public ConstrainingType getConstrainingType() {
+        // The sample implementation does not support constrainingTypes
+        return null;
+    }
+
+    public List<Property> getProperties() {
+        return properties;
+    }
+
+    public List<Service> getServices() {
+        return services;
+    }
+    
+    public List<Reference> getReferences() {
+        return references;
+    }
+
+    public String getURI() {
+        return uri;
+    }
+
+    public void setConstrainingType(ConstrainingType constrainingType) {
+        // The sample implementation does not support constrainingTypes
+    }
+
+    public void setURI(String uri) {
+        this.uri = uri;
+    }
+
+    public boolean isUnresolved() {
+        return unresolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unresolved = unresolved;
+    }
+
+    @Override
+    public int hashCode() {
+        return uri.hashCode();
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ImplementationXYZImpl) {
+            return ((ImplementationXYZImpl)obj).getURI().equals(uri);
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java
new file mode 100644
index 0000000000..711f919339
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+import org.osoa.sca.ServiceRuntimeException;
+
+class ImplementationXYZInvoker implements Invoker {
+
+    private Object instance;
+    private Method method;
+    
+    ImplementationXYZInvoker(Object instance, Operation operation, Method method) {
+        this.instance = instance;
+        this.method = method;
+    }
+    
+    public Message invoke(Message msg) {
+    	// do something to invoke the implementation
+    	/*
+        try {
+            msg.setBody(method.invoke(instance, (Object[])msg.getBody()));
+        } catch (InvocationTargetException e) {
+            msg.setFaultBody(e);
+        } catch (Exception e) {
+            throw new ServiceRuntimeException(e);
+        }
+        */
+        return msg;
+    }
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java
new file mode 100644
index 0000000000..792732e73f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.artifact.xyz.XYZ;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+
+
+public class ImplementationXYZProcessor implements StAXArtifactProcessor<ImplementationXYZ> {
+    private static final QName IMPLEMENTATION_XYZ = new QName("http://someuri", "implementation.xyz");
+    
+    private AssemblyFactory assemblyFactory;
+    private ImplementationXYZFactory implementationXYZFactory;
+    private PolicyFactory policyFactory;
+    private PolicyAttachPointProcessor policyProcessor;
+    
+    public ImplementationXYZProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+        
+        // Get the assembly and Java interface factories as we'll need them to
+        // create model objects 
+        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        policyFactory = modelFactories.getFactory(PolicyFactory.class);
+        implementationXYZFactory = modelFactories.getFactory(ImplementationXYZFactory.class);
+        policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+    }
+
+    public QName getArtifactType() {
+        // Returns the qname of the XML element processed by this processor
+        return IMPLEMENTATION_XYZ;
+    }
+
+    public Class<ImplementationXYZ> getModelType() {
+        // Returns the type of model processed by this processor
+        return ImplementationXYZ.class;
+    }
+
+    public ImplementationXYZ read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+    
+        // Read an <implementation.xyz> element
+        ImplementationXYZ implementation = implementationXYZFactory.createImplementationXYZ();
+        
+        // Read policies
+        policyProcessor.readPolicies(implementation, reader);
+        
+        // Read the module attribute.
+        String anAttribute = reader.getAttributeValue(null, "anAttribute");
+        implementation.setAnAttribute(anAttribute);
+        
+        implementation.setUnresolved(true);
+        
+        // Skip to end element
+        while (reader.hasNext()) {
+            if (reader.next() == END_ELEMENT && IMPLEMENTATION_XYZ.equals(reader.getName())) {
+                break;
+            }
+        }
+        
+        return implementation;
+    }
+
+    public void resolve(ImplementationXYZ implementation, ModelResolver resolver) throws ContributionResolveException {
+        
+        // Resolve the xyz implementation
+        XYZ xyz = new XYZ();
+        xyz.setAnAttribute(implementation.getAnAttribute());
+       
+        // First resolve its module
+        XYZ resolved = resolver.resolveModel(XYZ.class, xyz);
+        
+        if (resolved == null){
+            return;
+        }
+        
+        // use this to check that the import/export association has been created 
+        
+        // Check to see if we have a .componentType file describing the POJO class
+        ComponentType componentType = assemblyFactory.createComponentType();
+        componentType.setUnresolved(true);
+        componentType.setURI(implementation.getURI() + ".componentType");
+        componentType = resolver.resolveModel(ComponentType.class, componentType);
+        if (!componentType.isUnresolved()) {
+            
+            // We have a component type description, merge it into the POJO model
+            implementation.getServices().addAll(componentType.getServices());
+            implementation.getReferences().addAll(componentType.getReferences());
+            implementation.getProperties().addAll(componentType.getProperties());
+            
+        } else {
+            
+            // We have no component type description, simply introspect the POJO and
+            // create a single Service for it
+/*        	
+            Service service = assemblyFactory.createService();
+            service.setName(pojoClass.getSimpleName());
+            JavaInterface javaInterface;
+            try {
+                javaInterface = javaFactory.createJavaInterface(pojoClass);
+            } catch (InvalidInterfaceException e) {
+                throw new ContributionResolveException(e);
+            }
+            JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
+            interfaceContract.setInterface(javaInterface);
+            service.setInterfaceContract(interfaceContract);
+            implementation.getServices().add(service);
+*/            
+        }
+        
+        // Mark the implementation resolved now
+        implementation.setUnresolved(false);
+    }
+
+    public void write(ImplementationXYZ implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+        
+        // Write <implementation.xyz> element
+        writer.writeStartElement(IMPLEMENTATION_XYZ.getNamespaceURI(), IMPLEMENTATION_XYZ.getLocalPart());
+        policyProcessor.writePolicyAttributes(implementation, writer);
+        
+        if (implementation.getAnAttribute() != null) {
+            writer.writeAttribute("anAttribute", implementation.getAnAttribute());
+        }
+        
+        writer.writeEndElement();
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java
new file mode 100644
index 0000000000..9d526b007f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+import java.lang.reflect.Method;
+
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ImplementationProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.osoa.sca.ServiceRuntimeException;
+
+class ImplementationXYZProvider implements ImplementationProvider {
+    
+    private ImplementationXYZ implementation;
+    private Object instance;
+
+    /**
+     * Constructs a new CRUD implementation.
+     */
+    ImplementationXYZProvider(RuntimeComponent component, ImplementationXYZ implementation) {
+        this.implementation = implementation;
+        
+        // Create a new instance of the POJO
+        try {
+            //pojoInstance = implementation.getPOJOClass().newInstance();
+        } catch (Exception e) {
+            throw new ServiceRuntimeException(e);
+        }
+    }
+
+    public void start() {
+        try {
+            // Invoke the POJO's init method
+            Method initMethod = implementation.getMethods().get("init");
+            if (initMethod != null) {
+                //initMethod.invoke(pojoInstance);
+            }
+        } catch (Exception e) {
+            throw new ServiceRuntimeException(e);
+        }
+    }
+
+    public void stop() {
+        try {
+            // Invoke the POJO's destroy method
+            Method destroyMethod = implementation.getMethods().get("destroy");
+            if (destroyMethod != null) {
+                //destroyMethod.invoke(pojoInstance);
+            }
+        } catch (Exception e) {
+            throw new ServiceRuntimeException(e);
+        } finally {
+            instance = null;
+        }
+    }
+    
+    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
+        Method method = implementation.getMethods().get(operation.getName()); 
+        ImplementationXYZInvoker invoker = new ImplementationXYZInvoker(instance, operation, method);
+        return invoker;
+    }
+    
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java
new file mode 100644
index 0000000000..bb561008d8
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.xyz;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.provider.ImplementationProvider;
+import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+
+/**
+ * A factory for POJO implementation providers.
+ */
+public class ImplementationXYZProviderFactory implements ImplementationProviderFactory<ImplementationXYZ> {
+    
+    public ImplementationXYZProviderFactory(ExtensionPointRegistry registry) {
+    }
+
+    public Class<ImplementationXYZ> getModelType() {
+        // Returns the type of model processed by this processor
+        return ImplementationXYZ.class;
+    }
+
+    public ImplementationProvider createImplementationProvider(RuntimeComponent component, ImplementationXYZ implementation) {
+        return new ImplementationXYZProvider(component, implementation);
+    }
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java
new file mode 100644
index 0000000000..b9a7bf6c0c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+/**
+ * Default Import/Export model factory implementation
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultImportExportXYZFactory extends ImportExportXYZFactoryImpl implements ImportExportXYZFactory {
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java
new file mode 100644
index 0000000000..b099cfee11
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+import org.apache.tuscany.sca.contribution.Export;
+
+
+/**
+ * The model of an export.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface ExportXYZ extends Export {
+
+    /**
+     * Get the uri of the contributions
+     * 
+     * @return The URI
+     */
+    String getURI();
+
+    /**
+     * Set the uri of the contributions
+     * 
+     * @param URI
+     */
+    void setURI(String URI);
+
+    /**
+     * Get anAttribute
+     * 
+     * @return anAttribute
+     */
+    String getAnAttribute();
+
+    /**
+     * Set anAttribute
+     * 
+     * @param anAttribute
+     */
+    void setAnAttribute(String anAttribute);
+    
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java
new file mode 100644
index 0000000000..6e98979b5d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * The model of an export 
+ *
+ * @version $Rev$ $Date$
+ */
+public class ExportXYZImpl extends ExtensibleImpl implements ExportXYZ {
+    private String URI;
+    private String anAttribute;
+    private ModelResolver modelResolver;
+
+    protected ExportXYZImpl() {
+        super();
+    }
+
+    public String getURI() {
+        return URI;
+    }
+
+    public void setURI(String URI) {
+        this.URI = URI;
+    }
+
+    public String getAnAttribute() {
+        return anAttribute;
+    }
+
+    public void setAnAttribute(String anAttribute) {
+        this.anAttribute = anAttribute;
+    }
+
+    public ModelResolver getModelResolver() {
+        return modelResolver;
+    }
+
+    public void setModelResolver(ModelResolver modelResolver) {
+        this.modelResolver = modelResolver;
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java
new file mode 100644
index 0000000000..c3d2663d62
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A model resolver for exports.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ExportXYZModelResolver implements ModelResolver {
+
+    private ModelResolver resolver;
+    
+    public ExportXYZModelResolver(ModelResolver resolver) {
+        this.resolver = resolver;
+    }
+    
+    public void addModel(Object resolved) {
+        throw new IllegalStateException();
+    }
+
+    public Object removeModel(Object resolved) {
+        throw new IllegalStateException();
+    }
+
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        
+        // Just delegate to the contribution's model resolver, namespace
+        // based filtering is implemented in the model specific model
+        // resolver, which know how to get the namespace of the particular
+        // type of model that they handle 
+        return resolver.resolveModel(modelClass, unresolved);
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java
new file mode 100644
index 0000000000..7d4aafa31f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.ExtensionFactory;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
+
+
+public class ExportXYZProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<ExportXYZ> {
+
+    private static final String NS = "http://someuri";
+    private static final QName EXPORT = new QName(NS, "export.xyz");
+    private static final String URI = "uri";
+    private static final String AN_ATTRIBUTE = "anAttribute";
+
+    private final ImportExportXYZFactory factory;
+    private final Monitor monitor;
+    private final ExtensionFactory extensionFactory;
+
+
+    public ExportXYZProcessor(ModelFactoryExtensionPoint modelFactories,
+                                    Monitor monitor) {
+        this.factory = modelFactories.getFactory(ImportExportXYZFactory.class);
+        this.extensionFactory = modelFactories.getFactory(ExtensionFactory.class);
+        this.monitor = monitor;
+    }
+
+    /**
+     * Report a warning.
+     *
+     * @param problems
+     * @param message
+     * @param model
+     */
+     private void error(String message, Object model, Object... messageParameters) {
+    	 if (monitor != null) {
+	        Problem problem = new ProblemImpl(this.getClass().getName(), "export-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+	        monitor.problem(problem);
+    	 }
+     }
+
+     /**
+      * Report a exception.
+      *
+      * @param problems
+      * @param message
+      * @param model
+      */
+     private void error(String message, Object model, Exception ex) {
+         if (monitor != null) {
+             Problem problem = new ProblemImpl(this.getClass().getName(), "export-validation-messages", Severity.ERROR, model, message, ex);
+             monitor.problem(problem);
+         }
+     }
+
+    public QName getArtifactType() {
+        return EXPORT;
+    }
+
+    public Class<ExportXYZ> getModelType() {
+        return ExportXYZ.class;
+    }
+
+
+    public ExportXYZ read(XMLStreamReader reader) throws ContributionReadException {
+        ExportXYZ export = this.factory.createExport();
+        QName element = null;
+
+        try {
+            while (reader.hasNext()) {
+                int event = reader.getEventType();
+                switch (event) {
+                    case START_ELEMENT:
+                        element = reader.getName();
+
+                        // Read <export>
+                        if (EXPORT.equals(element)) {
+                            String ns = reader.getAttributeValue(null, URI);
+                            if (ns == null) {
+                            	error("AttributeNameSpaceMissing", reader);
+                            } else {
+                            	export.setURI(ns);
+                            }
+                            
+                            String anAttribute = reader.getAttributeValue(null, AN_ATTRIBUTE);
+                            export.setAnAttribute(anAttribute);
+                        }
+
+                        break;
+                    case XMLStreamConstants.END_ELEMENT:
+                        if (EXPORT.equals(reader.getName())) {
+                            return export;
+                        }
+                        break;
+                }
+
+                // Read the next element
+                if (reader.hasNext()) {
+                    reader.next();
+                }
+            }
+        }
+        catch (XMLStreamException e) {
+            ContributionReadException ex = new ContributionReadException(e);
+            error("XMLStreamException", reader, ex);
+        }
+
+        return export;
+    }
+
+    public void write(ExportXYZ export, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+
+        // Write <export>
+        writer.writeStartElement(EXPORT.getNamespaceURI(), EXPORT.getLocalPart());
+
+        if (export.getURI() != null) {
+            writer.writeAttribute(URI, export.getURI());
+        }
+        
+        if (export.getAnAttribute() != null) {
+            writer.writeAttribute(AN_ATTRIBUTE, export.getAnAttribute());
+        }
+
+        writer.writeEndElement();
+    }
+
+    public void resolve(ExportXYZ export, ModelResolver resolver) throws ContributionResolveException {
+
+        if (export.getURI() != null)
+            // Initialize the export's resolver
+            export.setModelResolver(new ExportXYZModelResolver(resolver));
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java
new file mode 100644
index 0000000000..db2bab7f99
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+public interface ImportExportXYZFactory {
+
+    ImportXYZ createImport();
+    
+    ExportXYZ createExport();
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java
new file mode 100644
index 0000000000..b0a9c80d88
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+public class ImportExportXYZFactoryImpl implements ImportExportXYZFactory {
+
+    public ImportXYZ createImport() {
+        return new ImportXYZImpl();
+    }
+    
+    public ExportXYZ createExport() {
+        return new ExportXYZImpl();
+    }
+
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java
new file mode 100644
index 0000000000..3e883e84a2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+import org.apache.tuscany.sca.contribution.Import;
+
+/**
+ * The representation of an XML namespace import.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface ImportXYZ extends Import {
+
+    /**
+     * Get the uri of the contributions
+     * 
+     * @return The URI
+     */
+    String getURI();
+
+    /**
+     * Set the uri of the contributions
+     * 
+     * @param URI
+     */
+    void setURI(String URI);
+
+    /**
+     * Get anAttribute
+     * 
+     * @return anAttribute
+     */
+    String getAnAttribute();
+
+    /**
+     * Set anAttribute
+     * 
+     * @param anAttribute
+     */
+    void setAnAttribute(String anAttribute);
+    
+}
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java
new file mode 100644
index 0000000000..ef3f0653f3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
+import org.apache.tuscany.sca.contribution.Export;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * The representation of an import for the contribution
+ *
+ * @version $Rev$ $Date$
+ */
+public class ImportXYZImpl extends ExtensibleImpl implements ImportXYZ {
+    private ModelResolver modelResolver;
+
+    private String URI;
+    private String anAttribute;
+
+
+    protected ImportXYZImpl() {
+        super();
+    }
+
+    public String getURI() {
+        return URI;
+    }
+
+    public void setURI(String URI) {
+        this.URI = URI;
+    }
+
+    public String getAnAttribute() {
+        return anAttribute;
+    }
+
+    public void setAnAttribute(String anAttribute) {
+        this.anAttribute = anAttribute;
+    }
+
+    public ModelResolver getModelResolver() {
+        return modelResolver;
+    }
+
+    public void setModelResolver(ModelResolver modelResolver) {
+        this.modelResolver = modelResolver;
+    }
+
+    public boolean match(Export export) {
+        if (export instanceof ExportXYZ){
+            return anAttribute.equals(((ExportXYZ)export).getAnAttribute());
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(URI);
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java
new file mode 100644
index 0000000000..763fa30002
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.imprt.xyz;
+
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.ExtensionFactory;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
+import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
+
+/**
+ * Artifact processor for Namespace import
+ *
+ * @version $Rev$ $Date$
+ */
+public class ImportXYZProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<ImportXYZ> {
+    private static final String NS = "http://someuri";
+
+    private static final QName IMPORT = new QName(NS, "import.xyz");
+
+    private static final String URI = "uri";
+    private static final String AN_ATTRIBUTE = "anAttribute";
+
+    private final ImportExportXYZFactory factory;
+    private final ExtensionFactory extensionFactory;
+    private final Monitor monitor;
+
+    public ImportXYZProcessor(ModelFactoryExtensionPoint modelFactories,
+                                    Monitor monitor) {
+        this.factory = modelFactories.getFactory(ImportExportXYZFactory.class);
+        this.monitor = monitor;
+        this.extensionFactory = modelFactories.getFactory(ExtensionFactory.class);
+    }
+
+    /**
+     * Report a warning.
+     *
+     * @param problems
+     * @param message
+     * @param model
+     */
+     private void error(String message, Object model, Object... messageParameters) {
+    	 if (monitor != null) {
+	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-namespace-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+	        monitor.problem(problem);
+    	 }
+     }
+
+     /**
+      * Report a exception.
+      *
+      * @param problems
+      * @param message
+      * @param model
+      */
+     private void error(String message, Object model, Exception ex) {
+         if (monitor != null) {
+             Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-namespace-validation-messages", Severity.ERROR, model, message, ex);
+             monitor.problem(problem);
+         }
+     }
+
+    public QName getArtifactType() {
+        return IMPORT;
+    }
+
+    public Class<ImportXYZ> getModelType() {
+        return ImportXYZ.class;
+    }
+
+    public ImportXYZ read(XMLStreamReader reader) throws ContributionReadException {
+    	ImportXYZ importXYZ= this.factory.createImport();
+        QName element;
+
+        try {
+            while (reader.hasNext()) {
+                int event = reader.getEventType();
+                switch (event) {
+                    case START_ELEMENT:
+                        element = reader.getName();
+
+                        // Read <import>
+                        if (IMPORT.equals(element)) {
+                            String ns = reader.getAttributeValue(null, URI);
+                            if (ns == null) {
+                            	error("AttributeNameSpaceMissing", reader);
+                            } else {
+                            	importXYZ.setURI(ns);
+                            }
+
+                            String anAttribute = reader.getAttributeValue(null, AN_ATTRIBUTE);
+                            if (anAttribute != null) {
+                            	importXYZ.setAnAttribute(anAttribute);
+                            }
+                        } 
+                        break;
+                    case XMLStreamConstants.END_ELEMENT:
+                        if (IMPORT.equals(reader.getName())) {
+                            return importXYZ;
+                        }
+                        break;
+                }
+
+                // Read the next element
+                if (reader.hasNext()) {
+                    reader.next();
+                }
+            }
+        }
+        catch (XMLStreamException e) {
+            ContributionReadException ex = new ContributionReadException(e);
+            error("XMLStreamException", reader, ex);
+        }
+
+        return importXYZ;
+    }
+
+    public void write(ImportXYZ importXYZ, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+
+        // Write <import>
+        writer.writeStartElement(IMPORT.getNamespaceURI(), IMPORT.getLocalPart());
+
+        if (importXYZ.getURI() != null) {
+            writer.writeAttribute(URI, importXYZ.getURI());
+        }
+        if (importXYZ.getAnAttribute() != null) {
+            writer.writeAttribute(AN_ATTRIBUTE, importXYZ.getAnAttribute());
+        }
+
+        writer.writeEndElement();
+    }
+
+
+    public void resolve(ImportXYZ model, ModelResolver resolver) throws ContributionResolveException {
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..ba8f0a4793
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+		 	  xmlns:tns="http://someuri"
+              xmlns:ans="http://someotheruri">
+    <deployable composite="AComposite"/>
+    <import namespace="http://test"/>
+    <tns:import.xyz uri="abcdef" anAttribute="abcdef.xyz"/>
+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
new file mode 100644
index 0000000000..9b56f92027
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:tns="http://someuri"
+           xmlns:test="http://test"
+           targetNamespace="http://contrib1"
+           name="AComposite">
+
+       <component name="Component1">
+         <tns:implementation.xyz anAttribute="abcdef.xyz"/>
+         <reference name="component2" target="Component2"/>
+       </component>
+
+       <component name="Component2">
+         <tns:implementation.xyz anAttribute="fghij"/>
+       </component> 
+    
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8511d427f9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+		 	  xmlns:tns="http://someuri"
+              xmlns:ans="http://someotheruri">
+    <deployable composite="BComposite"/>
+    <export namespace="http://test"/>
+    <tns:export.xyz uri="abcdef" anAttribute="abcdef.xyz"/>
+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
new file mode 100644
index 0000000000..037869c9ef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
@@ -0,0 +1 @@
+Empty File
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
new file mode 100644
index 0000000000..75c0513423
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:tns="http://someuri"
+           targetNamespace="http://contrib2"
+           name="BComposite">
+
+       <component name="Component3">
+         <tns:implementation.xyz anAttribute="abcdef.xyz"/>
+         <reference name="component2" target="Component2"/>
+       </component>
+    
+</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd
new file mode 100644
index 0000000000..7527779cda
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (c) Copyright SCA Collaboration 2006 -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+    targetNamespace="http://someuri" 
+    xmlns:tns="http://someuri" 
+    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+    elementFormDefault="qualified">
+
+    <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
+
+    <element name="implementation.xyz" type="tns:XYZImplementation"/> 
+    	
+    <complexType name="XYZImplementation">
+        <complexContent>
+            <extension base="sca:Implementation">
+                <sequence>
+                    <any namespace="##targetNamespace" processContents="lax" 
+                    	minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="anAttribute" type="string" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/import-xyz.xsd b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/import-xyz.xsd
new file mode 100644
index 0000000000..e8535fe3a7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/import-xyz.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (c) Copyright SCA Collaboration 2006 -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+    targetNamespace="http://someuri" 
+    xmlns:tns="http://someuri" 
+    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+    elementFormDefault="qualified">
+
+    <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
+
+	<element name="import.xyz" type="tns:ImportXYZ" substitutionGroup="sca:baseImport"/>
+	
+	<element name="export.xyz" type="tns:ExportXYZ" substitutionGroup="sca:baseExport"/>
+
+    <complexType name="ImportXYZ">
+        <complexContent>
+            <extension base="sca:BaseImportType">
+    	        <attribute name="anAttribute" type="string"/>
+    	    </extension>
+    	</complexContent>
+    </complexType>
+
+    <complexType name="ExportXYZ">
+        <complexContent>
+            <extension base="sca:BaseExportType"/>
+    	</complexContent>
+    </complexType>
+
+</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java b/tags/java/sca/1.5.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
new file mode 100644
index 0000000000..efd6d11b8e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.workspace.manager.test;
+
+import static org.junit.Assert.assertEquals;
+
+
+import org.apache.tuscany.sca.artifact.xyz.XYZ;
+import org.apache.tuscany.sca.artifact.xyz.XYZModelResolver;
+import org.apache.tuscany.sca.artifact.xyz.XYZProcessor;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.implementation.xyz.ImplementationXYZFactoryImpl;
+import org.apache.tuscany.sca.implementation.xyz.ImplementationXYZProcessor;
+import org.apache.tuscany.sca.imprt.xyz.DefaultImportExportXYZFactory;
+import org.apache.tuscany.sca.imprt.xyz.ExportXYZProcessor;
+import org.apache.tuscany.sca.imprt.xyz.ImportXYZProcessor;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.apache.tuscany.sca.workspace.Workspace;
+import org.apache.tuscany.sca.workspace.manager.WorkspaceManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class WorkspaceManagerTestCase {
+
+    private WorkspaceManager workspaceManager;
+
+    @Before
+    public void init() {
+        workspaceManager = WorkspaceManager.newInstance();
+        addExtensions(workspaceManager);
+        workspaceManager.start();
+    }
+
+    @Test
+    public void testHelloWorldCreate() throws Exception {
+        Workspace workspace = loadWorkspace(workspaceManager);
+        assertEquals(1, workspace.getContributions().get(0).getDeployables().size());
+    }
+    
+    private void addExtensions(WorkspaceManager workspaceManager) {
+        try {
+            System.out.println("Add extensions");           
+            ExtensionPointRegistry registry = workspaceManager.getRegistry();
+            
+            // get monitor
+            UtilityExtensionPoint utilities = 
+                registry.getExtensionPoint(UtilityExtensionPoint.class);
+            MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
+            Monitor monitor = monitorFactory.createMonitor();
+                    
+            // create validation schema
+            // are schema required
+            ValidationSchemaExtensionPoint schemas = 
+                registry.getExtensionPoint(ValidationSchemaExtensionPoint.class);
+            schemas.addSchema(WorkspaceManagerTestCase.class.getClassLoader().getResource("implementation-xyz.xsd").toString());
+            schemas.addSchema(WorkspaceManagerTestCase.class.getClassLoader().getResource("import-xyz.xsd").toString());
+            
+            // create model factories
+            ModelFactoryExtensionPoint modelFactories = 
+                registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
+
+            modelFactories.addFactory(new ImplementationXYZFactoryImpl());
+            modelFactories.addFactory(new DefaultImportExportXYZFactory());
+            
+            // Create URL artifact processors
+            URLArtifactProcessorExtensionPoint urlProcessors = 
+                registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
+            
+            urlProcessors.addArtifactProcessor(new XYZProcessor(modelFactories, monitor));
+            
+            // Create stax artifact processors
+            StAXArtifactProcessorExtensionPoint artifactProcessors = 
+                registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+            
+            artifactProcessors.addArtifactProcessor(new ImplementationXYZProcessor(modelFactories, 
+                    monitor));
+            artifactProcessors.addArtifactProcessor(new ImportXYZProcessor(modelFactories,
+                    monitor));
+            artifactProcessors.addArtifactProcessor(new ExportXYZProcessor(modelFactories,
+                    monitor));
+            
+            // create model resolvers
+            ModelResolverExtensionPoint modelResolvers = 
+                registry.getExtensionPoint(ModelResolverExtensionPoint.class);
+            
+            modelResolvers.addResolver(XYZ.class, XYZModelResolver.class);
+            
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }    
+    }
+        
+    private Workspace loadWorkspace(WorkspaceManager workspaceManager){
+        try {
+            System.out.println("Process contribution");
+            
+            Workspace workspace = workspaceManager.createWorkspace();
+            
+            Contribution contribution = workspaceManager.readContribution("contrib2", "./target/classes/contrib2");
+            workspaceManager.addContributionToWorkspace(workspace, contribution);
+            
+            contribution = workspaceManager.readContribution("contrib1", "./target/classes/contrib1");
+            workspaceManager.addContributionToWorkspace(workspace, contribution);
+            
+            workspaceManager.resolveWorkspace(workspace);   
+            
+            return workspace;
+            
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        
+        return null;
+    }    
+
+    @After
+    public void end() {
+        workspaceManager.stop();
+    }
+}
diff --git a/tags/java/sca/1.5.1/itest/ws-void-args-return/pom.xml b/tags/java/sca/1.5.1/itest/ws-void-args-return/pom.xml
new file mode 100644
index 0000000000..986542cc2c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-ws-void-args-return</artifactId>
+    <name>Apache Tuscany SCA iTest Web Services Void Args and Return</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+    
+</project>
diff --git a/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
new file mode 100644
index 0000000000..43e251369d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
new file mode 100644
index 0000000000..dc949b5191
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
@@ -0,0 +1,64 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
new file mode 100644
index 0000000000..4777f793e0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
@@ -0,0 +1,47 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
new file mode 100644
index 0000000000..d549bccaf0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
@@ -0,0 +1,23 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
new file mode 100644
index 0000000000..1cdd094c50
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
@@ -0,0 +1,53 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/ws-void-args-return/src/main/resources/voidtest.composite b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/resources/voidtest.composite
new file mode 100644
index 0000000000..0f31c4cd2c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/resources/voidtest.composite
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
new file mode 100644
index 0000000000..eaaa67c22c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
@@ -0,0 +1,53 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl-multiple/pom.xml b/tags/java/sca/1.5.1/itest/wsdl-multiple/pom.xml
new file mode 100644
index 0000000000..f985a865cd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-wsdl-multiple</artifactId>
+    <name>Apache Tuscany SCA iTest Multiple WSDL File Support</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</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.1</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.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
new file mode 100644
index 0000000000..842ae0a692
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..d2d898e9c4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..d4fbd434fe
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..a46f763960
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
new file mode 100644
index 0000000000..9d9ed57cc7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
new file mode 100644
index 0000000000..0c1dc5d353
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
new file mode 100644
index 0000000000..ea2f93c3e6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
new file mode 100644
index 0000000000..1e50e146f2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
new file mode 100644
index 0000000000..6a872faa17
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
new file mode 100644
index 0000000000..5852f8d802
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl/pom.xml b/tags/java/sca/1.5.1/itest/wsdl/pom.xml
new file mode 100644
index 0000000000..0e496e66e0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-wsdl</artifactId>
+    <name>Apache Tuscany SCA iTest WSDL Support</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</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.1</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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
new file mode 100644
index 0000000000..265b11f7dd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
new file mode 100644
index 0000000000..f8c9c28f26
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
new file mode 100644
index 0000000000..f16d20689d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
new file mode 100644
index 0000000000..cba6f2ee6c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
new file mode 100644
index 0000000000..9f15be0236
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
new file mode 100644
index 0000000000..f174e1af07
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
new file mode 100644
index 0000000000..4a5b7bceef
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
new file mode 100644
index 0000000000..e747eb041f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..c9076ebba6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..268d90e910
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
new file mode 100644
index 0000000000..d706517b76
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
new file mode 100644
index 0000000000..9d147dc013
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
new file mode 100644
index 0000000000..7556e02b36
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
new file mode 100644
index 0000000000..e7031ff41c
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
new file mode 100644
index 0000000000..7a049ed7b0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl
new file mode 100644
index 0000000000..f47ad202b4
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://helloworld3" 

+                  xmlns:tns="http://helloworld3" 

+                  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-import">

+

+    <wsdl:types>

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

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

+                targetNamespace="http://helloworld3" 

+                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:definitions>

diff --git a/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd
new file mode 100644
index 0000000000..d3c83b08c6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+   Licensed to the Apache Software Foundation (ASF) under one

+   or more contributor license agreements.  See the NOTICE file

+   distributed with this work for additional information

+   regarding copyright ownership.  The ASF licenses this file

+   to you under the Apache License, Version 2.0 (the

+   "License"); you may not use this file except in compliance

+   with the License.  You may obtain a copy of the License at

+   

+     http://www.apache.org/licenses/LICENSE-2.0

+     

+   Unless required by applicable law or agreed to in writing,

+   software distributed under the License is distributed on an

+   "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite
new file mode 100644
index 0000000000..62596ee62a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wsdl/src/main/resources/WSDLTest.composite b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/WSDLTest.composite
new file mode 100644
index 0000000000..2024578dae
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/WSDLTest.composite
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl
new file mode 100644
index 0000000000..2920c43a31
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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://helloworld3" 

+                  xmlns:tns="http://helloworld3" 

+                  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-import">

+

+    <wsdl:types>

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

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

+                targetNamespace="http://helloworld3" 

+                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:definitions>

diff --git a/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd
new file mode 100644
index 0000000000..d49e2ead99
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
new file mode 100644
index 0000000000..90eeae3c8a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT 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:tns3="http://helloworld3"

+                  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 namespace="http://helloworld3" location="../../helloworld-import.wsdl" />

+    

+    <wsdl:binding name="HelloWorldSoapBinding" type="tns3: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.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
new file mode 100644
index 0000000000..1af51162ac
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.java interface="helloworld.HelloWorldService"/>

+	        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+	    </service>

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

+    </component>

+

+</composite>

diff --git a/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
new file mode 100644
index 0000000000..73f9ed4bfc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/Hello.xsd
new file mode 100644
index 0000000000..108b1f393f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/Hello.xsd
@@ -0,0 +1,37 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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>
diff --git a/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
new file mode 100644
index 0000000000..1966acc957
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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">
+            <import namespace="http://helloworld" schemaLocation="Hello.xsd"/>
+        </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.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java
new file mode 100644
index 0000000000..f4edf7bef0
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java
@@ -0,0 +1,52 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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.File;

+

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

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

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+

+import helloworld.HelloWorldService;

+

+/**

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

+ * and locate and invoke a SCA component

+ */

+public class HelloWorldClient {

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

+

+        SCANodeFactory factory = SCANodeFactory.newInstance();

+        SCANode node = factory.createSCANode(new File("src/main/resources/imports/wsdl/helloworldws.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/imports/wsdl/").toURL().toString()));

+        node.start();        

+              

+        HelloWorldService hwService = 

+            ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldServiceComponent");

+        

+        System.out.println("Hello " + hwService.getGreetings("World"));

+

+        node.stop();

+        System.out.println("Bye");

+    }

+

+}

diff --git a/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
new file mode 100644
index 0000000000..12441753fb
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java
new file mode 100644
index 0000000000..8026f93b80
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java
@@ -0,0 +1,32 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, 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;

+

+/**

+ * Tests out the big bank service

+ *

+ */

+public class WSDLImportsTestCase extends TestCase {

+

+    public void testServer() throws Exception {

+        HelloWorldClient.main(new String[] {""});

+    }

+}

diff --git a/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
new file mode 100644
index 0000000000..fd30d69c79
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdl2java/pom.xml b/tags/java/sca/1.5.1/itest/wsdl2java/pom.xml
new file mode 100644
index 0000000000..07c73882df
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl2java/pom.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>itest-wsdl2java</artifactId>
+	<name>Apache Tuscany SCA iTest WSDL2Java</name>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-embedded</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-implementation-java-runtime</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-interface-wsdl</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-ws-axis2</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-sdo</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-databinding-axiom</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-jetty</artifactId>
+			<version>1.5.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sdo</groupId>
+			<artifactId>tuscany-sdo-impl</artifactId>
+			<version>1.1.1</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.1</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.5.1</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.5.1/itest/wsdl2java/src/test/resources/AccountService.wsdl b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/AccountService.wsdl
new file mode 100644
index 0000000000..9e5650e7dd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/AccountService.wsdl
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	* Licensed to the Apache Software Foundation (ASF) under one
+	* or more contributor license agreements.  See the NOTICE file
+	* distributed with this work for additional information
+	* regarding copyright ownership.  The ASF licenses this file
+	* to you under the Apache License, Version 2.0 (the
+	* "License"); you may not use this file except in compliance
+	* with the License.  You may obtain a copy of the License at
+	* 
+	*   http://www.apache.org/licenses/LICENSE-2.0
+	* 
+	* Unless required by applicable law or agreed to in writing,
+	* software distributed under the License is distributed on an
+	* "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl2java/src/test/resources/EchoService.wsdl b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/EchoService.wsdl
new file mode 100644
index 0000000000..50d580f299
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/EchoService.wsdl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+	* Licensed to the Apache Software Foundation (ASF) under one
+	* or more contributor license agreements.  See the NOTICE file
+	* distributed with this work for additional information
+	* regarding copyright ownership.  The ASF licenses this file
+	* to you under the Apache License, Version 2.0 (the
+	* "License"); you may not use this file except in compliance
+	* with the License.  You may obtain a copy of the License at
+	* 
+	*   http://www.apache.org/licenses/LICENSE-2.0
+	* 
+	* Unless required by applicable law or agreed to in writing,
+	* software distributed under the License is distributed on an
+	* "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl2java/src/test/resources/EchoService.xsd b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/EchoService.xsd
new file mode 100644
index 0000000000..8069d4861f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/EchoService.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
new file mode 100644
index 0000000000..c44229c162
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+	* Licensed to the Apache Software Foundation (ASF) under one
+	* or more contributor license agreements.  See the NOTICE file
+	* distributed with this work for additional information
+	* regarding copyright ownership.  The ASF licenses this file
+	* to you under the Apache License, Version 2.0 (the
+	* "License"); you may not use this file except in compliance
+	* with the License.  You may obtain a copy of the License at
+	* 
+	*   http://www.apache.org/licenses/LICENSE-2.0
+	* 
+	* Unless required by applicable law or agreed to in writing,
+	* software distributed under the License is distributed on an
+	* "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdlgen/pom.xml b/tags/java/sca/1.5.1/itest/wsdlgen/pom.xml
new file mode 100644
index 0000000000..6a8e97e7f6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-wsdlgen</artifactId>
+    <name>Apache Tuscany SCA iTest runtime WSDL generation</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-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>            
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5.1</version>
+            <scope>compile</scope>            
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <scope>compile</scope>            
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>    
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+       
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+
+</project>
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/ABean.java b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/ABean.java
new file mode 100644
index 0000000000..8a99a81132
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/ABean.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package helloworld;
+
+public class ABean {
+    
+    protected String field1;
+    protected String field2;
+
+    public String getField1() {
+        return field1;
+    }
+    
+    public void setField1(String field1) {
+        this.field1 = field1;
+    }
+    
+    public String getField2() {
+        return field2;
+    }
+    
+    public void setField2(String field2) {
+        this.field2 = field2;
+    }
+}
+
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..83165307af
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.Vector;
+
+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 String getGreetingsBean(ABean bean){
+        return "Hello " + bean.getField1() + " " + bean.getField2();
+    }
+
+    public String getGreetingsBeanArray(ABean[] bean){
+        return "Hello " + bean[0].getField1() + " " + bean[0].getField2();
+    }
+   
+    /*
+    public String getGreetingsBeanVector(Vector<ABean> bean){
+        return "Hello " + bean.get(0).getField1() + " " + bean.get(0).getField2();
+    }
+    */
+}
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..6f3d57e6f7
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.Vector;
+
+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 getGreetingsBean(ABean bean);
+    public String getGreetingsBeanArray(ABean[] bean);
+    //public String getGreetingsBeanVector(Vector<ABean> bean);
+}
+
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/package-info.java b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/package-info.java
new file mode 100644
index 0000000000..45bc473320
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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://test")
+package helloworld;
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..c7797931d2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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:hw="http://helloworld">
+    <deployable composite="hw:helloworldws" />
+</contribution>
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/definitions.xml b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..e1b316dcc6
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/definitions.xml
@@ -0,0 +1,66 @@
+<?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://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">
+
+ <sca:intent name="transport"  
+ 			 constrains="sca:binding.ws">
+ 			 <sca:description>
+ 			 The general intent that a transport is available over which SOAP messages flow 
+ 			 </sca:description>
+ </sca:intent>
+
+ <sca:intent name="transport.jms">
+ 			 <sca:description>
+ 			 A JMS transport is required
+ 			 </sca:description>
+ </sca:intent>
+ 
+ <sca:intent name="transport.http">
+             <sca:description>
+             An HTTP transport is required
+             </sca:description>
+ </sca:intent>
+ 
+ <!-- 
+   how does the following relate to confidentiality intents 
+   does confidentiality become a profile intent?
+ -->
+ <sca:intent name="transport.https">
+             <sca:description>
+             An HTTPS transport is required
+             </sca:description>
+ </sca:intent>
+
+ <sca:policySet name="wsJMSTransportPolicy"
+ 	provides="transport.jms"
+ 	appliesTo="sca:binding.ws">
+ 	<tuscany:wsConfigParam>
+        <parameter name="TuscanyQueueConnectionFactory">
+            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+            <parameter name="java.naming.provider.url">tcp://localhost:61982</parameter>
+            <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+        </parameter>
+ 	</tuscany:wsConfigParam>
+ </sca:policySet>
+ 
+ </sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..2b5d51b71e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/helloworld.composite
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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://helloworld"
+	xmlns:hw="http://helloworld"
+    name="helloworldws">
+
+    <component name="HelloWorldServiceComponent1">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+	    <service name="HelloWorldService">
+            <binding.ws 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:51293"/>
+        </service>
+    </component>
+    
+    <component name="HelloWorldServiceComponent2">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <service name="HelloWorldService">
+            <interface.wsdl interface="http://helloworld/#wsdl.interface(HelloWorldService)" />
+            <binding.ws 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:51293"/>
+        </service>
+    </component>
+    
+    <component name="HelloWorldServiceComponent3">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <service name="HelloWorldService">
+            <binding.ws 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:51293"
+                        wsdlElement="http://helloworld/#wsdl.binding(HelloWorldJmsBinding)"/>
+        </service>
+    </component>
+   
+    <component name="HelloWorldServiceComponent4">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <service name="HelloWorldService">            
+            <binding.ws wsdlElement="http://helloworld/#wsdl.port(HelloWorldService/HelloWorldJmsPort)"/>
+        </service>
+    </component>
+    
+    <component name="HelloWorldServiceComponent5">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <service name="HelloWorldService">            
+            <binding.ws wsdlElement="http://helloworld/#wsdl.service(HelloWorldService)"/>
+        </service>
+    </component>  
+    
+    
+    <component name="HelloWorldServiceComponent10">
+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <service name="HelloWorldService">
+            <binding.ws/>
+        </service>
+    </component>    
+
+</composite>
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl
new file mode 100644
index 0000000000..c76ed7b338
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        * Licensed to the Apache Software Foundation (ASF) under one *
+        or more contributor license agreements. See the NOTICE file *
+        distributed with this work for additional information *
+        regarding copyright ownership. The ASF licenses this file * to
+        you under the Apache License, Version 2.0 (the * "License"); you
+        may not use this file except in compliance * with the License.
+        You may obtain a copy of the License at * *
+        http://www.apache.org/licenses/LICENSE-2.0 * * Unless required
+        by applicable law or agreed to in writing, * software
+        distributed under the License is distributed on an * "AS IS"
+        BASIS, WITHOUT 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="HelloWorldServiceService"
+    targetNamespace="http://helloworld/" 
+    xmlns:tns="http://helloworld/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
+    <wsdl:types>
+        <xs:schema targetNamespace="http://test" version="1.0"
+            xmlns:tns="http://test" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:complexType name="aBean">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="field1"
+                        type="xs:string" />
+                    <xs:element minOccurs="0" name="field2"
+                        type="xs:string" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType final="#all" name="aBeanArray">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded"
+                        minOccurs="0" name="item" nillable="true" type="tns:aBean" />
+                </xs:sequence>
+            </xs:complexType>
+        </xs:schema>
+        <xs:schema attributeFormDefault="qualified"
+            elementFormDefault="unqualified" targetNamespace="http://helloworld/"
+            xmlns:ns0="http://test" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:import namespace="http://test" />
+            <xs:element name="getGreetingsBean">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="ns0:aBean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetings">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="arg0"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsBeanResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsBeanArrayResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return"
+                            nillable="true" type="xs:string" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="getGreetingsBeanArray">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded"
+                            minOccurs="0" name="arg0" nillable="true"
+                            type="ns0:aBean" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="getGreetingsBean">
+        <wsdl:part name="getGreetingsBean" element="tns:getGreetingsBean">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetings">
+        <wsdl:part name="getGreetings" element="tns:getGreetings">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsBeanResponse">
+        <wsdl:part name="getGreetingsBeanResponse" element="tns:getGreetingsBeanResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsBeanArrayResponse">
+        <wsdl:part name="getGreetingsBeanArrayResponse"
+            element="tns:getGreetingsBeanArrayResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="getGreetingsBeanArray">
+        <wsdl:part name="getGreetingsBeanArray" element="tns:getGreetingsBeanArray">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="HelloWorldService">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetings">
+            </wsdl:input>
+            <wsdl:output message="tns:getGreetingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsBean">
+            <wsdl:input message="tns:getGreetingsBean">
+            </wsdl:input>
+            <wsdl:output message="tns:getGreetingsBeanResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsBeanArray">
+            <wsdl:input message="tns:getGreetingsBeanArray">
+            </wsdl:input>
+            <wsdl:output message="tns:getGreetingsBeanArrayResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="HelloWorldJmsBinding" type="tns:HelloWorldService">
+        <SOAP:binding style="document"
+            transport="http://schemas.xmlsoap.org/soap/jms" />
+        <wsdl:operation name="getGreetings">
+            <SOAP:operation soapAction="urn:getGreetings" />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsBean">
+            <SOAP:operation soapAction="urn:getGreetingsBean" />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsBeanArray">
+            <SOAP:operation soapAction="urn:getGreetingsBeanArray" />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="HelloWorldWSBinding" type="tns:HelloWorldService">
+        <SOAP:binding style="document"
+            transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="getGreetings">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsBean">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsBeanArray">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port name="HelloWorldJmsPort" binding="tns:HelloWorldJmsBinding">
+            <SOAP: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:51293" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java b/tags/java/sca/1.5.1/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
new file mode 100644
index 0000000000..fe74ef1a3d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+
+import java.io.IOException;
+
+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.Ignore;
+import org.junit.Test;
+
+/**
+ * Tests that the helloworld server is available
+ */
+public class JmsTransportTestCase{
+
+    private SCADomain scaDomain;
+    private BrokerService jmsBroker;
+
+    @Before
+	public void startServer() throws Exception {
+            startBroker();
+            scaDomain = SCADomain.newInstance("helloworld.composite");
+	}
+
+    protected void startBroker() throws Exception {
+        jmsBroker = new BrokerService(); 
+        jmsBroker.setPersistent(false);
+        jmsBroker.setUseJmx(false);
+        jmsBroker.addConnector("tcp://localhost:51293");
+        jmsBroker.start();
+    }
+    
+    //@Ignore
+    @Test
+    public void testComponent1() throws IOException {
+        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent1/HelloWorldService");
+        assertNotNull(helloWorldService);
+        
+        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
+    }
+    
+    //@Ignore
+    @Test
+    public void testComponent2() throws IOException {
+        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent2/HelloWorldService");
+        assertNotNull(helloWorldService);
+        
+        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
+    }  
+    
+    @Ignore
+    @Test
+    public void testComponent3() throws IOException {
+        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent3/HelloWorldService");
+        assertNotNull(helloWorldService);
+        
+        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
+    }    
+    
+    @Ignore
+    @Test
+    public void testComponent4() throws IOException {
+        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent4/HelloWorldService");
+        assertNotNull(helloWorldService);
+        
+        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
+    }    
+    
+    @Ignore
+    @Test
+    public void testComponent5() throws IOException {
+        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent5/HelloWorldService");
+        assertNotNull(helloWorldService);
+        
+        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
+    }
+       
+    @Ignore
+    @Test
+    public void testWaitForInput() {
+        System.out.println("Press a key to end");
+        try {
+            System.in.read();
+        } catch (Exception ex) {
+        }
+        System.out.println("Shutting down");
+    }      
+
+	@After
+	public void stopServer() throws Exception {
+            if (scaDomain != null) {
+                scaDomain.close();
+            }
+            if (jmsBroker != null) {
+                jmsBroker.stop();
+            }
+	}
+
+}
diff --git a/tags/java/sca/1.5.1/itest/wsdlless/pom.xml b/tags/java/sca/1.5.1/itest/wsdlless/pom.xml
new file mode 100644
index 0000000000..aaadbcdde5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/pom.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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.5.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-wsdlless</artifactId>
+    <name>Apache Tuscany SCA iTest WSDLless Support</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.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</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.1</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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
new file mode 100644
index 0000000000..5886ebc6ff
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
new file mode 100644
index 0000000000..df658428fd
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
new file mode 100644
index 0000000000..d39df8c00e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
new file mode 100644
index 0000000000..d4a06780c3
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
new file mode 100644
index 0000000000..6dc46c60b5
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
new file mode 100644
index 0000000000..8471000152
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
new file mode 100644
index 0000000000..859c61a724
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
new file mode 100644
index 0000000000..e747eb041f
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..ca7c25f3fa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..8b234599aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
new file mode 100644
index 0000000000..03984f7252
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
new file mode 100644
index 0000000000..45bb697437
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
new file mode 100644
index 0000000000..9342c8e6ee
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
new file mode 100644
index 0000000000..6c5ac96b67
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
new file mode 100644
index 0000000000..ebaf33f568
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdlless/src/main/java/service/AnObject.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/AnObject.java
new file mode 100644
index 0000000000..65ba52f356
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/AnObject.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/MoreComplexObject.java
new file mode 100644
index 0000000000..69eba6701d
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/MoreComplexObject.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/service/SomeService.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/SomeService.java
new file mode 100644
index 0000000000..f6aaacb23a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/SomeService.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
new file mode 100644
index 0000000000..39a2131024
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
new file mode 100644
index 0000000000..16d3806318
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wsdlless/src/main/resources/WSDLTest.composite b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/WSDLTest.composite
new file mode 100644
index 0000000000..e69cdbc282
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/WSDLTest.composite
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wsdlless/src/main/resources/some.composite b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/some.composite
new file mode 100644
index 0000000000..1b099239d1
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/some.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 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.5.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
new file mode 100644
index 0000000000..73f9ed4bfc
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
new file mode 100644
index 0000000000..bc6fe0e89a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	* Licensed to the Apache Software Foundation (ASF) under one
+	* or more contributor license agreements.  See the NOTICE file
+	* distributed with this work for additional information
+	* regarding copyright ownership.  The ASF licenses this file
+	* to you under the Apache License, Version 2.0 (the
+	* "License"); you may not use this file except in compliance
+	* with the License.  You may obtain a copy of the License at
+	* 
+	*   http://www.apache.org/licenses/LICENSE-2.0
+	* 
+	* Unless required by applicable law or agreed to in writing,
+	* software distributed under the License is distributed on an
+	* "AS IS" BASIS, WITHOUT 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.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
new file mode 100644
index 0000000000..33f541b21b
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
new file mode 100644
index 0000000000..82bf7ce650
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, 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.5.1/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
new file mode 100644
index 0000000000..95603ad0be
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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;
+
+/**
+ *
+ */
+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.5.1/itest/wsdlless/src/test/java/service/generated/AnObject.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/AnObject.java
new file mode 100644
index 0000000000..effeb3c701
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/AnObject.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
new file mode 100644
index 0000000000..284e961788
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
new file mode 100644
index 0000000000..4113aa1a0a
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
new file mode 100644
index 0000000000..532b948b47
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
new file mode 100644
index 0000000000..82bfb2d2aa
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
new file mode 100644
index 0000000000..61c7c6cb19
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
new file mode 100644
index 0000000000..1ba0c497d9
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/SomeService.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/SomeService.java
new file mode 100644
index 0000000000..4a584a8da2
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/SomeService.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
new file mode 100644
index 0000000000..44c2b67256
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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.5.1/itest/wsdlless/src/test/java/service/generated/package-info.java b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/package-info.java
new file mode 100644
index 0000000000..d7b3fef82e
--- /dev/null
+++ b/tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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;
+