Removing itests that were not released in 1.5.2 release

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

43 files changed, 0 insertions, 2963 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/README b/sca-java-1.x/branches/sca-java-1.6/itest/admin/README
deleted file mode 100644
index c4e96d7af0..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/README
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a simple test compiled to test simple features of  SCA

-

-There are interfaces to different services that have been included

-

-1. MyListService

-2. MyListServiceByYear

-3. MyService

-4. MyServiceByDate

-5. MyTotalservice

-

-The service that has been used in the tests primarily is MyService/MyTotalService.

-in the test cases.

-

-There are three test cases and three composites (MySimppleService,Iteration1,Iteration3).

-

-1. MySimpleServiceTestCase            - Checks if the components in MySimpleService.composite are initialized properly. 

-                                        It tries to call simple functions implemented in MySimpleServiceImpl.

-                             

-2. MyTotalServiceTestCase             - Initializes the components in the Iteration3Composite.composite file.

-                                        tries to call simple functions implemented in MyTotalServiceImpl.

-                             

-3. MySimpleServiceInRecursiveTestCase - Initializes the components in the  Iteration1Composite.composite file.

-                                        It initializes its components using implementation:composite tag in the 

-                                        composite file which points to MySimpleService.composite.

-                                        The test case recursively calls functions initialized in MySimpleService.composite.

-                                        

-

-                                        

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/pom.xml b/sca-java-1.x/branches/sca-java-1.6/itest/admin/pom.xml
deleted file mode 100644
index 5030ef4c47..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>tuscany-itest-admin</artifactId>

-    <name>Apache Tuscany Admin Tests</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.6-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>1.6-SNAPSHOT</version>

-            <scope>compile</scope>

-        </dependency>

-    </dependencies>

-    

-</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
deleted file mode 100644
index b3d2137767..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

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

-

-@Remotable

-public interface MyListService {

-	String[] getHolidays();

-    String getYear();

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
deleted file mode 100644
index 025302fb6d..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

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

-

-@Remotable

-public interface MyListServiceByYear {

-	String[] getHolidays(int year);

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
deleted file mode 100644
index de480e6d85..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-

-import java.util.List;

-

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

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

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

-

-import org.apache.tuscany.sca.itest.admin.MyListService;

-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;

-

-@Service(interfaces={MyListService.class,MyListServiceByYear.class})

-

-public class MyListServiceImpl implements MyListService,MyListServiceByYear

-{

-

-    // This is multiplicity=1:n

-    @Reference(name="myListServiceList",required=true)

-    public List<MyListService> myListServicesList;

-

-    // This is multiplicity=0:n

-    @Reference(name="myListServiceArray",required=false)

-    public MyListService[] myListServicesArray;

-    

-    @Property(name="serviceYear")

-    protected String year = "2006";

-    

-    public String[] getHolidays()

-    {

-        return getHolidays(new Integer(year).intValue());

-    }

-

-    public String[] getHolidays(int year)

-    {

-        MyListService myService;

-        if (myListServicesList!=null)

-        {

-            for (int i=0; i<myListServicesList.size(); i++)

-            {

-                myService=myListServicesList.get(i);

-                if(new Integer(myService.getYear()).intValue()==year)

-                {

-                    return myService.getHolidays();

-                }

-            }

-        }

-        if (myListServicesArray!=null)

-        {

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

-            {

-                myService=myListServicesArray[i];

-                if(new Integer(myService.getYear()).intValue()==year)

-                {

-                    return myService.getHolidays();

-                }

-            }

-        }

-        return null;

-    }

-

-    public String getYear()

-    {

-        return year;

-    }

-    

-    

-    

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
deleted file mode 100644
index 8ff146b630..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.io.PrintStream;

-

-public class MyLogger {

-

-	private PrintStream outStream;

-

-	public MyLogger(PrintStream out) {

-		this.outStream = out;

-	}

-	

-	public void println(String text) {

-		outStream.println("MyLog: " + text);

-	}

-

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
deleted file mode 100644
index 638c6aff8c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

-public interface MyService  extends SCAComponentService{

-    Date nextHoliday();

-    String getLocation();

-    String getYear();

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
deleted file mode 100644
index bd820884e7..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

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

-

-@Remotable

-public interface MyServiceByDate {

-	Date nextHoliday(Date date);

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
deleted file mode 100644
index fa2720001b..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

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

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

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

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

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

-import org.apache.tuscany.sca.itest.admin.MyListService;

-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;

-import org.apache.tuscany.sca.itest.admin.MyLogger;

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;

-

-

-@Service(interfaces={MyService.class, MyServiceByDate.class, MyListService.class, MyListServiceByYear.class})

-

-public class MyServiceImpl implements MyService, MyServiceByDate, MyListService, MyListServiceByYear{

-	static String[][] holidays = {{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",

-	"2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",

-        "2007/11/23","2007/12/25"},{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",

-            "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",

-                "2007/11/23","2007/12/25"}};

-	

-	@Property(name="location")

-	protected String location = "RTP";

-

-    @Property(name="year")

-    protected String year = "2006";

-    

-

-    private String componentName;

-    

-

-    private MyLogger logger;

-

-	public MyServiceImpl()

-	{

-	    logger = new MyLogger(System.out);

-	    logger.println("creating service instance...");

-	}

-    

-	public Date nextHoliday() {

-        

-        return nextHoliday(new Date());

-	}

-

-    

-	public Date nextHoliday(Date today)

-    {

-        Date d1;

-        String[] days = getHolidays();

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

-        {

-            d1 = new Date(days[j]);

-            if (d1.after(today))

-               return d1;

-        }

-        return null;

-    }

-

-    

-    public String[] getHolidays(int year)

-    {

-        int index = year -2006;

-        if (index>=0  && index<holidays.length)

-            return holidays[index];

-        return null;

-    }

-

-    public String[] getHolidays()

-    {

-        

-        Integer theYear;

-        if (year ==null || year.length()==0)

-            theYear = new Integer("2006");

-        else

-            theYear = new Integer(year);

-        

-        return getHolidays(theYear.intValue());

-    }

-

-    @Init

-	public void start()

-	{

-		logger.println("Start service..");

-	}

-

-	@Destroy

-	public void stop()

-	{

-		logger.println("Stop service..");

-		

-	}

-

-    public String getComponentName()

-    {

-        return componentName;

-    }

-

- 

-    public String getLocation()

-    {

-       return location;

-    }

-

-    public String getYear()

-    {

-        return year;

-    }

-	

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
deleted file mode 100644
index eec64fa0d8..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-public interface MyTotalService extends MyListService, MyListServiceByYear, MyService, MyServiceByDate

-{

-

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
deleted file mode 100644
index d712662cb3..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

-

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

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

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

-import org.apache.tuscany.sca.itest.admin.MyListService;

-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;

-import org.apache.tuscany.sca.itest.admin.MyTotalService;

-

-@Service(MyTotalService.class)

-

-public class MyTotalServiceImpl implements MyTotalService

-{

-

-    // This is multiplicity=1:1

-    @Reference(required=true)

-    public MyListService myListService;

-    

-    // default required==true so it is 1:1

-    @Reference (required=false)

-    public MyListServiceByYear myListServiceByYear = new MyServiceImpl();

-    

-    // default required==true so it is 1:1

-    @Reference

-    public MyService myService;

-    

-    // This is multiplicity=0:1 

-    @Reference(required=false)

-    public MyServiceByDate myServiceByDate = new MyServiceImpl();

-	

-	   @ComponentName

-    private String componentName;

-

-    public String[] getHolidays()

-    {

-        return myListService.getHolidays();

-    }

-

-    public String[] getHolidays(int year)

-    {

-        return myListServiceByYear.getHolidays(year);

-    }

-

-    

-    public Date nextHoliday(Date date)

-    {

-        return myServiceByDate.nextHoliday(date);

-    }

-

-    public String getLocation()

-    {

-        return myService.getLocation();

-    }

-

-    public String getYear()

-    {

-        return myService.getYear();

-    }

-	

-	  public String getComponentName()

-    {

-        return componentName;

-    }

-

-    public Date nextHoliday()

-    {

-        return myService.nextHoliday();

-    }

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
deleted file mode 100644
index 42fa3f0c41..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-

-

-public interface SCAComponentService

-{

-    String getComponentName();

-

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
deleted file mode 100644
index bcf4153064..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyService;

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-

-

-public class MySimpleServiceInRecursiveTestCase

-{

-    private static MyService myServiceOrg;

-    private static MyService myServiceAnother;

-    private static MyService myServiceCary;

-

-    private static SCADomain domain;

-

-    

-    @Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myServiceOrg.getLocation());

-        assertEquals("2006",myServiceOrg.getYear());

-    }

-

-   

-    @Test

-    public void testPropertyOverrideValue()

-    {

-        assertEquals("CARY",myServiceCary.getLocation());

-        assertEquals("2007",myServiceCary.getYear());

-    }

-

-   

-    @Test

-    public void testPropertyOverrideVariable()

-    {

-        assertEquals("Durham",myServiceAnother.getLocation());

-        assertEquals("2009",myServiceAnother.getYear());

-    }

-

-

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

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

-        } catch ( Exception e ) { e.printStackTrace(); }

-        

-        myServiceOrg = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceOrig1");

-        myServiceCary = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceCary1");

-        myServiceAnother = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother/MyServiceNew1");

-    }

-	

-	@AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
deleted file mode 100644
index 747f71576c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyService;

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class MySimpleServiceTestCase

-{

-    private static SCADomain domain;

-    private static MyService myServiceOrg;

-    private static MyService myServiceNew;

-    private static MyService myServiceCary;

-

-	@Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myServiceOrg.getLocation());

-        assertEquals("2006",myServiceOrg.getYear());

-    }

-

-   

-	 @Test 

-    public void testPropertyOverrideWithValue()

-    {

-        assertEquals("CARY",myServiceCary.getLocation());

-        assertEquals("2007",myServiceCary.getYear());

-    }

-

-    

-	 @Test 

-    public void testPropertyOverrideWithVariable()

-    {

-        assertEquals("Raleigh",myServiceNew.getLocation());

-        assertEquals("2008",myServiceNew.getYear());

-    }

-

-  

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

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

-        } catch ( Exception e ) { System.out.println("Could not initialize " + e.toString());

-                                e.printStackTrace(); }

-        myServiceOrg = domain.getService(MyService.class, "MyServiceComponentOrig/MyService");

-        myServiceCary = domain.getService(MyService.class, "MyServiceComponentCary2007/MyService");

-		myServiceNew = domain.getService(MyService.class, "MyServiceComponentNew/MyService");

-    }

-	

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }  

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
deleted file mode 100644
index 6c2dffb7b4..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyTotalService;

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class MyTotalServiceTestCase

-{

-    private static MyTotalService myTotalServiceOrg;

-    private static MyTotalService myTotalServiceNew;

-

-   private static SCADomain domain;

-

-	 @Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myTotalServiceOrg.getLocation());

-        assertEquals("2006",myTotalServiceOrg.getYear());

-    }

-

-    

-	 @Test

-    public void testPropertyOverrideVariable()

-    {

-        assertEquals("Raleigh",myTotalServiceNew.getLocation());

-        assertEquals("2008",myTotalServiceNew.getYear());

-    }

-

-  

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

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

-        } catch ( Exception e ) { e.printStackTrace(); }

-		

-        myTotalServiceOrg =domain.getService(MyTotalService.class, "MyTotalServiceComponent");

-        myTotalServiceNew=domain.getService(MyTotalService.class, "MyTotalServiceNewComponent");

-    }

