Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835117 13f79535-47bb-0310-9956-ffa450edef68
author: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:05:59 +0000
committer: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:05:59 +0000
commit: 5e520b1b65c79cd828057cb628b9367acb266880 (patch)
tree: 645361ececb1a50c2fe0260beca5c1169d0e197b /branches/sca-android/itest/validation/src/test/java
parent: 00c625535fe93a57d605c8988147b77207d43fad (diff)
96 files changed, 0 insertions, 6262 deletions
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/branches/sca-android/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
deleted file mode 100644
index 9b0d51eb59..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionReadException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/ContributionReadException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/ContributionReadException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ContributionReadException", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
deleted file mode 100644
index e8476991a9..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PolicyImplValidationException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/PolicyImplValidationException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyImplValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
deleted file mode 100644
index 8ae156d63e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PolicyServiceValidationException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/PolicyServiceValidationException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyServiceValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
deleted file mode 100644
index d757ff98dd..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedBindingElement extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedBindingElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedBindingElement", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
deleted file mode 100644
index 9a231a18c7..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedImplementationElement extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedImplementationElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedImplementationElement", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
deleted file mode 100644
index 4ae88b9ba3..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedInterfaceElement extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedInterfaceElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnexpectedInterfaceElement", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
deleted file mode 100644
index ff94ad7b93..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownEJBSessionTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-        System.setProperty("java.naming.provider.url", "ejbd://localhost:8085");
-        System.setProperty("managed", "false");
-
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBSessionType/account.composite",
-                                          "TestContribution",
-                                          "src/main/resources/bindingejb/UnknownEJBSessionType/");
-        } catch (Exception ex) {
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        System.clearProperty("java.naming.factory.initial");
-        System.clearProperty("java.naming.provider.url");
-        System.clearProperty("managed");
-        //node.stop();
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-
-        assertNotNull(problem);
-        assertEquals("UnknownEJBSessionType", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
deleted file mode 100644
index a192674aeb..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownEJBVersionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception {
-    	System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-        System.setProperty("java.naming.provider.url", "ejbd://localhost:8085");
-        System.setProperty("managed", "false");
-        
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBVersion/account.composite", 
-        			"TestContribution", "src/main/resources/bindingejb/UnknownEJBVersion/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        System.clearProperty("java.naming.factory.initial");
-        System.clearProperty("java.naming.provider.url");
-        System.clearProperty("managed");
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownEJBVersion", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
deleted file mode 100644
index e0e5347d96..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessActivationSpecTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/DoesntProcessActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
deleted file mode 100644
index 9e08afec09..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessDestinationTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
deleted file mode 100644
index ed96072780..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.junit.Ignore;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessHeadersTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessHeaders/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessHeaders/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    @Ignore("TUSCANY-2532")
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-//       assertEquals("DoesntProcessHeaders", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
deleted file mode 100644
index a2a5b0b872..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResourceAdapterTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResourceAdapter/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResourceAdapter", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
deleted file mode 100644
index 64b41623de..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseActivationSpecTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite", 
-                       "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 86fbe51dad..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseConnectionFactoryTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
deleted file mode 100644
index 6e884c41cd..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseDestinationTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
deleted file mode 100644
index c237f8af18..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidCorrelationSchemeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/InvalidCorrelationScheme/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidCorrelationScheme", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
deleted file mode 100644
index 52dc7e5795..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidJMSDeliveryModeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/InvalidJMSDeliveryMode/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidJMSDeliveryMode", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
deleted file mode 100644
index a93df290c3..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidJMSPriorityTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/InvalidJMSPriority/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/InvalidJMSPriority/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidJMSPriority", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
deleted file mode 100644
index 949ec02134..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidResponseDestinationTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/InvalidResponseDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
deleted file mode 100644
index a974ef0db4..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingActivationSpecNameTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingActivationSpecName/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingActivationSpecName/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingActivationSpecName", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
deleted file mode 100644
index adbaa50dc0..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingConnectionFactoryNameTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingConnectionFactoryName/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingConnectionFactoryName", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
deleted file mode 100644
index 4bba6b74de..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingResponseActivationSpecTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingResponseActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 8f4fc1a739..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingResponseConnectionFactoryTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingResponseConnectionFactory/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
deleted file mode 100644
index d9e1c782a8..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MustStartWithSchemaTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MustStartWithSchema/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MustStartWithSchema/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustStartWithSchema", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
deleted file mode 100644
index 3e4e36d839..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedElementTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/UnexpectedElement/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/UnexpectedElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedElement", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
deleted file mode 100644
index 60ea47a85f..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedResponseElementTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/UnexpectedResponseElement/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/UnexpectedResponseElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedResponseElement", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
deleted file mode 100644
index 6a75a35f99..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownTokenInURITestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/UnknownTokenInURI/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/UnknownTokenInURI/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownTokenInURI", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
deleted file mode 100644
index c0f60a848f..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidWsdlElementAttrTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite", 
-        			"TestContribution", "src/main/resources/binding/wsxml/InvalidWsdlElementAttr/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWsdlElementAttr", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
deleted file mode 100644
index 5a74194796..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MustUseWsdlBindingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite", 
-        			"TestContribution", "src/main/resources/binding/wsxml/MustUseWsdlBinding/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustUseWsdlBinding", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
deleted file mode 100644
index 7991de7176..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlBindingDoesNotMatchTestCase extends TestCase {
-	
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
deleted file mode 100644
index 1ef5f7b00a..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlPortTypeDoesNotMatchTestCase extends TestCase {
-	
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite", 
-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("WsdlPortTypeDoesNotMatch", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
deleted file mode 100644
index a0a7d12b9f..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlServiceDoesNotMatchTestCase extends TestCase {
-	
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
deleted file mode 100644
index 555810f453..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ComponentReferenceTargetNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ComponentReferenceTargetNotFound").toURL().toString()));
-        
-        try {
-            node.start();
-        } catch (Exception ex){
-            // do nothing - the SCA binding throws and exception here 
-            // because the interface for the reference is not remotable
-        }
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ComponentReferenceTargetNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
deleted file mode 100644
index 4d70df1102..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateComponentNameTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/DuplicateComponentName/Calculator.composite", 
-                    "TestContribution", "src/main/resources/DuplicateComponentName/");
-            customDomain.buildContribution();
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentName", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
deleted file mode 100644
index 7593f39991..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationPropertyNameTestCase extends TestCase {
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateImplementationPropertyName").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
deleted file mode 100644
index 0a711175dc..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationReferenceNameTestCase extends TestCase {
-
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateImplementationReferenceName").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
deleted file mode 100644
index 10660795a7..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicatePropertyNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicatePropertyName").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
deleted file mode 100644
index 15b4b15989..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateReferenceNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateReferenceName").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
deleted file mode 100644
index 55741ec2ef..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MultipleBindingsForServiceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/MultipleBindingsForService").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("MultipleBindingsForService", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
deleted file mode 100644
index 7f8bd68e5e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoComponentImplementationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/NoComponentImplementation").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
deleted file mode 100644
index 1f26d3a7d6..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoCompositeNamespaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoCompositeNamespace/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/NoCompositeNamespace").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoCompositeNamespace", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
deleted file mode 100644
index d398efc9ea..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoMatchingBindingTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node =
-            nodeFactory.createSCANode("Calculator.composite", new SCAContribution("TestContribution", new File("src/main/resources/NoMatchingBinding")
-                .toURL().toString()));
-
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-
-        assertNotNull(problem);
-        assertEquals("NoMatchingBinding", problem.getMessageId());
-
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
deleted file mode 100644
index 9d2f028dea..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PromotedReferenceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
deleted file mode 100644
index 7f836e4b01..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PromotedServiceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedServiceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedServiceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedServiceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
deleted file mode 100644
index 04c2594cd3..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyAttributeMustSupplyNullTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyNull", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
deleted file mode 100644
index 3dabfecbb6..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyAttributeTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyIncompatible", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
deleted file mode 100644
index 0dca8ed1df..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
deleted file mode 100644
index 37f7ef352e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyOverrideManyAttributeTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyOverrideManyAttribute", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
deleted file mode 100644
index ab57283a9e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleComponentInterfaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleComponentInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleComponentInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
deleted file mode 100644
index 4c3cc3856a..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleInterfaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
deleted file mode 100644
index 06fb06f6ad..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleMultiplicityTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleMultiplicity").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleMultiplicity", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
deleted file mode 100644
index 6bacc8b05e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceNotFoundTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/ReferenceNotFound/Calculator.composite", 
-                                          "TestContribution", 
-                                          "src/main/resources/ReferenceNotFound/");
-            customDomain.buildContribution();
-        } catch (Exception ex){
-            throw ex;
-        }   
-        
-        
-        /*
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-        */
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
deleted file mode 100644
index d615857105..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceWithoutTargetsTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceWithoutTargets/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceWithoutTargets").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceWithoutTargets", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
deleted file mode 100644
index e9b920119a..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ServiceNotFoundForComponentServiceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ServiceNotFoundForComponentService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ServiceNotFoundForComponentService").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ServiceNotFoundForComponentService", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
deleted file mode 100644
index 4d950e30ff..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnresolvedComponentImplementationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/UnresolvedComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/UnresolvedComponentImplementation").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnresolvedComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/branches/sca-android/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
deleted file mode 100644
index 60b08764c1..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class XSDValidationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode node;
-    private Exception startUpException;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            node = nodeFactory.createSCANode(new File("src/main/resources/XsdValidation/Calculator.composite").toURL().toString(),
-            		                 new SCAContribution("TestContribution", 
-            		                                     new File("src/main/resources/XsdValidation").toURL().toString()));
-            node.start();
-            calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-        } catch (Exception ex){
-            startUpException = ex;
-        }        
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (node != null){
-            node.stop();
-        }
-    }
-
-
-    public void testCalculator() throws Exception {
-        
-        assertEquals("org.osoa.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage());
-   
-    }
- 
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
deleted file mode 100644
index 04135ab2cc..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package contribution.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributePackageMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/java/AttributePackageMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
deleted file mode 100644
index ab0afc6f65..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package contribution.namespace;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeNameSpaceMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/namespace/AttributeNameSpaceMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
deleted file mode 100644
index 69c4d40bc7..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package contribution.resource;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeURIMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/resource/AttributeURIMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(0);
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
deleted file mode 100644
index 32c1a8b3a8..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package contribution.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeCompositeMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/xml/AttributeCompositeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeCompositeMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/branches/sca-android/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
deleted file mode 100644
index 8665bfd535..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package domain;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-public class CustomCompositeBuilder {
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private ModelResolverExtensionPoint modelResolvers;
-    private ModelFactoryExtensionPoint modelFactories;
-    private WorkspaceFactory workspaceFactory;
-    private AssemblyFactory assemblyFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> xmlProcessor; 
-    private ContributionDependencyBuilder contributionDependencyBuilder;
-    private CompositeBuilder domainCompositeBuilder;
-    private CompositeBuilder nodeCompositeBuilder;
-    private NodeImplementationFactory nodeFactory;
-    //private AtomBindingFactory atomBindingFactory;
-    private static Workspace workspace;
-    private List<SCADefinitions> policyDefinitions;
-    private Monitor monitor;
-        
-    private CustomCompositeBuilder() {
-        // no code req'd
-    }
-
-    public static CustomCompositeBuilder getInstance()
-    {
-      if (ref == null)
-          ref = new CustomCompositeBuilder();
-      return ref;
-    }
-
-    private static CustomCompositeBuilder ref;
-    
-    private void init() {
-        
-    	// Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-        
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);       
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-        //atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-        
-        // Create XML artifact processors
-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, contractMapper, null, monitor);
-    }
-    
-    public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
-    	init();
-
-        // Create workspace model
-        workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI artifactURI = URI.create(sourceURI);
-        //URL contributionURL = FileHelper.toFile(new URL(sourceURL)).toURI().toURL();
-        URL artifactURL = new File(sourceURL).toURI().toURL();
-        URL contributionURL = new File(compositeURL).toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);              	
-        workspace.getContributions().add(storeContribution);
-        
-        // Build the contribution dependencies
-        Map<Contribution, List<Contribution>> contributionDependencies = new HashMap<Contribution, List<Contribution>>();
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                   	contributionProcessor.resolve(dependency, workspace.getModelResolver());                                       
-                }
-            }
-            
-            contributionDependencies.put(contribution, dependencies);
-        }
-        
-        // Create a composite model for the domain
-        /*Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName(Constants.SCA10_NS, "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);*/
-    }
-    
-    public Monitor getMonitorInstance() {
-    	return monitor;
-    }
-    
-    public void buildContribution() throws Exception {
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://customdomain", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);
-    }
-    
-    public void readContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
-    	init();
-
-        // Create workspace model
-        workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI artifactURI = URI.create(sourceURI);
-        //URL contributionURL = FileHelper.toFile(new URL(sourceURL)).toURI().toURL();
-        URL artifactURL = new File(sourceURL).toURI().toURL();
-        URL contributionURL = new File(compositeURL).toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);              	
-        workspace.getContributions().add(storeContribution);    	
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
deleted file mode 100644
index 9d97e3611a..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeUnrecognizedNamespaceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
deleted file mode 100644
index 80c15dc444..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeWithoutNamespaceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/AttributeWithoutNamespace/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeWithoutNamespace", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
deleted file mode 100644
index 81e8aecfeb..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class BPELProcessNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/BPELProcessNotFound/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("BPELProcessNotFound", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
deleted file mode 100644
index fb0c525aea..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CannotResolveWSDLReferenceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/CannotResolveWSDLReference/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CannotResolveWSDLReference", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
deleted file mode 100644
index 445629457e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MyRolePartnerRoleNullTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/MyRolePartnerRoleNull/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
deleted file mode 100644
index 00b904ae65..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkHasBothAttrTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkHasBothAttr/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
-    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
deleted file mode 100644
index b7a4ee6fef..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkNoMatchingTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkNoMatchingType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
deleted file mode 100644
index 32d3211f36..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkTypeNoRolesTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
-    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/
-        
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
deleted file mode 100644
index b31451c433..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class EJBLinkAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite", 
-                      "TestContribution", "src/main/resources/impl/ejb/EJBLinkAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("EJBLinkAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
deleted file mode 100644
index 3a7745722a..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ClassNotFoundExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/java/ClassNotFoundException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/impl/java/ClassNotFoundException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index 59fc3ce79c..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/java/ContributionResolveException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/impl/java/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	
-    	assertNotNull(problem);
-        assertEquals("ContributionResolveException", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
deleted file mode 100644
index 6f54ad140c..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.osgi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotLocateOSGiBundleTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        //OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-       OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("CouldNotLocateOSGiBundle", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
deleted file mode 100644
index 3d75fa8ccc..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.osgi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingComponentTypeFileTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/MissingComponentTypeFile/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    	OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("MissingComponentTypeFile", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/branches/sca-android/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
deleted file mode 100644
index 398c028dd8..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package impl.osgi;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-
-/**
- * 
- * Utility class to create OSGi bundles
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestBundles {
-    
-    public static void createBundle(String jarName,
-            Class<?> interfaceClass, Class<?> implClass) throws Exception {
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        String EOL = System.getProperty("line.separator");
-        
-        String packageName = interfaceClass.getPackage().getName();
-        String bundleName = interfaceClass.getName();
-
-        String manifestStr = "Manifest-Version: 1.0" + EOL
-                + "Bundle-ManifestVersion: 2" + EOL + "Bundle-Name: "
-                + bundleName + EOL + "Bundle-SymbolicName: " + bundleName + EOL
-                + "Bundle-Version: " + "1.0.0" + EOL
-                + "Bundle-Localization: plugin" + EOL;
-
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-        manifestBuf.append("Export-Package: " + packageName + EOL);
-        manifestBuf.append("Import-Package: org.osgi.framework" + EOL);
-        manifestBuf.append("Bundle-Activator: " + implClass.getName() + EOL);
-
-        ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-        
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-        String interfaceClassName = interfaceClass.getName().replaceAll("\\.",
-                "/")
-                + ".class";
-
-        URL url = interfaceClass.getClassLoader().getResource(
-                interfaceClassName);
-        String path = url.getPath();
-
-        ZipEntry ze = new ZipEntry(interfaceClassName);
-
-        jarOut.putNextEntry(ze);
-        FileInputStream file = new FileInputStream(path);
-        byte[] fileContents = new byte[file.available()];
-        file.read(fileContents);
-        jarOut.write(fileContents);
-        
-        String implClassName = implClass.getName().replaceAll("\\.",
-                "/")
-                + ".class";
-
-        url = implClass.getClassLoader().getResource(implClassName);
-        path = url.getPath();
-
-        ze = new ZipEntry(implClassName);
-
-        jarOut.putNextEntry(ze);
-        file = new FileInputStream(path);
-        fileContents = new byte[file.available()];
-        file.read(fileContents);
-        jarOut.write(fileContents);
-
-        file.close();
-
-        jarOut.close();
-        out.close();
-
-        FileOutputStream fileOut = new FileOutputStream(jarName);
-        fileOut.write(out.toByteArray());
-        fileOut.close();
-
-
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
deleted file mode 100644
index 117a94337a..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.osgi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyShouldSpecifySRTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        OSGiTestBundles.createBundle("src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/PropertyShouldSpecifySR/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    	OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("PropertyShouldSpecifySR", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index 14ba8e992e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.resource;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotResolveLocationTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite", 
-                      "TestContribution", "src/main/resources/impl/resource/CouldNotResolveLocation/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 461895f824..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.resource;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/resource/LocationAttributeMissing/resource.composite", 
-                      "TestContribution", "src/main/resources/impl/resource/LocationAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index 9b7dbef3dd..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();        
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("ContributionResolveException"));
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
deleted file mode 100644
index cd38b53f66..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/LocationAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
deleted file mode 100644
index 83550ae58d..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnableToResolveComponentTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/UnableToResolveComponentType/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("UnableToResolveComponentType", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index d098bb4bf8..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.widget;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotResolveLocationTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite", 
-                      "TestContribution", "src/main/resources/impl/widget/CouldNotResolveLocation/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 2f85d8ed4a..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.widget;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/widget/LocationAttributeMissing/widget.composite", 
-                      "TestContribution", "src/main/resources/impl/widget/LocationAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
deleted file mode 100644
index f90fc3b83f..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.xquery;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotLocateFileTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/xquery/CouldNotLocateFile/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CouldNotLocateFile", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 01450a8836..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package impl.xquery;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/xquery/LocationAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
deleted file mode 100644
index a03e056298..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package interfacejava.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ClassNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacejava/xml/ClassNotFoundException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId()); 
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index e0524f57b7..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package interfacejava.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacejava/xml/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
deleted file mode 100644
index e212477c61..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package interfacewsdl.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidWSDLInterfaceAttrTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
deleted file mode 100644
index df2a2671df..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package interfacewsdl.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlInterfaceDoesNotMatchTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
deleted file mode 100644
index 361e2f2bfb..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AlwaysProvidedIntentNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite", 
-        			"TestContribution", "src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/branches/sca-android/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
deleted file mode 100644
index a85dc334f4..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ErrorInPolicyIntentDefinitionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite", 
-        			"TestContribution", "src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/branches/sca-android/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
deleted file mode 100644
index 3f98757ce5..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class IntentNotSpecifiedTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite", 
-                       "TestContribution", "src/main/resources/policy/xml/IntentNotSpecified/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("IntentNotSpecified"));
-       /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); 
-       assertNotNull(problem);
-       assertEquals("IntentNotSpecified", problem.getMessageId());*/  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/branches/sca-android/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
deleted file mode 100644
index 3b8d075165..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MayProvideIntentNotFoundTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite", 
-                       "TestContribution", "src/main/resources/policy/xml/MayProvideIntentNotFound/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("MayProvideIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/branches/sca-android/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
deleted file mode 100644
index bcf1f82392..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class RequiredAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-              customDomain.loadContribution("src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite", 
-                        "TestContribution", "src/main/resources/policy/xml/RequiredAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-       assertNotNull(problem);
-       assertEquals("RequiredAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/branches/sca-android/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
deleted file mode 100644
index 5683d54e64..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.junit.Ignore;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnableToMapPoliciesTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-            customDomain.loadContribution("src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite", 
-                      "TestContribution", "src/main/resources/policy/xml/UnableToMapPolicies/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    @Ignore("TUSCANY-2538")
-    public void testCalculator() {
-    	//FIXME This needs to be fixed, as it was working based on processor ignoring
-    	//elements... 
-        /*
-    	Monitor monitor = customDomain.getMonitorInstance();
-        assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("UnableToMapPolicies"));
-        */
-        /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-        assertNotNull(problem);
-        assertEquals("UnableToMapPolicies", problem.getMessageId());*/  
-    }
-}
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/branches/sca-android/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
deleted file mode 100644
index eec39d711e..0000000000
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnrecognizedIntentAttachPointTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-            customDomain.loadContribution("src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite", 
-                      "TestContribution", "src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId());  
-    }
-}
author	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:05:59 +0000
committer	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:05:59 +0000
commit	5e520b1b65c79cd828057cb628b9367acb266880 (patch)
tree	645361ececb1a50c2fe0260beca5c1169d0e197b /branches/sca-android/itest/validation/src/test/java
parent	00c625535fe93a57d605c8988147b77207d43fad (diff)