Remove stest as its not part of build

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

48 files changed, 0 insertions, 2707 deletions

diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
deleted file mode 100644
index 54aaca8b6a..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import test.TestInvocation;
-
-
-/**
- * ASM_0002_TestCase
- */
-public class ASM_0002_TestCase extends BaseTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0002";
-    	config.input 			= "request";
-    	config.output 			= config.testName + " " + config.input + " service1 operation1 invoked";
-    	config.composite 		= "Test_ASM_0002.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0002
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java
deleted file mode 100644
index 930200009e..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0003_Client;
-import testClient.TestInvocation;
-
-/**
- * A generic test client based on Tuscany APIs
- */
-public class ASM_0003_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0003";
-    	config.input 			= "request";
-    	config.output 			= config.testName + " " + config.input + " service1 operation1 invoked" +
-    							  "service2 operation1 invoked" + "service3 operation1 invoked";
-    	config.composite 		= "Test_ASM_0003.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0003_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java
deleted file mode 100644
index cafa6d25c3..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * A generic test client based on Tuscany APIs
- */
-public class ASM_0004_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0004";
-    	config.input 			= "request";
-    	config.output 			= "org.osoa.sca.ServiceRuntimeException: Too many targets on reference: reference1";
-    	config.composite 		= "Test_ASM_0004.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0004
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
deleted file mode 100644
index e77a9b13f0..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0005_TestCase, which checks that a component with multiple <service/>
- * elements with the same @name attribute is an error
- */
-public class ASM_0005_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0005";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0005.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
deleted file mode 100644
index 822fba7d78..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0006_TestCase, which checks that the @name attribute of a <service/>
- * element of a <component/> matches the @name attribute of a <service/> element of the
- * componentType of the <implementation/> used by the <component/>
- */
-public class ASM_0006_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0006";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0006.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java
deleted file mode 100644
index 220dfc992d..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0007_TestCase, which tests that the @name attribute of a <reference/> 
- * element of a component is not equal to the @name attribute of any other <reference/> 
- * element of the same component
- */
-public class ASM_0007_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0007";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0007.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java
deleted file mode 100644
index 4df69020a0..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0008_TestCase, which Tests that the @name attribute of a 
- * <reference/> element of a component is equal to the @name attribute of a 
- * <reference/> element of the <componentType/> of the <implementation/> of 
- * the <component/>
- */
-public class ASM_0008_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0008";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0008.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java
deleted file mode 100644
index 2bbcc04465..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0009_TestCase, which tests that the @name attribute of a 
- * <component/> element in a <composite/> is not the same as the @name 
- * attribute of a second component in the same <composite/>
- */
-public class ASM_0009_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0009";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0009.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java
deleted file mode 100644
index 274c39347f..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0009_TestCase, which tests that the interface specified 
- * by the <interface/> child element of a <service/> element is a compatible 
- * subset of the interface declared for the <service/> element with the 
- * same @name attribute in the <componentType/> of the <implementation/> 
- * of the <component/> parent of the <service/>
- */
-public class ASM_0010_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0010";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0010.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java
deleted file mode 100644
index 7a503fb459..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0011_TestCase, which tests that the the multiplicity 
- * of a <reference/> element of a <component/> can be 1..1 where the 
- * multiplicity of the equivalent <reference/> element in the 
- * <componentType/> of the <implementation/> of the <component/> is 1..n
- */
-public class ASM_0011_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0011";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0011 request service1 operation1 invoked service2 operation1 invoked";
-    	config.composite 		= "Test_ASM_0011.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java
deleted file mode 100644
index 228d1810e0..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0012_TestCase, which tests that the the multiplicity 
- * of a <reference/> element of a <component/> can be any one of 0..1, 
- * 1..1, 0..n, 1..n where the multiplicity of the equivalent <reference/> 
- * element in the <componentType/> of the <implementation/> of the 
- * <component/> is 0..n
- */
-public class ASM_0012_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0012";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0012 request service1 operation1 invoked service2 operation1 invoked" +
-    	                          " service3 operation1 invoked service4 operation1 invoked service5 operation1 invoked";
-    	config.composite 		= "Test_ASM_0012.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java
deleted file mode 100644
index a02ca18184..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0013_TestCase, which tests that the the multiplicity 
- * of a <reference/> element of a <component/> is 1..1 where the 
- * multiplicity of the equivalent <reference/> element in the 
- * <componentType/> of the <implementation/> of the <component/> is 1..1
- */
-public class ASM_0013_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0013";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0013 request service1 operation1 invoked service2 operation1 invoked";
-    	config.composite 		= "Test_ASM_0013.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java
deleted file mode 100644
index c4960925f9..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0014_TestCase, which tests that the multiplicity of a 
- * <reference/> element of a <component/>  is 0..n where the multiplicity 
- * of the equivalent <reference/> element in the <componentType/> of the 
- * <implementation/> of the <component/> is 1..1
- */
-public class ASM_0014_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0014";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0014.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java
deleted file mode 100644
index c9c7c2ba1c..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0015_TestCase, which tests that the the multiplicity 
- * of a <reference/> element of a <component/> is 1..1 where the 
- * multiplicity of the equivalent <reference/> element in the 
- * <componentType/> of the <implementation/> of the <component/> is 0..1
- */
-public class ASM_0015_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0015";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0015 request service1 operation1 invoked service2 operation1 invoked";
-    	config.composite 		= "Test_ASM_0015.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java
deleted file mode 100644
index e9817a069b..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0016_TestCase, which tests that the interface declared 
- * by the <interface/> child element of a <reference/> of a <component/> 
- * is a compatible superset of the interface declared on the corresponding 
- * <reference/> of the componentType of the <implementation/> of the <component/> 
- */
-public class ASM_0016_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0016";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0016 request service1 operation1 invoked service2 operation1 invoked";
-    	config.composite 		= "Test_ASM_0016.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java
deleted file mode 100644
index 735a9bfc38..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0017_TestCase, which tests that where a <reference/> 
- * of a <component/> has no <binding/> child element, but the 
- * corresponding <reference/> element in the componentType does have 
- * a binding child element, the <binding/> from the componentType is 
- * used for the reference 
- */
-public class ASM_0017_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0017";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0017 request service1 operation1 invoked service2 operation1 invoked";
-    	config.composite 		= "Test_ASM_0017.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java
deleted file mode 100644
index ab872f09a6..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Line 1379-1381:
- * <p>
- * OSOA:
- * Note that a binding element may specify an endpoint which is the target of
- * that binding. A reference must not mix the use of endpoints specified via 
- * binding elements with target endpoints specified via the target attribute.
- * <p>
- * [ASM50015] 
- * <p>
- * OASIS:
- * If a binding element has a value specified for a target service using 
- * its @uri attribute, * the binding element MUST NOT identify target 
- * services using binding specific attributes or elements.
- *
- * Client for ASM_0018_TestCase, which tests that where a <reference/> 
- * of a <component/> has a <binding/> child element and the 
- * corresponding <reference/> element in the componentType has 
- * a binding child element, the <binding/> from the <reference/> is 
- * used for the reference 
- */
-public class ASM_0018_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0018";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0018 request service1 operation1 invoked service3 operation1 invoked";
-    	config.composite 		= "Test_ASM_0018.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class ASM_0018_TestCase
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java
deleted file mode 100644
index c1cc0d6b0f..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0018_TestCase, which tests that where a <reference/> 
- * of a <component/> has @autowire=”true” and also has @target identifying 
- * a single target service that the reference is wired only to the single 
- * service identified by the @target attribute 
- */
-public class ASM_0019_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0019";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0019 request service1 operation1 invoked service3 operation1 invoked";
-    	config.composite 		= "Test_ASM_0019.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java
deleted file mode 100644
index 12dce46975..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0020_TestCase, which tests that where a <reference/> 
- * of a <component/> has @autowire=true and where there is also a single 
- * <wire/> element which as that <reference/> as its source that the 
- * reference is wired only to the single service identified by the 
- * <wire/> element  
- */
-public class ASM_0020_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0020";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0020 request service1 operation1 invoked service3 operation1 invoked";
-    	config.composite 		= "Test_ASM_0020.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java
deleted file mode 100644
index 286e21b1d4..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0021_TestCase, which tests that where a <reference/> 
- * of a <component/> has @autowire=true and where the <reference/> has 
- * a <binding/> child element which declares a single target service,  
- * the reference is wired only to the single service identified by the 
- * <wire/> element   
- */
-public class ASM_0021_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0021";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0021 request service1 operation1 invoked service3 operation1 invoked";
-    	config.composite 		= "Test_ASM_0021.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java
deleted file mode 100644
index a39b674b97..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0022_TestCase, which tests that where a <component/> 
- * <reference/> with multiplicity=0..1 is unwired (by any means) that 
- * the component executes correctly   
- */
-public class ASM_0022_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0022";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0022 request service1 operation1 invoked";
-    	config.composite 		= "Test_ASM_0022.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java
deleted file mode 100644
index 172cb74554..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0021_TestCase, which tests that where a <component/> 
- * <reference/> with multiplicity=1..1 is wired to a component service 
- * in the same composite and is also promoted by a <composite/> <reference/> 
- * which is wired to a target service by a component using the <composite/> 
- * as its implementation, that this is an error   
- */
-public class ASM_0023_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0023";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0023.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
deleted file mode 100644
index 6f224a8951..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0024_TestCase, which tests that where a <component/> 
- * <reference/> has @target set to some service, that the reference 
- * can have no child <binding/> elements   
- */
-public class ASM_0024_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA 
-	 * Line 1379~1381
-	 * Note that a binding element may specify an endpoint which is the target of that binding. A 
-	 * reference must not mix the use of endpoints specified via binding elements with target endpoints
-	 * specified via the target attribute.
-	 * <p>
-	 * OASIS
-	 * ASM50026
-	 * If a reference has a value specified for one or more target services in its @target attribute, 
-	 * there MUST NOT be any child <binding/> elements declared for that reference.
-	 * <p>
-	 * Jira issue:
-	 * https://issues.apache.org/jira/browse/TUSCANY-2920
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0024";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0024.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
deleted file mode 100644
index 9d79b3b472..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0025_TestCase, which tests that where a <component/> 
- * <property/> has its value set by means of a child <value/> element, 
- * that the type of the <value/> element matches the type declared for 
- * the <property/> element   
- */
-public class ASM_0025_TestCase extends BaseJAXWSTestCase {
-
-    public static void main(String[] args) throws Exception {
-        ASM_0025_TestCase test = new ASM_0025_TestCase(); 
-        test.setUp();
-        test.tearDown();
-    }
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * No @value subelement in OSOA specification
-	 * <p>
-	 * OASIS
-	 * <p>
-	 * ASM50028
-	 * If the value subelement of a component property is specified, 
-	 * the type of the property MUST be an XML Schema simple type or an 
-	 * XML schema complex type
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0025";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0025 request service1 operation1 invokedcomplex1complex2";
-    	config.composite 		= "Test_ASM_0025.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java
deleted file mode 100644
index 5cb2ed5241..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0026_TestCase, which tests that where a <component/> <property/> 
- * has its value set by means of a child element that is NOT a <value/> element, 
- * that a) the type of the <property/> element is declared as an XML Schema global 
- * element by its @element attribute and b) that the child element is an instance 
- * of that global element 
- */
-public class ASM_0026_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA Line 1113~1118
-	 * The property element may contain an optional default-property-value, which provides default
-	 * value for the property. The default value must match the type declared for the property
-	 *  1) a string, if type is a simple type (must match the type declared)
-	 *  2) a complex type value matching the type declared by type
-	 *  3) an element matching the element named by element
-	 *  4) multiple values are permitted if many="true" is specified 
-	 * <p>
-	 * OASIS 
-	 * <p>
-	 * ASM50029
-	 * If a component property value is declared using a child element of the <property/>
-	 * element, the type of the property MUST be an XML Schema global element and the
-	 * declared child element MUST be an instance of that global element
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0026";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0026 request service1 operation1 invokedcomplex1complex2";
-    	config.composite 		= "Test_ASM_0026.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java
deleted file mode 100644
index 86d8f51288..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0027_TestCase, which tests that where a <component/> has 
- * 2 or more <property/> child elements that each <property/> element has a 
- * unique @name attribute value
- */
-public class ASM_0027_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * No corresponding declaration for this feature.
-	 * <p>
-	 * OASIS
-	 * <p>
-	 * ASM50030
-	 * A <component/> element MUST NOT contain two <property/> subelements with the
-	 * same value of the @name attribute.
-	 * <p>
-	 * Jira issue:
-	 * https://issues.apache.org/jira/browse/TUSCANY-2863
-	 * 
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0027";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0027.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0027
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java
deleted file mode 100644
index e91ee2c7f3..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0028_TestCase, which tests a <component/> <property/> @name 
- * attribute matches the @name attribute of one of the <property/> elements of 
- * the <componentType/> of the <implementation/> of the <component/> 
- */
-public class ASM_0028_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * No corresponding statements for this feature.
-	 * <p>
-	 * OASIS
-	 * <p>
-	 * ASM50031
-	 * The name attribute of a component property MUST match the name of a property
-	 * element in the component type of the component implementation.
-	 * <p>
-	 * Jira issue:
-	 * https://issues.apache.org/jira/browse/TUSCANY-2901
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0028";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0028.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0028
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java
deleted file mode 100644
index eae5a2f978..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0029_TestCase, which tests that where a <component/> <property/> 
- * has @many=false that there is only one <value/> child element of the <property/> 
- */
-public class ASM_0029_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA Line 1104~1106
-	 * <p>
-	 * many (optional) - whether the property is single-valued (false) or multi-valued (true).
-	 * The default is false. In the case of a multi-valued property, it is presented to the
-	 * implementation as a Collection of property values.
-	 * <p>
-	 * OASIS
-	 * <p>
-	 * ASM50032
-	 * If a property is single-valued, the <value/> subelement MUST NOT occur more than once.
-	 * <p>
-	 * OSOA didn't explicitly say "MUST NOT occur more than once".
-	 * <p>
-	 * Jira issue:
-	 * https://issues.apache.org/jira/browse/TUSCANY-2902
-	 *   
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0029";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0029.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0029
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java
deleted file mode 100644
index 197f9acd72..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0030_TestCase, which tests that a <component/> <property/> 
- * with a @value attribute set does not have any <value/> child elements 
- */
-public class ASM_0030_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * No @value attribute for the property in OSOA spec.
-	 * So this TestCase is not valid.
-	 * <p>
-	 * OASIS
-	 * <p>
-	 * ASM50033
-	 * A property <value/> subelement MUST NOT be used when the @value attribute 
-	 * is used to specify the value for that property.
-	 * 
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0030";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0030.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0030
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java
deleted file mode 100644
index 5f5d68fb81..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0031_TestCase, which tests that where a <component/> <reference/> 
- * has its @target attribute set  to a valid service and the <composite/> also 
- * contains a <wire/> element with @source set to the <component/> <reference/> 
- * and @target set to a second valid service and has @replace=true, the <reference/> 
- * is wired to the second service only
- */
-public class ASM_0031_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * No @replace in OSOA specification currently.
-	 * <p>
-	 * OASIS
-	 * <p>
-	 * ASM50034
-	 * If any <wire/> element with its @replace attribute set to "true" has 
-	 * a particular reference specified in its @source attribute, 
-	 * the value of the @target attribute for that reference MUST be ignored 
-	 * and MUST NOT be used to define target services for that reference.
-	 * <p>
-	 * Jira issue: 
-	 * https://issues.apache.org/jira/browse/TUSCANY-2903
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0031";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0031 request service1 operation1 invoked service3 operation1 invoked";
-    	config.composite 		= "Test_ASM_0031.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0031
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0039_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0039_TestCase.java
deleted file mode 100644
index 5f7ef37f61..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0039_TestCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * 
- */
-public class ASM_0039_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * No corresponding statements in OSOA specification.
-	 * <p>
-	 * OASIS
-	 * ASM50023
-	 * Some reference multiplicity errors can be detected at deployment time,
-	 * where the rules defined in ASM50018, ASM50019, ASM50020, ASM50021 are violated.
-	 * In these cases, an error SHOULD be generated by the SCA runtime at deployment time.
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0039";
-    	config.input 			= "request";
-    	config.output 			= "ASM_0039 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked";
-    	config.composite 		= "Test_ASM_0039.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0039
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0040_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0040_TestCase.java
deleted file mode 100644
index 388508c209..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0040_TestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * For the cases where it is valid for the reference to have no target service specified, 
- * the component implementation language specification needs to define the programming model 
- * for interacting with an untargetted reference.
- * So the SCA runtime should throw an exception if it is using an untargetted reference.
- */
-public class ASM_0040_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * No corresponding statements in OSOA specification.
-	 * <p>
-	 * OASIS
-	 * ASM50024
-	 * Some reference multiplicity errors can only be checked at runtime, 
-	 * where the rules defined in ASM50018, ASM50019, ASM50020, ASM50021 are violated.
-	 * In these cases, the SCA runtime MUST generate an error no later than when the reference is
-	 * invoked by the component implementation.
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0040";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0040.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0040
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0041_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0041_TestCase.java
deleted file mode 100644
index 441cc61734..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0041_TestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- *test if @wiredByImpl="true", <reference/> element has no <binding/> child elements.
- */
-public class ASM_0041_TestCase extends BaseJAXWSTestCase {
-
- 	/**
-	 * <p>
-	 * OSOA
-	 * Line 220~221
-	 * If "true" is set, then the reference should not be wired 
-	 * statically within a composite, but left unwired.
-	 * <p>
-	 * OASIS
-	 * ASM50013
-	 * If @wiredByImpl="true", 
-	 * other methods of specifying the target service MUST NOT be used.
-	 * <p>
-	 * Jira issue:
-	 * https://issues.apache.org/jira/browse/TUSCANY-2913
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0041";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0041.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0041
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0042_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0042_TestCase.java
deleted file mode 100644
index 1ae44dd554..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0042_TestCase.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-import org.junit.Test;
-
-
-/**
- * test if @wiredByImpl="true", 
- * No <wire/> elements have the <reference/> element declared as the @source for the wire.
- */
-// @Ignore("TUSCANY-2925")
-public class ASM_0042_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA
-	 * Line 220~221
-	 * If "true" is set, then the reference should not be wired 
-	 * statically within a composite, but left unwired.
-	 * <p>
-	 * OASIS
-	 * ASM50013
-	 * If @wiredByImpl="true", 
-	 * other methods of specifying the target service MUST NOT be used.
-	 * <p>
-	 * Jira issue:
-	 * https://issues.apache.org/jira/browse/TUSCANY-2913
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0042";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0042.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0042
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0043_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0043_TestCase.java
deleted file mode 100644
index a554fa1ee6..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_0043_TestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0002_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0043_TestCase, it tests @uri and subelement of <binding> can't coexist,
- * and some binding can use specific subelements more than a simple URI. 
- * 
- */
-public class ASM_0043_TestCase extends BaseJAXWSTestCase {
-
- 
-	/**
-	 * <p>
-	 * OSOA 
-	 * <p>
-	 * OASIS
-	 * ASM50016
-	 * It is possible that a particular binding type MAY require that the address of a target service 
-	 * uses more than a simple URI. In cases where a reference element has a binding subelement of such a type, 
-	 * the @uri attribute of the binding element MUST NOT be used to identify the target service -
-	 * instead, binding specific attributes and/or child elements MUST be used.
-	 * <p>
-	 * Jira issue:
-	 * https://issues.apache.org/jira/browse/TUSCANY-2921
-	 */
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0043";
-    	config.input 			= "request";
-    	config.output 			= "exception";
-    	config.composite 		= "Test_ASM_0043.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0002_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0043
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_6030_TestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_6030_TestCase.java
deleted file mode 100644
index 2eb2feb5bc..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/ASM_6030_TestCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-
-import test.ASM_0003_Client;
-import testClient.TestInvocation;
-
-/**
- * Client for ASM_0021_TestCase, which tests that where a <component/> 
- * <reference/> with multiplicity=1..1 is wired to a component service 
- * in the same composite and is also promoted by a <composite/> <reference/> 
- * which is wired to a target service by a component using the <composite/> 
- * as its implementation, that this is an error   
- */
-public class ASM_6030_TestCase extends BaseJAXWSTestCase {
-
- 
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_6030";
-    	config.input 			= "request";
-    	config.output 			=  config.testName + " " + config.input +" service1 operation1 invoked";
-    	config.composite 		= "Test_ASM_6030.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0003_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class Test_ASM_0003
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
deleted file mode 100644
index 1904c02359..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-import static org.junit.Assert.*;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-//import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
-//import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
-//import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.xml.ws.Service;
-import javax.xml.namespace.QName;
-
-import test.ASM_0001_Client;
-import testClient.TestInvocation;
-import testClient.TestException_Exception;
-import testClient.TestException;
-
-/**
- * A generic test client based on JAX-WS APIs
- */
-public class BaseJAXWSTestCase extends BaseTestCase {
-
-    
-    public static void main(String[] args) throws Exception {
-    	BaseJAXWSTestCase test = new BaseJAXWSTestCase(); 
-    	test.setUp();
-    	test.tearDown();
-    }
-    
-    public String invokeTest( String input ) throws Exception {
-    	//Web service invocation via JAXWS
-    	QName serviceName = new QName("http://test/", "TestInvocationService");
-    	URL wsdlLocation = this.getClass().getClassLoader().getResource("TestClient.wsdl");
-    	javax.xml.ws.Service webService = Service.create( wsdlLocation, serviceName );
-    	TestInvocation wsProxy = (TestInvocation) webService.getPort(testConfiguration.getServiceInterface());
-
-    	String output = wsProxy.invokeTest(input);
-
-    	return output;
-    } // end method invokeTest
-   
-    
-} // end class BaseTest
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/BaseTestCase.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/BaseTestCase.java
deleted file mode 100644
index e39a8bf7e9..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/BaseTestCase.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-import static org.junit.Assert.*;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-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.launcher.Contribution;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import test.ASM_0001_Client;
-import test.TestInvocation;
-import testClient.TestException;
-import testClient.TestException_Exception;
-
-/**
- * A generic test client based on Tuscany APIs
- */
-public class BaseTestCase {
-
-    protected NodeLauncher launcher;
-    protected SCANode node;
-    protected TestConfiguration testConfiguration = getTestConfiguration();
-    protected static boolean proceed = true;
-    
-    public static void main(String[] args) throws Exception {
-    	BaseTestCase test = new BaseTestCase(); 
-    	test.setUp();
-    	test.tearDown();
-    }
-    
-    @Before
-    public void setUp() throws Exception {	
-        try {
-            startContribution();
-        } catch (Exception e) {
-            // If the SCA runtime refuses to start an invalid contribution, then this is also
-            // regarded as a successful outcome
-            System.out.println( "Exception received - detail: " + e.getMessage() );
-            if (e.getCause() instanceof InvocationTargetException){
-                assertEquals( testConfiguration.getExpectedOutput(), ((InvocationTargetException)e.getCause()).getCause().getMessage() );
-            } else {
-                assertEquals( testConfiguration.getExpectedOutput(), "exception" );
-            }
-            System.out.println("Test " + testConfiguration.getTestName() + " completed successfully");
-            // Mark this test as not to proceed further
-            proceed = false;
-        } // end try
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    	stopContribution();
-    }
-
-    @Test
-    public void testDummy() throws Exception {
-        // If an exception were thrown during initialization, let's go no further
-        if( proceed == false ) return;
-        
-        // System.out.println("Test " + testName + " starting");
-        String output = null;
-        try {
-            // Just requires input to proceed
-            // System.in.read();
-            //
-            output = invokeTest( testConfiguration.getInput() );
-
-        } catch ( TestException_Exception e ) {
-            TestException exceptionContent = e.getFaultInfo();
-            System.out.println("Service fault received - detail: " + exceptionContent.getMessage() );
-            assertEquals( testConfiguration.getExpectedOutput(), "exception" );
-        } catch (Throwable e) {
-            e.printStackTrace();
-            System.out.println( "Exception received - detail: " + e.getMessage() );
-            assertEquals( testConfiguration.getExpectedOutput(), "exception" );
-        }
-        assertEquals( testConfiguration.getExpectedOutput(), output );
-        System.out.println("Test " + testConfiguration.getTestName() + " completed successfully");
-    }
-    
-    public String invokeTest( String input ) throws Exception {
-
-    	TestInvocation service = (TestInvocation) getService( testConfiguration.getServiceInterface(), 
-    														  testConfiguration.getTestServiceName() );    	
-    	
-    	return service.invokeTest( input );
-    } // end method invokeTest
-    
-    protected <T> T getService( Class<T> interfaze, String serviceName ) {
-    	T service = ((SCAClient)node).getService( interfaze, serviceName );
-    	return service;
-    } // end getService
-    
-    protected void startContribution() throws Exception {
-    	// Tuscany specific code which starts the contribution holding the test
-        launcher = NodeLauncher.newInstance();
-        node = launcher.createNode(testConfiguration.getComposite(), 
-        		                   new Contribution(testConfiguration.getTestName(), getContributionURI()));
-        System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
-        node.start();
-    } // end method startContribution
-    
-    protected void stopContribution() throws Exception {
-        if (node != null) {
-            node.stop();
-        }
-
-    } // end method stopContribution
-    
-    protected String getContributionURI() {
-    	String location = getContributionLocation(testConfiguration.getTestClass());
-    	return location;
-    }
-    
-    public static String getContributionLocation(final Class<?> anchorClass) {
-        URL url = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-            public URL run() {
-                return anchorClass.getProtectionDomain().getCodeSource().getLocation();
-            }
-        });
-        String uri = url.toString();
-        return uri;
-    }       
-    
-    protected TestConfiguration getTestConfiguration() {
-    	TestConfiguration config = new TestConfiguration();
-    	config.testName 		= "ASM_0001";
-    	config.input 			= "request";
-    	config.output 			= config.testName + " " + config.input + " invoked ok";
-    	config.composite 		= "Test_ASM_0101.composite";
-    	config.testServiceName 	= "TestClient";
-    	config.testClass 		= ASM_0001_Client.class;
-    	config.serviceInterface = TestInvocation.class;
-    	return config;
-    }
-    
-} // end class BaseTest
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/TestConfiguration.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/TestConfiguration.java
deleted file mode 100644
index 6a2873b459..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/client/TestConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package client;
-
-/** 
- * A class to hold the metadata about the test
- * @author MikeEdwards
- *
- */
-class TestConfiguration {
-	
-	public String testName;
-	public String input;
-	public String output;
-	public String composite;
-	public String testServiceName;
-	public Class<?> testClass;		//TODO - does the client need this??
-	public Class<?> serviceInterface;
-
-	public TestConfiguration() { }
-	
-	public String getTestName() { return testName; }
-	public String getInput() { return input; }
-	public String getExpectedOutput() { return output; }
-	public String getComposite() { return composite; }
-	public String getTestServiceName() { return testServiceName; }
-	public Class<?> getTestClass() { return testClass; }
-	public Class<?> getServiceInterface() { return serviceInterface; }
-}
\ No newline at end of file
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/InvokeTest.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/InvokeTest.java
deleted file mode 100644
index 00c8e562f8..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/InvokeTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package testClient;
-
-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 = "invokeTest")
-public class InvokeTest {
-
-    @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/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
deleted file mode 100644
index 6b2fe7a950..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package testClient;
-
-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="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "_return"
-})
-@XmlRootElement(name = "invokeTestResponse")
-public class InvokeTestResponse {
-
-    @XmlElementRef(name = "return", type = JAXBElement.class)
-    protected JAXBElement<String> _return;
-
-    /**
-     * Gets the value of the return property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link String }{@code >}
-     *     
-     */
-    public JAXBElement<String> getReturn() {
-        return _return;
-    }
-
-    /**
-     * Sets the value of the return property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link String }{@code >}
-     *     
-     */
-    public void setReturn(JAXBElement<String> value) {
-        this._return = ((JAXBElement<String> ) value);
-    }
-
-}
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/ObjectFactory.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
deleted file mode 100644
index 4bde638058..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package testClient;
-
-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 testClient 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 _TestException_QNAME = new QName("http://test/", "TestException");
-    private final static QName _InvokeTestArg0_QNAME = new QName("", "arg0");
-    private final static QName _InvokeTestResponseReturn_QNAME = new QName("", "return");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: testClient
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link InvokeTest }
-     * 
-     */
-    public InvokeTest createInvokeTest() {
-        return new InvokeTest();
-    }
-
-    /**
-     * Create an instance of {@link InvokeTestResponse }
-     * 
-     */
-    public InvokeTestResponse createInvokeTestResponse() {
-        return new InvokeTestResponse();
-    }
-
-    /**
-     * Create an instance of {@link TestException }
-     * 
-     */
-    public TestException createTestException() {
-        return new TestException();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TestException }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://test/", name = "TestException")
-    public JAXBElement<TestException> createTestException(TestException value) {
-        return new JAXBElement<TestException>(_TestException_QNAME, TestException.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "arg0", scope = InvokeTest.class)
-    public JAXBElement<String> createInvokeTestArg0(String value) {
-        return new JAXBElement<String>(_InvokeTestArg0_QNAME, String.class, InvokeTest.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "return", scope = InvokeTestResponse.class)
-    public JAXBElement<String> createInvokeTestResponseReturn(String value) {
-        return new JAXBElement<String>(_InvokeTestResponseReturn_QNAME, String.class, InvokeTestResponse.class, value);
-    }
-
-}
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/README.txt b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/README.txt
deleted file mode 100644
index bdb326df2a..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/README.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-This README describes the JAX-WS client files for the SCA Assembly test invocation interface.
-
-The test invocation interface is in the TestInvocation.java interface file.
-This is presented as a Web service by the SCA runtime, for invocation by a general Web service client.
-The WSDL is captured in the file TestClient.wsdl in the resources directory for the testcases.
-
-The JAX-WS client files for invoking the Web service contained in TestClient.wsdl are contained in this
-package.  They are generated from the WSDL using the wsimport tool (a standard part of JDK 1.6.x):
-
-wsimport TestClient.wsdl -keep -p testClient
-
-"-keep" is used to ensure that the generated .java files are retained (otherwise all that is created are 
-the binary .class files).
-
-"-p testClient" is used to force the generated Java files to belong to the package "testClient" - this package
-name is used to keep a clean separation between the client files and the test service files
-
-
-Mike Edwards, 6th January 2009.
\ No newline at end of file
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestException.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestException.java
deleted file mode 100644
index 10272ec66d..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestException.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package testClient;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TestException complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TestException">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TestException", propOrder = {
-    "message"
-})
-public class TestException {
-
-    protected String message;
-
-    /**
-     * Gets the value of the message property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Sets the value of the message property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMessage(String value) {
-        this.message = value;
-    }
-
-}
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestException_Exception.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
deleted file mode 100644
index 949d1ec7c7..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package testClient;
-
-import javax.xml.ws.WebFault;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- * 
- */
-@WebFault(name = "TestException", targetNamespace = "http://test/")
-public class TestException_Exception
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private TestException faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public TestException_Exception(String message, TestException faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public TestException_Exception(String message, TestException faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * 
-     * @return
-     *     returns fault bean: testClient.TestException
-     */
-    public TestException getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestInvocation.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestInvocation.java
deleted file mode 100644
index 783924d493..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestInvocation.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package testClient;
-
-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 = "TestInvocation", targetNamespace = "http://test/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface TestInvocation {
-
-
-    /**
-     * 
-     * @param arg0
-     * @return
-     *     returns java.lang.String
-     * @throws TestException_Exception
-     */
-    @WebMethod
-    @WebResult(targetNamespace = "")
-    @RequestWrapper(localName = "invokeTest", targetNamespace = "http://test/", className = "testClient.InvokeTest")
-    @ResponseWrapper(localName = "invokeTestResponse", targetNamespace = "http://test/", className = "testClient.InvokeTestResponse")
-    public String invokeTest(
-        @WebParam(name = "arg0", targetNamespace = "")
-        String arg0)
-        throws TestException_Exception
-    ;
-
-}
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestInvocationService.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
deleted file mode 100644
index 6c7271e017..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package testClient;
-
-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 = "TestInvocationService", targetNamespace = "http://test/", wsdlLocation = "file:/C:/temp/Tuscany_2_0_Work/TestClient.wsdl")
-public class TestInvocationService
-    extends Service
-{
-
-    private final static URL TESTINVOCATIONSERVICE_WSDL_LOCATION;
-
-    static {
-        URL url = null;
-        try {
-            url = new URL("file:/C:/temp/Tuscany_2_0_Work/TestClient.wsdl");
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        TESTINVOCATIONSERVICE_WSDL_LOCATION = url;
-    }
-
-    public TestInvocationService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public TestInvocationService() {
-        super(TESTINVOCATIONSERVICE_WSDL_LOCATION, new QName("http://test/", "TestInvocationService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns TestInvocation
-     */
-    @WebEndpoint(name = "TestInvocationPort")
-    public TestInvocation getTestInvocationPort() {
-        return (TestInvocation)super.getPort(new QName("http://test/", "TestInvocationPort"), TestInvocation.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 TestInvocation
-     */
-    @WebEndpoint(name = "TestInvocationPort")
-    public TestInvocation getTestInvocationPort(WebServiceFeature... features) {
-        return (TestInvocation)super.getPort(new QName("http://test/", "TestInvocationPort"), TestInvocation.class, features);
-    }
-
-}
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/package-info.java b/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/package-info.java
deleted file mode 100644
index 2dde15bdeb..0000000000
--- a/branches/sca-java-1.5/stest/sampleTest/src/test/java/testClient/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://test/")
-package testClient;