-	

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-}

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/Iteration1Composite.composite b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/Iteration1Composite.composite
deleted file mode 100644
index 95dbbf0124..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/Iteration1Composite.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

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

-       xmlns:foo="http://foo" 

-       xmlns:cust="http://www.example.com/Customer"

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

-       targetNamespace="http://foo"

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

-

-	<property name="newLocation" type="xs:anyURI">Raleigh</property>

-	<property name="newYear" type="xs:anyURI">2008</property>

-

-	<property name="anotherLocation" type="xs:anyURI">Durham</property>

-	<property name="anotherYear" type="xs:anyURI">2009</property>

-

-    <component name="MySimpleServiceInRecursive">

-        <implementation.composite name="foo:MySimpleService"/>

-    </component>

-

-    <component name="MySimpleServiceInRecursiveAnother">

-        <implementation.composite name="foo:MySimpleService"/>

-        <property name="newLocation">Durham</property>

-        <property name="newYear">2009</property>   

-    </component>

-

-</composite>

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/Iteration3Composite.composite b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/Iteration3Composite.composite
deleted file mode 100644
index dd06d030d6..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/Iteration3Composite.composite
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"

-    xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"

-    targetNamespace="http://foo" local="true" autowire="false" requires="cns:confidentiality"

-    policySets="sns:secure">

-  <property name="newLocation" type="anyURI">Raleigh</property>

-  <property name="newYear" type="anyURI">2008</property>

- 

- <component name="MyServiceComponentOrig">

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

-  </component>

- 

- <component name="MyServiceComponentCary2007">

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

-    <property name="location">CARY</property>

-    <property name="year">2007</property>

-  </component>

- 

- <component name="MyServiceComponentNew">

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

-    <property name="location" source="$newLocation"/>

-    <property name="year" source="$newYear"/>

-  </component>

- 

- <component name="MyTotalServiceComponent">

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

-    <reference name="myService" target="MyServiceComponentOrig/MyService"/>

-    <reference name="myListService" target="MyServiceComponentOrig/MyListService"/>

-  </component>

- 

- <component name="MyTotalServiceNewComponent">

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

-    <reference name="myService" target="MyServiceComponentNew/MyService"/>

-    <reference name="myListService" target="MyServiceComponentNew/MyListService"/>

-  </component>

-  

-  <property name="anotherLocation" type="anyURI">Durham</property>

-  <property name="anotherYear" type="anyURI">2009</property>

- 

- <component name="MySimpleServiceInRecursive">

-    <implementation.composite name="foo:MySimpleService"/>

-  </component>

-  

-  <component name="MySimpleServiceInRecursiveAnother">

-    <implementation.composite name="foo:MySimpleService"/>

-    <property name="newLocation">Durham</property>

-    <property name="newYear">2009</property>

-  </component>

-</composite>

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/MySimpleService.composite b/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/MySimpleService.composite
deleted file mode 100644
index a1f8abb8da..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/admin/src/test/resources/MySimpleService.composite
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-

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

-       xmlns:foo="http://foo" 

-       xmlns:cust="http://www.example.com/Customer"

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

-       targetNamespace="http://foo"

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

-

-    <service name="MyServiceCary1" promote="MyServiceComponentCary2007/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-    <service name="MyServiceOrig1" promote="MyServiceComponentOrig/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-    <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-	<property name="newLocation" type="anyURI">Raleigh</property>

-	<property name="newYear" type="anyURI">2008</property>

-

-    <component name="MyServiceComponentOrig">

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

-    </component>

-	

-    <component name="MyServiceComponentCary2007">

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

-		<property name="location">CARY</property>

-		<property name="year">2007</property>

-    </component>

-

-    <component name="MyServiceComponentNew">

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

-        <property name="location" source="$newLocation"/>

-		<property name="year" source="$newYear"/>

-    </component>

-    

-</composite>

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/pom.xml
deleted file mode 100644
index a5db757e3c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/pom.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-itest</artifactId>
-		<version>1.6-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-interop-soap-client</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache Tuscany SCA WS Interop Client Integration Tests</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.6-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.6-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.0-incubating-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.0-incubating-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noInterfaces>true</noInterfaces>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sca</groupId>
-				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFile>
-								${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
-							<javaPackage>org.soapinterop</javaPackage>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
deleted file mode 100644
index ffffb96686..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.test.interop.client;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Service;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-/**
- * This class implements the DocTest service component.
- */
-@Service(DocTestPortType.class)
-public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType {
-    
-    public ComplexDocument ComplexDocument(ComplexDocument param0){
-        return param0;
-    }
-    
-    public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) {
-        return param4;
-    }
-    
-    public SingleTag SingleTag(SingleTag param2) {
-        return param2;
-    }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/resources/default.composite b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/resources/default.composite
deleted file mode 100644
index 7fd5cc0d65..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/resources/default.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- -->

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

-        name="interop.client">

-    

-    <component name="InteropDocComponentService">

-        <implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>

-

-		<service name="DocTestPortType">

-	        <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->

-	        <interface.java interface="org.soapinterop.DocTestPortType"/>

-	        <binding.ws wsdlElement="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"/>

-	    </service>

-    </component>

-    

-	    

-

-</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
deleted file mode 100644
index 90d8a754b4..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-<!--
-	* Licensed to the Apache Software Foundation (ASF) under one
-	* or more contributor license agreements.  See the NOTICE file
-	* distributed with this work for additional information
-	* regarding copyright ownership.  The ASF licenses this file
-	* to you under the Apache License, Version 2.0 (the
-	* "License"); you may not use this file except in compliance
-	* with the License.  You may obtain a copy of the License at
-	* 
-	*   http://www.apache.org/licenses/LICENSE-2.0
-	* 
-	* Unless required by applicable law or agreed to in writing,
-	* software distributed under the License is distributed on an
-	* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	* KIND, either express or implied.  See the License for the
-	* specific language governing permissions and limitations
-	* under the License.    
--->
-<definitions name="InteropTestDoc"
-	targetNamespace="http://soapinterop.org/"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:tns="http://soapinterop.org/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-	<types>
-
-		<xsd:schema elementFormDefault="qualified"
-			targetNamespace="http://soapinterop.org/"
-			xmlns:interop="http://soapinterop.org/">
-
-			<xsd:element name="SingleTag">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SingleTag" />
-			<xsd:element name="SingleTagResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			
-			<xsd:element name="SimpleDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SimpleDocument">
-				<xsd:simpleContent>
-					<xsd:extension base="xsd:string" />
-				</xsd:simpleContent>
-			</xsd:complexType>
-			<xsd:element name="SimpleDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			
-			<xsd:element name="ComplexDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="ComplexDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument" />
-					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument" />
-				</xsd:sequence>
-				<xsd:attribute name="AnAttribute" type="xsd:string" />
-			</xsd:complexType>
-			<xsd:element name="ComplexDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			
-			<xsd:complexType name="ArrayOfSimpleDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument" />
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="ChildDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-		</xsd:schema>
-
-	</types>
-
-	<message name="SingleTagSoapIn">
-		<part name="parameters" element="tns:SingleTag" />
-	</message>
-	<message name="SingleTagSoapOut">
-		<part name="outputDoc" element="tns:SingleTagResponse" />
-	</message>
-	<message name="SimpleDocumentSoapIn">
-		<part name="parameters" element="tns:SimpleDocument" />
-	</message>
-	<message name="SimpleDocumentSoapOut">
-		<part name="outputDoc" element="tns:SimpleDocumentResponse" />
-	</message>
-	<message name="ComplexDocumentSoapIn">
-		<part name="parameters" element="tns:ComplexDocument" />
-	</message>
-	<message name="ComplexDocumentSoapOut">
-		<part name="outputDoc" element="tns:ComplexDocumentResponse" />
-	</message>
-
-	<portType name="DocTestPortType">
-
-		<operation name="SingleTag">
-			<input message="tns:SingleTagSoapIn" />
-			<output message="tns:SingleTagSoapOut" />
-		</operation>
-		<operation name="SimpleDocument">
-			<input message="tns:SimpleDocumentSoapIn" />
-			<output message="tns:SimpleDocumentSoapOut" />
-		</operation>
-		<operation name="ComplexDocument">
-			<input message="tns:ComplexDocumentSoapIn" />
-			<output message="tns:ComplexDocumentSoapOut" />
-		</operation>
-
-	</portType>
-
-	<binding name="doc_test_binding" type="tns:DocTestPortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-
-		<operation name="SingleTag">
-			<soap:operation
-				soapAction="http://soapinterop.org/SingleTag" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-
-		<operation name="SimpleDocument">
-			<soap:operation
-				soapAction="http://soapinterop.org/SimpleDocument" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-
-		<operation name="ComplexDocument">
-			<soap:operation
-				soapAction="http://soapinterop.org/ComplexDocument" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-	</binding>
-
-	<service name="interopDocSvc">
-
-		<port name="interopDocPort" binding="tns:doc_test_binding">
-			<soap:address location="http://www.whitemesa.net/interopdoc" />
-			<!-- soap:address location="http://mssoapinterop.org/asmx/simple.asmx"/ -->
-			<!-- soap:address location="http://easysoap.sourceforge.net/cgi-bin/interopserver"/ -->
-			<!-- soap:address location="http://www.mssoapinterop.org/remoting/ServiceAllTypes.soap"/ -->
-			<http-conf:client
-				xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
-				AllowChunking="false" />
-		</port>
-
-	</service>
-
-</definitions>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
deleted file mode 100644
index dc1ba48580..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.test.interop.client;
-
-import java.rmi.RemoteException;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.soapinterop.ArrayOfSimpleDocument;
-import org.soapinterop.ChildDocument;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-import commonj.sdo.helper.DataFactory;
-
-public class InteropDocClientTestCase extends TestCase {
-    private SCADomain scaDomain;
-    
-    private DataFactory dataFactory;
-
-    private DocTestPortType interopDoc;
-
-    public InteropDocClientTestCase(){};
-
-    
-    @Override
-    protected void setUp() throws Exception {
-
-        scaDomain = SCADomain.newInstance("default.composite");
-        interopDoc = locateInteropDocService();
-
-        //Get the SDO DataFactory
-        dataFactory = DataFactory.INSTANCE;
-    }
-    
-    
-    public void testSingleTag() throws RemoteException {
-
-        assertNotNull(interopDoc);
-        
-        // Create the input
-        SingleTag input = (SingleTag) dataFactory.create(SingleTag.class);
-
-        // Invoke the service
-        SingleTag output = interopDoc.SingleTag(input);
-
-        // Test the results
-        assertNotNull(output);
-
-    }
-
-    public void testSimpleDocument() throws RemoteException {
-
-        assertNotNull(interopDoc);
-        
-        // Create the input
-        SimpleDocument1 input = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
-        input.setValue("123");
-
-        // Invoke the service
-        SimpleDocument1 output = interopDoc.SimpleDocument(input);
-
-        // Test the results
-        assertNotNull(output);
-        assertEquals("123", output.getValue());
-
-    }
-
-    public void testComplexDocument() throws RemoteException {
-
-        assertNotNull(interopDoc);
-        
-        // Create the input
-        ComplexDocument input = (ComplexDocument) dataFactory.create(ComplexDocument.class);
-        input.setAnAttribute("789");
-        ChildDocument childDocument = (ChildDocument) dataFactory.create(ChildDocument.class);
-        SimpleDocument simpleDocument = (SimpleDocument) dataFactory.create(SimpleDocument.class);
-
-        SimpleDocument1 simpleDocument1 = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
-
-        simpleDocument.setSimpleDocument(simpleDocument1);
-        simpleDocument1.setValue("456");
-        ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument) dataFactory.create(ArrayOfSimpleDocument.class);
-
-        arrayOfSimpleDocument.getSimpleDocument().add(simpleDocument1);
-        childDocument.setChildSimpleDoc(arrayOfSimpleDocument);
-        input.setChild(childDocument);
-
-        // Invoke the service
-        ComplexDocument output = interopDoc.ComplexDocument(input);
-
-        // Test the results
-        assertNotNull(output);
-        assertEquals("789", output.getAnAttribute());
-        assertNotNull(output.getChild());
-        assertNotNull(output.getChild().getChildSimpleDoc());
-
-        // FIXME Add more tests of the output document
-
-    }
-
-
-    /**
-     * Locate the interop service to test
-     * 
-     * @return
-     */
-    protected DocTestPortType locateInteropDocService() {
-        String interopLocation = System.getProperty("interopLocation");
-
-        // Valid service names are:
-        // RemoteInteropDocService: the live interop Web Service
-        // LocalHostInteropDocService: the interop Web Service hosted by Tuscany on localhost
-        // LoopbackInteropDocServiceComponent: a dummy loopback service component
-
-        // To specify the service name run mvn -interopLocation="Remote"
-
-        if (interopLocation == null)
-            interopLocation = "Remote";
-
-        return scaDomain.getService(DocTestPortType.class, interopLocation + "InteropDocService");
-    }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/pom.xml
deleted file mode 100644
index c4873f848b..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-itest</artifactId>
-		<version>1.6-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-interop-soap-round2-client</artifactId>
-	<name>Apache Tuscany SCA WS SOAP Round2 Interop Client Integration Tests</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.6-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.6-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.0-incubating-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.0-incubating-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<schemaFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</schemaFile>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noInterfaces>true</noInterfaces>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sca</groupId>
-				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</wsdlFile>
-							<javaPackage>org.soapinterop.wsdl.interop.test.doc.lit</javaPackage>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
deleted file mode 100644
index ca3031c646..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.tuscany.test.interop.client;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/**
- *
- *
- */
-public class InteropTestDocLit {
-    private WSDLInteropTestDocLitPortType interopTestDocLitPortType =null;
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-
-
-    }
-    WSDLInteropTestDocLitPortType getInteropTestDocLitPortType() {
-        return interopTestDocLitPortType;
-    }
-    void setInteropTestDocLitPortType(WSDLInteropTestDocLitPortType interopTestDocLitPortType) {
-        this.interopTestDocLitPortType = interopTestDocLitPortType;
-    }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/resources/default.composite b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/resources/default.composite
deleted file mode 100644
index 9bde77ef37..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/resources/default.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

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

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

-    name="InteropClient">

-

-	<dbsdo:import.sdo location="wsdl/interoptestdoclit.wsdl"/>

-	<dbsdo:import.sdo factory="org.soapinterop.xsd.XsdFactory"/>

-	

-    <reference name="RemoteInteropDocService">

-<!--    

-        <interface.wsdl interface="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.interface(WSDLInteropTestDocLitPortType)"/>

-        <binding.ws port="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"/>

--->

-

-		<interface.java interface="org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType"/>

-		<binding.ws endpoint="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"

-			location="wsdl/interoptestdoclit.wsdl" />

-    </reference>

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
deleted file mode 100644
index e08039cedb..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<definitions name="WSDLInteropTestDocLitService" 
-    targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <types>
-        <schema targetNamespace="http://soapinterop.org/xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-            elementFormDefault="qualified">
-            <complexType name="ArrayOfstring_literal">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="string" type="xsd:string"/>
-                </sequence>
-            </complexType>
-	    <complexType name="SOAPStruct">
-                <all>
-                    <element name="varFloat" type="xsd:float"/>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varString" type="xsd:string"/>
-                </all>
-            </complexType>
-  
-            <element name="echoStringParam" type="xsd:string"/>
-         
-            <element name="echoStringReturn" type="xsd:string"/>
-            <element name="echoStringArrayParam" type="xsd1:ArrayOfstring_literal"/>
-                
-            <element name="echoStringArrayReturn" type="xsd1:ArrayOfstring_literal"/>
-               
-            <element name="echoStructParam" type="xsd1:SOAPStruct"/>
-                   
-            <element name="echoStructReturn" type="xsd1:SOAPStruct"/>
-        </schema>
-    </types>
-    <message name="echoString">
-        <part element="xsd1:echoStringParam" name="a"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="xsd1:echoStringReturn" name="result"/>
-    </message>
-    <message name="echoStringArray">
-        <part element="xsd1:echoStringArrayParam" name="a"/>
-    </message>
-    <message name="echoStringArrayResponse">
-        <part element="xsd1:echoStringArrayReturn" name="result"/>
-    </message>
-    <message name="echoStruct">
-        <part element="xsd1:echoStructParam" name="a"/>
-    </message>
-    <message name="echoStructResponse">
-        <part element="xsd1:echoStructReturn" name="result"/>
-    </message>
-    <message name="echoVoid"/>
-    <message name="echoVoidResponse"/>
-
-    <portType name="WSDLInteropTestDocLitPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-        <operation name="echoStringArray">
-            <input message="tns:echoStringArray" name="echoStringArray"/>
-            <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
-        </operation>
-        <operation name="echoStruct">
-            <input message="tns:echoStruct" name="echoStruct"/>
-            <output message="tns:echoStructResponse" name="echoStructResponse"/>
-        </operation>
-        <operation name="echoVoid">
-            <input message="tns:echoVoid" name="echoVoid"/>
-            <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
-        </operation>
-    </portType>
-    <binding name="WSDLInteropTestDocLitPortBinding" 
-        type="tns:WSDLInteropTestDocLitPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoString">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStringArray">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStringArray">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringArrayResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStruct">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStruct">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStructResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoVoid">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoVoid">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoVoidResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="WSDLInteropTestDocLitService">
-        <port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort">
-            <soap:address 
-                location="http://mssoapinterop.org/stkv3/wsdl/interopTestDocLit.wsdl"/>
-            <http-conf:client xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
-                AllowChunking="false"/>
-        </port>
-    </service>
-</definitions>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
deleted file mode 100644
index bb379c89cd..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.test.interop.client;
-
-import java.rmi.RemoteException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-import org.soapinterop.xsd.ArrayOfstring_literal;
-import org.soapinterop.xsd.SOAPStruct;
-import org.soapinterop.xsd.XsdPackage;
-
-import commonj.sdo.helper.DataFactory;
-
-/**
- * This test case is part of the tuscany interop tests. This is a reduced version of the SOAPBuilders InteropTest test, document/literal mode. This
- * version has operations such as echoString, echoArrayOfString and echoStruct.
- * 
- * <p>
- * The WSDL for the external service used in this test case can be downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl.
- * This is part of the WSDL interop test from Microsoft and more details aobout this test case are found at
- * http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm
- */
-public class InteropTestDocLitTestCase extends TestCase {
-
-    private WSDLInteropTestDocLitPortType doc = null;
-
-    private DataFactory dataFactory;
-
-    
-    protected void setUp() throws Exception {
-        setApplicationSCDL(InteropTestDocLit.class, "META-INF/sca/default.scdl");
-        addExtension("test.extensions", InteropTestDocLit.class.getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl"));
-
-         super.setUp();
-
-        // Get the SDO DataFactory
-        dataFactory = DataFactory.INSTANCE;
-
-        // Locate the service to test
-        doc = locateInteropDocService();
-    }
-
-    /**
-     * Locate the interop service to test
-     * 
-     * @return
-     */
-    protected WSDLInteropTestDocLitPortType locateInteropDocService() {
-
-        CompositeContext compositeContext = CurrentCompositeContext.getContext();
-        return compositeContext.locateService(WSDLInteropTestDocLitPortType.class, "RemoteInteropDocService");
-
-    }
-
-    /**
-     * test echo void
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoVoid() throws RemoteException {
-        doc.echoVoid();
-        assertTrue(true);
-    }
-
-    /**
-     * test echo string
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoString() throws RemoteException {
-        String input = "a test string";
-        String output = doc.echoString(input);
-        assertEquals(input, output);
-    }
-
-    /**
-     * test echo string
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoStringArray() throws RemoteException {
-
-        ArrayOfstring_literal input = (ArrayOfstring_literal) dataFactory.create(ArrayOfstring_literal.class);
-        List inStrings = Arrays.asList(new String[] { "petra", "sue" });
-        input.set(XsdPackage.ARRAY_OFSTRING_LITERAL__STRING, inStrings);
-
-        ArrayOfstring_literal output = doc.echoStringArray(input);
-
-        List outStrings = output.getString();
-        assertNotNull(outStrings);
-        assertEquals(2, outStrings.size());
-        assertEquals("petra", outStrings.get(0));
-        assertEquals("sue", outStrings.get(1));
-    }
-
-    /**
-     * test echo struct
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoStruct() throws RemoteException {
-        SOAPStruct input = (SOAPStruct) dataFactory.create(SOAPStruct.class);
-        input.setVarInt(200);
-        input.setVarFloat(.002f);
-        input.setVarString("Hello");
-        SOAPStruct output = doc.echoStruct(input);
-        assertEquals(input.getVarInt(), output.getVarInt());
-        assertEquals(input.getVarFloat(), output.getVarFloat());
-        assertEquals(input.getVarString(), output.getVarString());
-    }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/pom.xml
deleted file mode 100644
index eb07efcc0f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>itest-interop-soap-service</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA WS Interop Service Integration Tests</name>
-
-    <dependencies>
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-<dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-      
-    <build>
-        <plugins>
-            <plugin>
-		<groupId>org.apache.tuscany.sdo</groupId>
-		<artifactId>tuscany-sdo-plugin</artifactId>
-		<version>1.0-incubating-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noInterfaces>true</noInterfaces>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-maven-wsdl2java</artifactId>
-		<version>1.6-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <wsdlFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
-                            <javaPackage>org.soapinterop</javaPackage>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>     
-   </build>
-
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
deleted file mode 100644
index c34941f43e..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.test.interop.server;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Service;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-/**
- * This class implements the HelloWorld service component.
- */
-@Service(DocTestPortType.class)
-public class InteropDocServiceComponentImpl implements DocTestPortType {
-
-    public ComplexDocument ComplexDocument(ComplexDocument param2) throws RemoteException {
-        return param2;
-    }
-
-    public SimpleDocument1 SimpleDocument(SimpleDocument1 param0) throws RemoteException {
-        return param0;
-    }
-
-    public SingleTag SingleTag(SingleTag param4) throws RemoteException {
-        return param4;
-    }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<definitions name="InteropTestDoc" targetNamespace="http://soapinterop.org/"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:tns="http://soapinterop.org/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-	<types>
-
-		<xsd:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/" xmlns:interop="http://soapinterop.org/">
-
-			<xsd:element name="SingleTag">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="SingleTag"/>
-			<xsd:element name="SingleTagResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="SimpleDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SimpleDocument">
-				<xsd:simpleContent>
-					<xsd:extension base="xsd:string"/>
-				</xsd:simpleContent>
-			</xsd:complexType>
-			<xsd:element name="SimpleDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="ComplexDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="ComplexDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument"/>
-					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument"/>
-				</xsd:sequence>
-				<xsd:attribute name="AnAttribute" type="xsd:string"/>
-			</xsd:complexType>
-			<xsd:complexType name="ArrayOfSimpleDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="ChildDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:element name="ComplexDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-
-	</types>
-
-	<message name="SingleTagSoapIn">
-		<part name="parameters" element="tns:SingleTag"/>
-	</message>
-	<message name="SingleTagSoapOut">
-		<part name="outputDoc" element="tns:SingleTagResponse"/>
-	</message>
-	<message name="SimpleDocumentSoapIn">
-		<part name="parameters" element="tns:SimpleDocument"/>
-	</message>
-	<message name="SimpleDocumentSoapOut">
-		<part name="outputDoc" element="tns:SimpleDocumentResponse"/>
-	</message>
-	<message name="ComplexDocumentSoapIn">
-		<part name="parameters" element="tns:ComplexDocument"/>
-	</message>
-	<message name="ComplexDocumentSoapOut">
-		<part name="outputDoc" element="tns:ComplexDocumentResponse"/>
-	</message>
-
-	<portType name="DocTestPortType">
-
-		<operation name="SingleTag">
-			<input message="tns:SingleTagSoapIn"/>
-			<output message="tns:SingleTagSoapOut"/>
-		</operation>
-		<operation name="SimpleDocument">
-			<input message="tns:SimpleDocumentSoapIn"/>
-			<output message="tns:SimpleDocumentSoapOut"/>
-		</operation>
-		<operation name="ComplexDocument">
-			<input message="tns:ComplexDocumentSoapIn"/>
-			<output message="tns:ComplexDocumentSoapOut"/>
-		</operation>
-
-	</portType>
-
-	<binding name="doc_test_binding" type="tns:DocTestPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-		<operation name="SingleTag">
-			<soap:operation soapAction="http://soapinterop.org/SingleTag"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="SimpleDocument">
-			<soap:operation soapAction="http://soapinterop.org/SimpleDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="ComplexDocument">
-			<soap:operation soapAction="http://soapinterop.org/ComplexDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-	</binding>
-
-	<service name="interopDocSvc">
-
-  		<port name="interopDocPort" binding="tns:doc_test_binding">
-    			<soap:address location="http://www.whitemesa.net/interopdoc"/>
-  		</port>
-
-	</service>
-
-</definitions>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
deleted file mode 100644
index 3fbc73616e..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-        name="interop.server">
-
-    <import.sdo location="wsdl/interopdoc.wsdl"/>
-    <!-- import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/ -->
-		
-    <service name="InteropDocService">
-       <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
-       <interface.java interface="org.soapinterop.DocTestPortType"/>
-                
-       <binding.ws endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
-          conformanceURIs="http://ws-i.org/profiles/basic/1.1"
-          location="wsdl/interopdoc.wsdl"
-         />
-        
-        <reference>InteropDocServiceComponent/DocTestPortType</reference>
-    </service>
-
-    <component name="InteropDocServiceComponent">
-        <implementation.java class="org.apache.tuscany.test.interop.server.InteropDocServiceComponentImpl"/>
-    </component>
-    
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8cf95fb789..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-  <display-name>Tuscany Interop Test Server</display-name>
-
-  <context-param>
-     <param-name>systemScdlPath</param-name>
-     <param-value>/META-INF/sca/webapp.system.scdl</param-value>
-  </context-param>
-
-  <context-param>
-     <param-name>applicationScdlPath</param-name>
-     <param-value>/META-INF/sca/default.scdl</param-value>
-  </context-param>
-
-  <listener>
-     <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
-  </listener>
-
-  <servlet>
-     <servlet-name>TuscanyServlet</servlet-name>
-     <display-name>Tuscany Servlet</display-name>
-     <servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
-  </servlet>
-  
-  <servlet-mapping>
-     <servlet-name>TuscanyServlet</servlet-name>
-     <url-pattern>/services/*</url-pattern>
-  </servlet-mapping>
-
-</web-app>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/t.bat b/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/t.bat
deleted file mode 100755
index 0f83dedc37..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/interop-soap-service/t.bat
+++ /dev/null
@@ -1,34 +0,0 @@
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership.  The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License.  You may obtain a copy of the License at
- #
- #   http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied.  See the License for the
- # specific language governing permissions and limitations
- # under the License.
-
-
-@echo off
-pushd target
-jar -xf  ..\apache-tomcat-5.5.17.zip 
-popd
-copy target\sample-helloworldws-1.0-SNAPSHOT.war target\apache-tomcat-5.5.17\webapps
-rem pushd target\apache-tomcat-5.5.17\webapps
-rem md sample-helloworldws-1.0-SNAPSHOT 
-rem cd sample-helloworldws-1.0-SNAPSHOT
-rem jar -xf ..\sample-helloworldws-1.0-SNAPSHOT.war
-pushd target\apache-tomcat-5.5.17\shared
-rem jar -xf  "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
-jar -xf  "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
-popd
-rem hack
-mkdir target\apache-tomcat-5.5.17\shared\extension
-copy target\apache-tomcat-5.5.17\shared\lib\axis2-1.0-SNAPSHOT.jar target\apache-tomcat-5.5.17\shared\extension 
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/pom.xml
deleted file mode 100644
index c866827482..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/pom.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-large-sdo-ws</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA iTest Web Service with Large SDO</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <!-- Declare tuscany-host-tomcat dependency in the default profile so that it can be replaced -->
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.tuscany.sca</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
-                    <version>1.6-SNAPSHOT</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-ifx-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/wsdl/IFX170_XSD.xsd</fileName>
-                                    <noNotification>true</noNotification>
-                                </configuration>
-                            </schemaFiles>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
deleted file mode 100644
index f5a8830c4a..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.itest.trninq;
-
-import java.rmi.RemoteException;
-
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrnInqClient implements TrninqInterface {
-
-    //service interface
-    private TrninqInterface transactionInquiryService;
-
-    // setting service interface
-    public void setTransactionInquiryService(TrninqInterface transactionInquiryService) {
-        this.transactionInquiryService = transactionInquiryService;
-    }
-
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type req) throws RemoteException {
-        return transactionInquiryService.DepAcctTrnInq(req);
-    }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
deleted file mode 100644
index 14da53cf98..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.itest.trninq;
-
-import java.rmi.RemoteException;
-import java.util.List;
-
-import org.ifxforum.xsd._1.AdditionalStatus_Type;
-import org.ifxforum.xsd._1.BankAcctTrnRec_Type;
-import org.ifxforum.xsd._1.BillerId_Type;
-import org.ifxforum.xsd._1.BillerPayee_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.ifxforum.xsd._1.DepAcctTrnRec_Type;
-import org.ifxforum.xsd._1._1Factory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrnInqService implements TrninqInterface {
-
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type req) throws RemoteException {
-
-        DepAcctTrnInqRs_Type response = _1Factory.INSTANCE.createDepAcctTrnInqRs_Type();
-
-        response.setStatus(_1Factory.INSTANCE.createStatus_Type());
-        response.getStatus().setStatusCode(1);
-        response.getStatus().setStatusDesc("the description associated with the code 1");
-        AdditionalStatus_Type addStatus = _1Factory.INSTANCE.createAdditionalStatus_Type();
-        addStatus.setServerStatusCode("STATUS_OK");
-        addStatus.setSeverity("SEVERITY_WARNING");
-        response.getStatus().getAdditionalStatus().add(addStatus);
-
-        response.setDepAcctId(_1Factory.INSTANCE.createDepAcctId_Type());
-        response.getDepAcctId().setBankInfo(_1Factory.INSTANCE.createBankInfo_Type());
-        response.getDepAcctId().getBankInfo().setBranchId("Concord_1");
-        response.getDepAcctId().getBankInfo().setBankId("Dufferin hill");
-        response.getDepAcctId().getBankInfo().setBankIdType("Concord branch");
-        response.getDepAcctId().getBankInfo().setBranchName("A Happy branch");
-        response.getDepAcctId().getBankInfo().setCity("Toronto");
-
-        response.getDepAcctId().getBankInfo().setCountry("Canada");
-        response.getDepAcctId().getBankInfo().setName("Info for A Happy branch");
-        response.getDepAcctId().getBankInfo().setPostalCode("L1LL1L");
-        response.getDepAcctId().getBankInfo().setStateProv("ON");
-
-        List records = response.getDepAcctTrnRec();
-        // Record1
-        DepAcctTrnRec_Type trnRec1 = null;
-        BankAcctTrnRec_Type baTrnRec1 = null;
-        long maxRec = req.getTrnCountLimit().getCount();
-        for (int i = 0; i < maxRec; i++) {
-            trnRec1 = _1Factory.INSTANCE.createDepAcctTrnRec_Type();
-            baTrnRec1 = _1Factory.INSTANCE.createBankAcctTrnRec_Type();
-
-            trnRec1.setBankAcctTrnRec(baTrnRec1);
-            trnRec1.getBankAcctTrnRec().setCSPRefId("CSPRefId1");
-            trnRec1.getBankAcctTrnRec().setPostedDt("1");
-            trnRec1.getBankAcctTrnRec().setOrigDt("1");
-            trnRec1.getBankAcctTrnRec().setBillRefInfo("aaaa");
-
-            trnRec1.getBankAcctTrnRec().setTrnType("1");
-
-            trnRec1.getBankAcctTrnRec().setCurAmt(_1Factory.INSTANCE.createCurrencyAmount());
-            trnRec1.getBankAcctTrnRec().getCurAmt().setAmt(new java.math.BigDecimal(2000.35));
-            trnRec1.getBankAcctTrnRec().getCurAmt().setCurCode("100");
-
-            trnRec1.setStmtRunningBal(_1Factory.INSTANCE.createCurrencyAmount());
-            trnRec1.getStmtRunningBal().setAmt(new java.math.BigDecimal("1345.55"));
-
-            trnRec1.getBankAcctTrnRec().setCustPayeeInfo(_1Factory.INSTANCE.createCustPayeeInfo_Type());
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setBillingAcct("000601832");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setAcctPayAcctId("12");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setName("John Doe");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setNickname("Jody");
-
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setBillerPayee(_1Factory.INSTANCE.createBillerPayee_Type());
-            BillerPayee_Type BillerP = trnRec1.getBankAcctTrnRec().getCustPayeeInfo().getBillerPayee();
-
-            BillerP.setBillerId(_1Factory.INSTANCE.createBillerId_Type());
-            BillerId_Type BId = BillerP.getBillerId();
-
-            BId.setBillerNum("123");
-            BId.setSPName("SomeName");
-
-            trnRec1.setAvailDt("sss");
-            trnRec1.setPmtId("SomeID");
-            trnRec1.setXferId("SomeOtherID");
-
-            records.add(trnRec1);
-        }
-
-        return response;
-    }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
deleted file mode 100644
index 3575d94f48..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.itest.trninq;
-
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrninqInterface {
-
-    /**
-     * Auto generated method signatures
-     * @param depAcctTrnInqRq
-     */
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type depAcctTrnInqRq) throws java.rmi.RemoteException;
-
-    //
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ac66b6a425..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://trninqcomposite"
-    xmlns:t="http://trninqcomposite">
-    <deployable composite="t:TestService" />
-</contribution>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/trnInq.composite b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/trnInq.composite
deleted file mode 100644
index 97594216e1..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/trnInq.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- -->

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

-    targetNamespace="http://trninqcomposite"

-    name="TestService">

-

-    <service name="TrnInqService" promote="TransactionInquiryComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.trninq.TrninqInterface" />

-        <binding.ws wsdlElement="http://trninq#wsdl.port(TrnInqSvc/TrnInqSvcPort)" />

-    </service>

-    <component name="TransactionInquiryComponent">

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

-    </component>

-

-    <reference name="TrnInqReference" promote="TransactionInquiryClientComponent/transactionInquiryService">

-        <interface.java interface="org.apache.tuscany.sca.itest.trninq.TrninqInterface" />

-        <binding.ws wsdlElement="http://trninq#wsdl.port(TrnInqSvc/TrnInqSvcPort)" />

-    </reference>

-    <component name="TransactionInquiryClientComponent">

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

-    </component>

-</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
deleted file mode 100644
index b85b80abc4..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
- <!--
- http://www.ifxforum.org/standards/standard/license
- 
-IFX License Statement
-===================== 
-IFX Forum hereby grants to all users of the IFX Business Message Specification 
-and Data Dictionary (the "Specification") a perpetual, worldwide, royalty-free, 
-nonexclusive, nontransferable license to (a) use the specification in the development 
-of software and/or data compilations which facilitate electronic transmission of 
-information in accordance with the Specification and otherwise implement the 
-Specification in user's products, and (b) market, reproduce, display, and distribute 
-(in any medium known now or in the future) the Specification as implemented in user's 
-products. The foregoing rights may be sublicensed through multiple tiers of distribution, 
-including resellers.
-
-Other than as licensed herein, the IFX Forum shall retain all right, title and interest 
-to any patent, copyrights, trade secrets or other proprietary rights ("Intellectual 
-Property Rights") in the Specification. Subject to all patent rights preserved by IFX Forum 
-members pursuant to Section 5.1 of the "Membership Rules of the Interactive Financial 
-Exchange Forum, Inc.", users shall retain all right, title and interest to the Intellectual 
-Property Rights in any products of user created using the Specification and any modifications, 
-extensions or derivative works of the Specification that user develops or has developed on 
-its behalf as permitted under this Agreement (the "Derivatives"), provided, however, that, 
-users may not hold Derivatives out as being endorsed, sponsored by or affiliated with the 
-IFX Forum. 
- -->
-<xsd:schema xmlns="urn:ifxforum-org:XSD:1" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="urn:ifxforum-org:XSD:1" elementFormDefault="qualified" attributeFormDefault="unqualified">
-    <xsd:complexType name="AdditionalStatus_Type">
-        <xsd:sequence>
-            <xsd:element name="ServerStatusCode" type="xsd:string" />
-            <xsd:element name="Severity" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BankAcctTrnRec_Type">
-        <xsd:sequence>
-            <xsd:element name="TrnType" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PostedDt" type="xsd:string" />
-            <xsd:element name="OrigDt" type="xsd:string" minOccurs="0" />
-            <xsd:element name="CurAmt" type="CurrencyAmount" />
-            <xsd:element name="BillRefInfo" type="xsd:string" minOccurs="0" />
-            <xsd:element name="CustPayeeInfo" type="CustPayeeInfo_Type" minOccurs="0" />
-            <xsd:element name="CSPRefId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BankInfo_Type">
-        <xsd:sequence>
-            <xsd:element name="BankIdType" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BankId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Name" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BranchId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BranchName" type="xsd:string" minOccurs="0" />
-            <xsd:element name="City" type="xsd:string" minOccurs="0" />
-            <xsd:element name="StateProv" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PostalCode" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Country" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BillerId_Type">
-        <xsd:sequence>
-            <xsd:element name="SPName" type="xsd:string" />
-            <xsd:element name="BillerNum" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BillerPayee_Type">
-        <xsd:sequence>
-            <xsd:element name="BillerId" type="BillerId_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CurrencyAmount">
-        <xsd:sequence>
-            <xsd:element name="Amt" type="xsd:decimal" />
-            <xsd:element name="CurCode" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CustPayeeInfo_Type">
-        <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Nickname" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BillerPayee" type="BillerPayee_Type" />
-            <xsd:element name="BillingAcct" type="xsd:string" minOccurs="0" />
-            <xsd:element name="AcctPayAcctId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnInqRq_Type">
-        <xsd:sequence>
-            <xsd:element name="TrnCountLimit" type="TrnCountLimit_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnInqRs_Type">
-        <xsd:sequence>
-            <xsd:sequence>
-                <xsd:element name="Status" type="Status_Type" />
-                <xsd:element name="DepAcctId" type="DepAcctId_Type" />
-                <xsd:element name="DepAcctTrnRec" type="DepAcctTrnRec_Type" minOccurs="0" maxOccurs="unbounded" />
-            </xsd:sequence>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnRec_Type">
-        <xsd:sequence>
-            <xsd:element name="BankAcctTrnRec" type="BankAcctTrnRec_Type" />
-            <xsd:element name="StmtRunningBal" type="CurrencyAmount" minOccurs="0" />
-            <xsd:element name="AvailDt" type="xsd:string" minOccurs="0" />
-            <xsd:element name="XferId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PmtId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctId_Type">
-        <xsd:sequence>
-            <xsd:element name="BankInfo" type="BankInfo_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="Status_Type">
-        <xsd:sequence>
-            <xsd:element name="StatusCode" type="xsd:int" />
-            <xsd:element name="StatusDesc" type="xsd:string" />
-            <xsd:element name="AdditionalStatus" type="AdditionalStatus_Type" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="TrnCountLimit_Type">
-        <xsd:sequence>
-            <xsd:element name="Count" type="xsd:int" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="DepAcctTrnInqRq" type="DepAcctTrnInqRq_Type" />
-    <xsd:element name="DepAcctTrnInqRs" type="DepAcctTrnInqRs_Type" />
-</xsd:schema>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
deleted file mode 100644
index 842f7a9d4c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:trninq="urn:ifxforum-org:XSD:1"

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

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

-    <types>

-        <xsd:schema elementFormDefault="qualified" targetNamespace="http://trninq">

-            <xsd:import namespace="urn:ifxforum-org:XSD:1" schemaLocation="IFX170_XSD.xsd" />

-        </xsd:schema>

-    </types>

-    <message name="DepAcctTrnInqRq">

-        <part name="messagePart" element="trninq:DepAcctTrnInqRq" />

-    </message>

-    <message name="DepAcctTrnInqRs">

-        <part name="messagePart" element="trninq:DepAcctTrnInqRs" />

-    </message>

-    <portType name="trninqInterface">

-        <operation name="DepAcctTrnInq">

-            <input message="tns:DepAcctTrnInqRq" />

-            <output message="tns:DepAcctTrnInqRs" />

-        </operation>

-    </portType>

-    <binding name="trninq" type="tns:trninqInterface">

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

-        <operation name="DepAcctTrnInq">

-            <soap:operation soapAction="trninq:DepAcctTrnInq" style="document" />

-            <input>

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

-            </input>

-            <output>

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

-            </output>

-        </operation>

-    </binding>

-    <service name="TrnInqSvc">

-        <port name="TrnInqSvcPort" binding="tns:trninq">

-            <soap:address location="http://localhost:8085/itest-large-sdo-ws/TrnInqService" />

-        </port>

-    </service>

-</definitions>

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
deleted file mode 100644
index 446105c67a..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package trninq;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.trninq.TrninqInterface;
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.ifxforum.xsd._1.TrnCountLimit_Type;
-import org.ifxforum.xsd._1._1Factory;
-import org.junit.Assert;
-import org.junit.Ignore;
-
-/**
- * This test is created to cover https://issues.apache.org/jira/browse/TUSCANY-1541
- * 
- * @version $Rev$ $Date$
- */
-public class TrnInqServiceTestCase extends TestCase {
-
-    private static SCADomain scaDomain;
-    private TrninqInterface trnInq;
-
-    @Override
-    protected void setUp() throws Exception {
-        if (scaDomain == null) {
-            scaDomain = SCADomain.newInstance("trnInq.composite");
-        }
-        trnInq = scaDomain.getService(TrninqInterface.class, "TransactionInquiryClientComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testDepAcctTrnInq() throws IOException {
-        DepAcctTrnInqRq_Type depAcctTrnInqRequest = _1Factory.INSTANCE.createDepAcctTrnInqRq_Type();
-        TrnCountLimit_Type trnCountLimit = _1Factory.INSTANCE.createTrnCountLimit_Type();
-        depAcctTrnInqRequest.setTrnCountLimit(trnCountLimit);
-        depAcctTrnInqRequest.getTrnCountLimit().setCount(2);
-
-        try {
-            DepAcctTrnInqRs_Type depAcctTrnInqResponse = trnInq.DepAcctTrnInq(depAcctTrnInqRequest);
-        } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            Assert.fail("Should pass with MaxRec 2! \n" + sw);
-            sw.close();
-            pw.close();
-        }
-
-        depAcctTrnInqRequest.getTrnCountLimit().setCount(10);
-        try {
-            DepAcctTrnInqRs_Type depAcctTrnInqResponse = trnInq.DepAcctTrnInq(depAcctTrnInqRequest);
-        } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            Assert.fail("Should pass with MaxRec 10! \n" + sw);
-            sw.close();
-            pw.close();
-        }
-    }
-}