Remove modules not include in build

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775818 13f79535-47bb-0310-9956-ffa450edef68
author: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-05-18 05:36:14 +0000
committer: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-05-18 05:36:14 +0000
commit: 52d2c2ca9573898a108a093f5b87d13ce53fa790 (patch)
tree: af91aba77efa579b51cdc1961827d001fb9cd0db /branches
parent: 3054c4dbd2a75ebc99b2c0af461a65fb0adf53cd (diff)
123 files changed, 0 insertions, 3935 deletions
diff --git a/branches/sca-java-1.5/itest/admin/README b/branches/sca-java-1.5/itest/admin/README
deleted file mode 100644
index c4e96d7af0..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/pom.xml b/branches/sca-java-1.5/itest/admin/pom.xml
deleted file mode 100644
index 8520c12fa5..0000000000
--- a/branches/sca-java-1.5/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.5-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.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    
-</project>
diff --git a/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
deleted file mode 100644
index b3d2137767..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
deleted file mode 100644
index 025302fb6d..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
deleted file mode 100644
index de480e6d85..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
deleted file mode 100644
index 8ff146b630..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
deleted file mode 100644
index 638c6aff8c..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
deleted file mode 100644
index bd820884e7..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
deleted file mode 100644
index fa2720001b..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
deleted file mode 100644
index eec64fa0d8..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
deleted file mode 100644
index d712662cb3..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/branches/sca-java-1.5/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
deleted file mode 100644
index 42fa3f0c41..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
deleted file mode 100644
index bcf4153064..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
deleted file mode 100644
index 747f71576c..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
deleted file mode 100644
index 6c2dffb7b4..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration1Composite.composite b/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration1Composite.composite
deleted file mode 100644
index 95dbbf0124..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration3Composite.composite b/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration3Composite.composite
deleted file mode 100644
index dd06d030d6..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/admin/src/test/resources/MySimpleService.composite b/branches/sca-java-1.5/itest/admin/src/test/resources/MySimpleService.composite
deleted file mode 100644
index a1f8abb8da..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/modules/binding-hessian/LICENSE b/branches/sca-java-1.5/modules/binding-hessian/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-
diff --git a/branches/sca-java-1.5/modules/binding-hessian/NOTICE b/branches/sca-java-1.5/modules/binding-hessian/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-1.5/modules/binding-hessian/pom.xml b/branches/sca-java-1.5/modules/binding-hessian/pom.xml
deleted file mode 100644
index 45ccadce07..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing pehessianssions and limitations
- * under the License.
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-hessian</artifactId>
-    <name>Apache Tuscany SCA Hessian Binding Extension</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.caucho</groupId>
-            <artifactId>hessian</artifactId>
-            <version>3.1.5</version>
-        </dependency>
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>  
-            <scope>provided</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.binding.hessian</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.hessian*</Export-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBinding.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBinding.java
deleted file mode 100644
index 7f90d78424..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBinding.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.binding.hessian.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-public class HessianBinding implements Binding {
-
-    // properties required to implement the Tuscany
-    // binding extension SPI
-    private String uri = null;
-    private String name = null;
-    private boolean unresolved = false;
-    private List<Object> extensions = new ArrayList<Object>();
-
-    public HessianBinding() {
-        super();
-    }
-
-    /**
-     * Returns the binding URI.
-     * 
-     * @return the binding URI
-     */
-    public String getURI() {
-        return this.uri;
-    }
-
-    /**
-     * Sets the binding URI.
-     * 
-     * @param uri the binding URI
-     */
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    /**
-     * Returns the binding name.
-     * 
-     * @return the binding name
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Sets the binding name.
-     * 
-     * @param name the binding name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean isUnresolved() {
-        return this.unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    /**
-     * Clone the binding
-     */
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBindingException.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBindingException.java
deleted file mode 100644
index 456f0d11ba..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBindingException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.binding.hessian.impl;
-
-public class HessianBindingException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public HessianBindingException() {
-        super();
-    }
-
-    public HessianBindingException(String arg0, Throwable arg1) {
-        super(arg0, arg1);
-    }
-
-    public HessianBindingException(String arg0) {
-        super(arg0);
-    }
-
-    public HessianBindingException(Throwable arg0) {
-        super(arg0);
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBindingProcessor.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBindingProcessor.java
deleted file mode 100644
index f5564b926b..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/impl/HessianBindingProcessor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.hessian.impl;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-public class HessianBindingProcessor implements StAXArtifactProcessor<HessianBinding> {
-
-    private QName BINDING_HESSIAN = new QName("http://hessian", "binding.hessian");
-
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private Monitor monitor;
-
-    public HessianBindingProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem =
-                new ProblemImpl(this.getClass().getName(), "binding-hessian-validation-messages", Severity.WARNING,
-                                model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem =
-                new ProblemImpl(this.getClass().getName(), "binding-hessian-validation-messages", Severity.ERROR,
-                                model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    public QName getArtifactType() {
-        return BINDING_HESSIAN;
-    }
-
-    public Class<HessianBinding> getModelType() {
-        return HessianBinding.class;
-    }
-
-    public HessianBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        HessianBinding hessianBinding = new HessianBinding();
-
-        // Read policies
-        policyProcessor.readPolicies(hessianBinding, reader);
-
-        // Read binding name
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null) {
-            hessianBinding.setName(name);
-        }
-
-        // Read binding URI
-        String uri = reader.getAttributeValue(null, "uri");
-        if (uri != null) {
-            hessianBinding.setURI(uri);
-        }
-
-        return hessianBinding;
-    }
-
-    public void resolve(HessianBinding model, ModelResolver resolver) throws ContributionResolveException {
-    }
-
-    public void write(HessianBinding hessianBinding, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-        policyProcessor.writePolicyPrefixes(hessianBinding, writer);
-        writer.writeStartElement(BINDING_HESSIAN.getNamespaceURI(), BINDING_HESSIAN.getLocalPart());
-        policyProcessor.writePolicyAttributes(hessianBinding, writer);
-
-        if (hessianBinding.getName() != null) {
-            writer.writeAttribute("name", hessianBinding.getName());
-        }
-
-        if (hessianBinding.getURI() != null) {
-            writer.writeAttribute("uri", hessianBinding.getURI());
-        }
-
-        writer.writeEndElement();
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianBindingInvoker.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianBindingInvoker.java
deleted file mode 100644
index 9d6ede2dbc..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianBindingInvoker.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.binding.hessian.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.binding.hessian.impl.HessianBinding;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-import com.caucho.hessian.client.HessianProxyFactory;
-
-public class HessianBindingInvoker implements Invoker {
-
-    private String serviceURL;
-    private Interface homeImpl;
-
-    HessianBindingInvoker(Interface homeImpl, HessianBinding binding) {
-        this.serviceURL = binding.getURI();
-        this.homeImpl = homeImpl;
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            Method method = ((JavaOperation)msg.getOperation()).getJavaMethod();
-            Object[] args = msg.getBody();
-
-            HessianProxyFactory proxyFactory = new HessianProxyFactory();
-            Object service = proxyFactory.create(loadClass(homeImpl.toString()), serviceURL);
-            Object result = null;
-            result = method.invoke(service, args);
-            msg.setBody(result);
-        } catch (Throwable e) {
-            e.printStackTrace();
-            if (e instanceof InvocationTargetException)
-                e = ((InvocationTargetException)e).getTargetException();
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }
-
-    private Class loadClass(String className) {
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        try {
-            if (loader != null)
-                return Class.forName(className, false, loader);
-            else
-                return Class.forName(className);
-        } catch (Exception e) {
-
-        }
-        return null;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianBindingProviderFactory.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianBindingProviderFactory.java
deleted file mode 100644
index 77a5f6f675..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianBindingProviderFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.hessian.provider;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.hessian.impl.HessianBinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-public class HessianBindingProviderFactory implements BindingProviderFactory<HessianBinding> {
-
-    private MessageFactory messageFactory;
-    private ServletHost servletHost;
-
-    public HessianBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        List<ServletHost> hosts = servletHosts.getServletHosts();
-        if (!hosts.isEmpty()) {
-            this.servletHost = hosts.get(0);
-        }
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        messageFactory = modelFactories.getFactory(MessageFactory.class);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   HessianBinding binding) {
-        return new HessianReferenceBindingProvider(component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               HessianBinding binding) {
-        return new HessianServiceBindingProvider(component, service, binding, messageFactory, servletHost);
-    }
-
-    public Class<HessianBinding> getModelType() {
-        return HessianBinding.class;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianReferenceBindingProvider.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianReferenceBindingProvider.java
deleted file mode 100644
index 27711932d7..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianReferenceBindingProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.hessian.provider;
-
-import org.apache.tuscany.sca.binding.hessian.impl.HessianBinding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-public class HessianReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private RuntimeComponentReference reference;
-    private HessianBinding hessianBinding;
-
-    public HessianReferenceBindingProvider(RuntimeComponent component,
-                                           RuntimeComponentReference reference,
-                                           HessianBinding binding) {
-        this.reference = reference;
-        this.hessianBinding = binding;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return new HessianBindingInvoker(getBindingInterfaceContract().getInterface(), hessianBinding);
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    public void start() {
-
-    }
-
-    public void stop() {
-
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianServiceBindingProvider.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianServiceBindingProvider.java
deleted file mode 100644
index 3e4922dc13..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianServiceBindingProvider.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.hessian.provider;
-
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-
-import org.apache.tuscany.sca.binding.hessian.impl.HessianBinding;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-public class HessianServiceBindingProvider implements ServiceBindingProvider {
-    private static final Logger logger = Logger.getLogger(HessianServiceBindingProvider.class.getName());
-
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private HessianBinding hessianBinding;
-    private MessageFactory messageFactory;
-    private ServletHost servletHost;
-    private String servletMapping;
-
-    public HessianServiceBindingProvider(RuntimeComponent component,
-                                         RuntimeComponentService service,
-                                         HessianBinding binding,
-                                         MessageFactory messageFactory,
-                                         ServletHost servletHost) {
-        this.component = component;
-        this.service = service;
-        this.hessianBinding = binding;
-        this.messageFactory = messageFactory;
-        this.servletHost = servletHost;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public void start() {
-        Servlet servlet = null;
-        Interface homeImpl = service.getInterfaceContract().getInterface();
-        RuntimeWire wire = service.getRuntimeWire(hessianBinding);
-        servlet = new HessianServiceListenerServlet(homeImpl, wire, messageFactory);
-
-        if (servlet == null) {
-            throw new IllegalStateException("No get or service method found on the service");
-        }
-
-        servletMapping = hessianBinding.getURI();
-        servletHost.addServletMapping(servletMapping, servlet);
-
-        // Save the actual binding URI in the binding
-        hessianBinding.setURI(servletHost.getURLMapping(hessianBinding.getURI()).toString());
-    }
-
-    public void stop() {
-        servletHost.removeServletMapping(servletMapping);
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianServiceListenerServlet.java b/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianServiceListenerServlet.java
deleted file mode 100644
index de9b4927c6..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/java/org/apache/tuscany/sca/binding/hessian/provider/HessianServiceListenerServlet.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 2001-2008 Caucho Technology, Inc.  All rights reserved.
- *
- * The Apache Software License, Version 1.1
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Caucho Technology (http://www.caucho.com/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "Hessian", "Resin", and "Caucho" must not be used to
- *    endorse or promote products derived from this software without prior
- *    written permission. For written permission, please contact
- *    info@caucho.com.
- *
- * 5. Products derived from this software may not be called "Resin"
- *    nor may "Resin" appear in their names without prior written
- *    permission of Caucho Technology.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL CAUCHO TECHNOLOGY OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @author Scott Ferguson
- */
-
-package org.apache.tuscany.sca.binding.hessian.provider;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-import com.caucho.hessian.io.AbstractHessianInput;
-import com.caucho.hessian.io.AbstractHessianOutput;
-import com.caucho.hessian.io.Hessian2Input;
-import com.caucho.hessian.io.Hessian2Output;
-import com.caucho.hessian.io.HessianOutput;
-import com.caucho.hessian.io.SerializerFactory;
-import com.caucho.services.server.ServiceContext;
-
-/**
- * Servlet for serving Hessian services.
- */
-public class HessianServiceListenerServlet extends GenericServlet {
-
-    private static final Logger logger = Logger.getLogger(HessianServiceListenerServlet.class.getName());
-
-    private Interface homeImpl;
-    private RuntimeWire wire;
-    private MessageFactory messageFactory;
-
-    private SerializerFactory _serializerFactory;
-
-    private Map<String, JavaOperation> _operationMap = new Hashtable<String, JavaOperation>();
-
-    public HessianServiceListenerServlet(Interface homeImpl, RuntimeWire wire, MessageFactory messageFactory) {
-        this.homeImpl = homeImpl;
-        this.wire = wire;
-        this.messageFactory = messageFactory;
-
-        List<Operation> operations = homeImpl.getOperations();
-        for (int i = 0; i < operations.size(); i++) {
-            JavaOperation op = (JavaOperation)operations.get(i);
-            Method method = op.getJavaMethod();
-            if (_operationMap.get(method.getName()) == null)
-                _operationMap.put(method.getName(), op);
-
-            Class[] param = method.getParameterTypes();
-            String mangledName = method.getName() + "__" + param.length;
-            _operationMap.put(mangledName, op);
-            _operationMap.put(mangleName(method, false), op);
-        }
-    }
-
-    public String getServletInfo() {
-        return "Tuscany Binding Hessian Servlet";
-    }
-
-    /**
-     * Sets the serializer factory.
-     */
-    public void setSerializerFactory(SerializerFactory factory) {
-        _serializerFactory = factory;
-    }
-
-    /**
-     * Gets the serializer factory.
-     */
-    public SerializerFactory getSerializerFactory() {
-        if (_serializerFactory == null)
-            _serializerFactory = new SerializerFactory();
-
-        return _serializerFactory;
-    }
-
-    /**
-     * Sets the serializer send collection java type.
-     */
-    public void setSendCollectionType(boolean sendType) {
-        getSerializerFactory().setSendCollectionType(sendType);
-    }
-
-    /**
-     * Execute a request. The path-info of the request selects the bean. Once
-     * the bean's selected, it will be applied.
-     */
-    public void service(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-        HttpServletRequest req = (HttpServletRequest)request;
-        HttpServletResponse res = (HttpServletResponse)response;
-
-        if (!req.getMethod().equals("POST")) {
-            res.setStatus(500, "Hessian Requires POST");
-            PrintWriter out = res.getWriter();
-            res.setContentType("text/html");
-            out.println("<h1>Hessian Requires POST</h1>");
-            return;
-        }
-
-        String serviceId = req.getPathInfo();
-        String objectId = req.getParameter("id");
-        if (objectId == null)
-            objectId = req.getParameter("ejbid");
-
-        ServiceContext.begin(req, serviceId, objectId);
-
-        try {
-            InputStream is = request.getInputStream();
-            OutputStream os = response.getOutputStream();
-
-            Hessian2Input in = new Hessian2Input(is);
-            AbstractHessianOutput out;
-
-            SerializerFactory serializerFactory = getSerializerFactory();
-
-            in.setSerializerFactory(serializerFactory);
-
-            int code = in.read();
-
-            if (code != 'c') {
-                // XXX: deflate
-                throw new IOException("expected 'c' in hessian input at " + code);
-            }
-
-            int major = in.read();
-            int minor = in.read();
-
-            if (major >= 2)
-                out = new Hessian2Output(os);
-            else
-                out = new HessianOutput(os);
-
-            out.setSerializerFactory(serializerFactory);
-
-            invoke(in, out);
-
-            out.close();
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (ServletException e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new ServletException(e);
-        } finally {
-            ServiceContext.end();
-        }
-    }
-
-    private String mangleName(Method method, boolean isFull) {
-        StringBuffer sb = new StringBuffer();
-        sb.append(method.getName());
-        Class[] params = method.getParameterTypes();
-        for (int i = 0; i < params.length; i++) {
-            sb.append('_');
-            sb.append(mangleClass(params[i], isFull));
-        }
-        return sb.toString();
-    }
-
-    private String mangleClass(Class cl, boolean isFull) {
-        String name = cl.getName();
-        if (name.equals("boolean") || name.equals("java.lang.Boolean"))
-            return "boolean";
-        else if (name.equals("int") || name.equals("java.lang.Integer")
-            || name.equals("short")
-            || name.equals("java.lang.Short")
-            || name.equals("byte")
-            || name.equals("java.lang.Byte"))
-            return "int";
-        else if (name.equals("long") || name.equals("java.lang.Long"))
-            return "long";
-        else if (name.equals("float") || name.equals("java.lang.Float")
-            || name.equals("double")
-            || name.equals("java.lang.Double"))
-            return "double";
-        else if (name.equals("java.lang.String") || name.equals("com.caucho.util.CharBuffer")
-            || name.equals("char")
-            || name.equals("java.lang.Character")
-            || name.equals("java.io.Reader"))
-            return "string";
-        else if (name.equals("java.util.Date") || name.equals("com.caucho.util.QDate"))
-            return "date";
-        else if (InputStream.class.isAssignableFrom(cl) || name.equals("[B"))
-            return "binary";
-        else if (cl.isArray()) {
-            return "[" + mangleClass(cl.getComponentType(), isFull);
-        } else if (name.equals("org.w3c.dom.Node") || name.equals("org.w3c.dom.Element")
-            || name.equals("org.w3c.dom.Document"))
-            return "xml";
-        else if (isFull)
-            return name;
-        else {
-            int p = name.lastIndexOf('.');
-            if (p > 0)
-                return name.substring(p + 1);
-            else
-                return name;
-        }
-    }
-
-    public void invoke(AbstractHessianInput in, AbstractHessianOutput out) throws Exception {
-        ServiceContext context = ServiceContext.getContext();
-
-        // backward compatibility for some frameworks that don't read
-        // the call type first
-        in.skipOptionalCall();
-
-        String header;
-        while ((header = in.readHeader()) != null) {
-            Object value = in.readObject();
-            context.addHeader(header, value);
-        }
-
-        String methodName = in.readMethod();
-        Method method = null;
-        JavaOperation operation = _operationMap.get(methodName);
-        if (operation != null)
-            method = operation.getJavaMethod();
-
-        if (method != null) {
-        } else if ("_hessian_getAttribute".equals(methodName)) {
-            String attrName = in.readString();
-            in.completeCall();
-            String value = null;
-            if ("java.api.class".equals(attrName))
-                value = homeImpl.toString();
-            else if ("java.home.class".equals(attrName))
-                value = homeImpl.toString();
-            else if ("java.object.class".equals(attrName))
-                value = homeImpl.toString();
-            out.startReply();
-            out.writeObject(value);
-            out.completeReply();
-            return;
-        } else if (method == null) {
-            out.startReply();
-            out.writeFault("NoSuchMethodException", "The service has no method named: " + in.getMethod(), null);
-            out.completeReply();
-            return;
-        }
-
-        Class[] args = method.getParameterTypes();
-        Object[] values = new Object[args.length];
-
-        for (int i = 0; i < args.length; i++) {
-            values[i] = in.readObject(args[i]);
-        }
-
-        Object result = null;
-        try {
-            Message msg = messageFactory.createMessage();
-            msg.setOperation(operation);
-            msg.setBody(values);
-            result = wire.invoke(operation, msg);
-        } catch (Throwable e) {
-            while (e instanceof InvocationTargetException)
-                e = ((InvocationTargetException)e).getTargetException();
-            out.startReply();
-            out.writeFault("ServiceException", e.getMessage(), e);
-            out.completeReply();
-            return;
-        }
-
-        // The complete call needs to be after the invoke to handle a
-        // trailing InputStream
-        in.completeCall();
-        out.startReply();
-        out.writeObject(result);
-        out.completeReply();
-        out.close();
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 1bbe97e514..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.hessian.impl.HessianBindingProcessor;qname=http://hessian#binding.hessian,model=org.apache.tuscany.sca.binding.hessian.impl.HessianBinding
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index dfd4823a13..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License. 
-
-# URI of the XML schema to be used for validation
-binding-hessian.xsd
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 244449ddf0..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License. 
-
-# Implementation class for the binding extension
-org.apache.tuscany.sca.binding.hessian.provider.HessianBindingProviderFactory;model=org.apache.tuscany.sca.binding.hessian.impl.HessianBinding
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/binding-hessian.xsd b/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/binding-hessian.xsd
deleted file mode 100644
index 01d7437878..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/main/resources/binding-hessian.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://hessian" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:e="http://hessian" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
-
-    <element name="binding.hessian" type="e:HessianBinding"/>
-    
-    <complexType name="HessianBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/FirstImpl.java b/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/FirstImpl.java
deleted file mode 100644
index b60c41397b..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/FirstImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.zhulei.test.hessian.first;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FirstImpl implements IFirst {
-
-    public String getString(String str) {
-        return str + "_first";
-    }
-
-    public List<String> getData(String str1, String str2) {
-        List<String> list = new ArrayList<String>();
-        list.add(str1 + "_first");
-        list.add(str2 + "_first");
-        return list;
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/FirstTestCase.java b/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/FirstTestCase.java
deleted file mode 100644
index 919cbe90ff..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/FirstTestCase.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.zhulei.test.hessian.first;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.caucho.hessian.client.HessianProxyFactory;
-
-/**
- * 
- */
-public class FirstTestCase {
-    private static SCANode node;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("first_hessian.composite", null);
-        node.start();
-    }
-    
-    @Test
-    public void testServer() throws IOException {
-        try {
-            HessianProxyFactory proxyFactory = new HessianProxyFactory();
-            IFirst service = (IFirst)proxyFactory.create(IFirst.class, "http://localhost:8085/hessian1");
-            List<String> datas = service.getData("123", "ABC");
-            for (int i = 0; i < datas.size(); i++) {
-                System.out.println(datas.get(i));
-            }
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        node.stop();
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/IFirst.java b/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/IFirst.java
deleted file mode 100644
index a346214ebb..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/first/IFirst.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.zhulei.test.hessian.first;
-
-import java.util.List;
-
-public interface IFirst {
-
-    public String getString(String str);
-
-    public List<String> getData(String str1, String str2);
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/ISecond.java b/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/ISecond.java
deleted file mode 100644
index 0130d84658..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/ISecond.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.zhulei.test.hessian.second;
-
-public interface ISecond {
-
-    public String getString(String str);
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/SecondImpl.java b/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/SecondImpl.java
deleted file mode 100644
index 9df4fb91d6..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/SecondImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.zhulei.test.hessian.second;
-
-import org.osoa.sca.annotations.Reference;
-import org.zhulei.test.hessian.first.IFirst;
-
-public class SecondImpl implements ISecond {
-
-    private IFirst first;
-
-    public String getString(String str) {
-        return first.getString(str) + "_second";
-    }
-
-    @Reference
-    public void setFirst(IFirst first) {
-        this.first = first;
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/SecondTestCase.java b/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/SecondTestCase.java
deleted file mode 100644
index f390d5b104..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/java/org/zhulei/test/hessian/second/SecondTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.zhulei.test.hessian.second;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.caucho.hessian.client.HessianProxyFactory;
-
-/**
- * 
- */
-public class SecondTestCase {
-    private static SCANode node1;
-    private static SCANode node2;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        node1 = SCANodeFactory.newInstance().createSCANodeFromClassLoader("second_hessian.composite", null);
-        node1.start();
-        
-        node2 = SCANodeFactory.newInstance().createSCANodeFromClassLoader("first_hessian.composite", null);
-        node2.start();
-    }
-    
-    @Test
-    public void testServer() throws IOException {
-        try {
-            HessianProxyFactory proxyFactory = new HessianProxyFactory();
-            ISecond service = (ISecond)proxyFactory.create(ISecond.class, "http://localhost:8085/hessian2");
-            String str = service.getString("XYZ");
-            System.out.println(str);
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        node1.stop();
-        node2.stop();
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/resources/first_hessian.composite b/branches/sca-java-1.5/modules/binding-hessian/src/test/resources/first_hessian.composite
deleted file mode 100644
index fd3eefaeaa..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/resources/first_hessian.composite
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-	xmlns:e="http://hessian"
-	targetNamespace="http://FirstHessianSCA"
-	name="FirstHessianSCA">
-
-	<component name="FirstHessianComponent">
-		<implementation.java
-			class="org.zhulei.test.hessian.first.FirstImpl" />
-	</component>
- 	
-	<service name="Hessian"
-		promote="FirstHessianComponent">
-		<interface.java
-			interface="org.zhulei.test.hessian.first.IFirst" />
-		<e:binding.hessian uri="/hessian1" />
-	</service>
-
-</composite>
diff --git a/branches/sca-java-1.5/modules/binding-hessian/src/test/resources/second_hessian.composite b/branches/sca-java-1.5/modules/binding-hessian/src/test/resources/second_hessian.composite
deleted file mode 100644
index e502aac8be..0000000000
--- a/branches/sca-java-1.5/modules/binding-hessian/src/test/resources/second_hessian.composite
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-	xmlns:e="http://hessian"
-	targetNamespace="http://FirstHessianSCA"
-	name="FirstHessianSCA">
-
-	<component name="SecondHessianComponent">
-		<implementation.java
-			class="org.zhulei.test.hessian.second.SecondImpl" />
-		<reference name="first">
-			<interface.java
-				interface="org.zhulei.test.hessian.first.IFirst" />
-			<e:binding.hessian
-				uri="http://localhost:8085/hessian1" />
-		</reference>
-	</component>
- 	
-	<service name="Hessian"
-		promote="SecondHessianComponent">
-		<interface.java
-			interface="org.zhulei.test.hessian.second.ISecond" />
-		<e:binding.hessian uri="/hessian2" />
-	</service>
-
-</composite>
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/LICENSE b/branches/sca-java-1.5/modules/implementation-openjpa/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/NOTICE b/branches/sca-java-1.5/modules/implementation-openjpa/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/README b/branches/sca-java-1.5/modules/implementation-openjpa/README
deleted file mode 100644
index ff6ee6a8f4..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/README
+++ /dev/null
@@ -1,33 +0,0 @@
-Tuscany implementation OpenJpa
-===============================
-Persistence technology is a very part of enterprise level application system. Tuscany has provided 
-SDO implementation and a non standard but useful DAS infrastructure.
-But Tuscany also considered much existed software resource has used popular technologies as 
-hibernate and jpa.
-Hibernate has license problem so an implementation based on it can not be hosted by Apache.
-This implementation is developed on the bases of Tuscany��s robust extensible architecture and of 
-course the jpa implementation project: Apache OpenJPA.
-
-This module is under the process of more improvement:
-
-For the time being, user of this module could configure a component as did by the *.composite file 
-in this module. The component is infact a proxy of a JPA top api:
-	javax.persitence.EntityManager
-User of this module could use all the method provided by this interface.
-
-An difference is: OpenJPA could work with 2PC only if there is JNDI context and 
-TransactionManager registered in the JNDI. This module modified much to work with 
-policy-transaction module.
-
-For the time being, the Transaction boundary is located around one invocation of the EntityManager. But in the future, these boundary will move up to an component who references the EntityManager, that will be the righteous way for SCA developers!
-
-The data base working in this module is now Derby, it is for the ease of test running. MySQL 
-could also work with this module, but it need database deployment in before. Not all types of database could work with this module, such as HSql, it did not provided a XA DataSource implementation up to now.
-
-There are much powerful features provided by openjpa, such as table auto generation, it is now also working in this module.
-
-User could get start from looking at what is done by:
-??org.apache.tuscany.sca.implementation.openjpa.ImplJpaTestCase 
-??and
-??openjpa.composite
-When running the testcase, a RuntimeException stack trace(from inside openjpa api) will get printed on your screen, it is just ok, because of a trying of duplication primary key insertion, and it causes transaction rolling back.
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/pom.xml b/branches/sca-java-1.5/modules/implementation-openjpa/pom.xml
deleted file mode 100644
index 5918496b06..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT 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-modules</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-jpa</artifactId>
-    <name>Apache Tuscany SCA OpenJPA Implementation Extension</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-assembly</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-core</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-contribution-impl</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-policy-transaction</artifactId>
-			<version>1.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.3.1.4</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_3.0_spec</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-	</dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.openjpa</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.openjpa*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
deleted file mode 100644
index c1ed6b4e58..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import java.util.Properties;
-
-import org.apache.openjpa.persistence.PersistenceUnitInfoImpl;
-import org.apache.tuscany.sca.assembly.Implementation;
-
-public interface JPAImplementation extends Implementation {
-    
-    void setPersistenceUnitInfoImpl(PersistenceUnitInfoImpl buii);
-
-    PersistenceUnitInfoImpl getPersistenceUnitInfoImpl();
-
-    void setDataSourceMeta(Properties p);
-
-    Properties getDataSourceMeta();
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
deleted file mode 100644
index a5812b26e4..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-public interface JPAImplementationFactory {
-    JPAImplementation createOpenJpaImplementation();
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
deleted file mode 100644
index 7ddd30047a..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/JPAImplementationProcessor.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import java.util.Properties;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.openjpa.persistence.PersistenceUnitInfoImpl;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.implementation.openjpa.impl.JPAImplementationFactoryImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-public class JPAImplementationProcessor implements StAXArtifactProcessor<JPAImplementation> {
-    private final QName QNAME = new QName(Constants.SCA10_TUSCANY_NS, "implementation.jpa");
-    private QName DS = new QName(Constants.SCA10_TUSCANY_NS, "datasource");
-
-    private JPAImplementationFactory jpaFactory;
-    private Log log = LogFactory.getLog(this.getClass());
-    private StAXArtifactProcessor<PersistenceUnitInfoImpl> puiiProcessor;
-
-    public JPAImplementationProcessor(ModelFactoryExtensionPoint modelFactories) {
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-
-        this.jpaFactory = new JPAImplementationFactoryImpl(assemblyFactory, javaFactory);
-        this.puiiProcessor = new PersistenceUnitInfoImplProcessor(modelFactories);
-    }
-
-    public Class<JPAImplementation> getModelType() {
-        return JPAImplementation.class;
-    }
-
-    public QName getArtifactType() {
-        return QNAME;
-    }
-
-    public JPAImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        assert QNAME.equals(reader.getName());
-        JPAImplementation implementation = jpaFactory.createOpenJpaImplementation();
-
-        implementation.setPersistenceUnitInfoImpl(puiiProcessor.read(reader));
-        Properties dsmeta = new Properties();
-        do {
-            int event = reader.next();
-            if (event == XMLStreamConstants.START_ELEMENT) {
-                if (!reader.getName().equals(DS)) {
-                    dsmeta.setProperty(reader.getName().getLocalPart(), reader.getElementText());
-                }
-            } else if (event == XMLStreamConstants.END_ELEMENT && reader.getName().equals(DS)) {
-                implementation.setDataSourceMeta(dsmeta);
-                break;
-            }
-        } while (true);
-
-        return implementation;
-
-    }
-
-    public void write(JPAImplementation model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        // TODO Auto-generated method stub
-
-    }
-    
-    public void resolve(JPAImplementation model, ModelResolver resolver) throws ContributionResolveException {
-
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
deleted file mode 100644
index d6e8276f25..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/PersistenceUnitInfoImplProcessor.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.openjpa.persistence.PersistenceUnitInfoImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-
-public class PersistenceUnitInfoImplProcessor implements StAXArtifactProcessor<PersistenceUnitInfoImpl> {
-    private QName P_U = new QName(Constants.SCA10_TUSCANY_NS, "persistence-unit");
-    private QName BrokerFactory = new QName(Constants.SCA10_TUSCANY_NS, "jpa.BrokerFactory");
-    private QName CLASS = new QName(Constants.SCA10_TUSCANY_NS, "class");
-    private QName TRAN_MD = new QName(Constants.SCA10_TUSCANY_NS, "jpa.TransactionMode");
-    private QName LOG = new QName(Constants.SCA10_TUSCANY_NS, "jpa.Log");
-    private QName SYNCHRON = new QName(Constants.SCA10_TUSCANY_NS, "jpa.jdbc.SynchronizeMappings");
-
-    public PersistenceUnitInfoImplProcessor(ModelFactoryExtensionPoint modelFactories) {
-
-    }
-
-    public QName getArtifactType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public PersistenceUnitInfoImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        PersistenceUnitInfoImpl _info = new PersistenceUnitInfoImpl();
-
-        while (true) {
-            int event = reader.next();
-            switch (event) {
-
-                case XMLStreamConstants.START_ELEMENT:
-                    QName qn = reader.getName();
-                    /*
-                     * if (qn.equals(BrokerFactory)) {
-                     * _info.setProperty("openjpa.BrokerFactory", reader
-                     * .getElementText()); }
-                     */
-                    if (qn.equals(CLASS)) {
-                        _info.addManagedClassName(reader.getElementText());
-
-                    } else if (qn.equals(P_U)) {
-                        _info.setPersistenceUnitName(reader.getAttributeValue(null, "name"));
-                    } else {
-                        _info.setProperty(qn.getLocalPart(), reader.getElementText());
-                    } /*
-                         * else if (qn.equals(LOG)) {
-                         * _info.setProperty("openjpa.Log",
-                         * reader.getElementText()); } else if
-                         * (qn.equals(SYNCHRON)) {
-                         * _info.setProperty("openjpa.jdbc.SynchronizeMappings",
-                         * reader.getElementText()); }
-                         */
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    if (reader.getName().equals(P_U))
-                        return _info;
-            }
-        }
-    }
-
-    public void write(PersistenceUnitInfoImpl model, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Class<PersistenceUnitInfoImpl> getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void resolve(PersistenceUnitInfoImpl model, ModelResolver resolver) throws ContributionResolveException {
-        // TODO Auto-generated method stub
-
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
deleted file mode 100644
index c4b14a1a90..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import javax.sql.XAConnection;
-import javax.transaction.TransactionManager;
-
-import org.apache.derby.jdbc.*;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.kernel.AbstractBrokerFactory;
-import org.apache.openjpa.kernel.StoreManager;
-import org.apache.openjpa.lib.conf.ConfigurationProvider;
-import java.util.*;
-import org.apache.commons.logging.*;
-import org.apache.openjpa.jdbc.meta.MappingTool;
-import org.apache.openjpa.jdbc.conf.*;
-import org.apache.openjpa.meta.*;
-
-public class TuscanyBrokerFactory extends AbstractBrokerFactory {
-	private Log log = LogFactory.getLog(this.getClass());
-    protected TuscanyBrokerFactory(OpenJPAConfiguration conf) {
-        super(conf);
-		if (buildSchema != null && buildSchema.equals("buildSchema")) {
-			MappingTool tool = new MappingTool((JDBCConfiguration) conf,
-					(String) buildSchema, false);
-			Collection classes = meta.loadPersistentTypes(false, this
-					.getClass().getClassLoader());
-			for (Iterator itr = classes.iterator(); itr.hasNext();) {
-				tool.run((Class) itr.next());
-			}
-			log
-					.info("creating database and tables accroding to class mappings...");
-			tool.record();
-		}
-    }
-
-    private XAConnection xaconn;
-
-    @Override
-    protected StoreManager newStoreManager() {
-        try {
-            if (xaconn == null) {
-                if (cp.getProperties().get("dbtype").equals("Derby")) {
-                    EmbeddedXADataSource xads = new EmbeddedXADataSource();
-                    xads.setDatabaseName((String)cp.getProperties().get("dbname"));
-        
-                    xaconn = xads.getXAConnection();
-                }
-
-                System.out.println("------------TuscanyBrokerFactory.newStoreManager....");
-
-            }
-            return new TuscanyStoreManager(xaconn);
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private static TransactionManager tm;
-    private static ConfigurationProvider cp;
-	private static Object buildSchema;
-	private static MetaDataRepository meta;
-
-    public static TuscanyBrokerFactory newInstance(ConfigurationProvider _cp) {
-        tm = (TransactionManager)_cp.getProperties().get("TransactionManager");
-		EmbeddedDataSource ds2 = null;
-		if (_cp.getProperties().get("dbtype").equals("Derby")) {
-			ds2 = new EmbeddedDataSource();
-			ds2.setDatabaseName((String) _cp.getProperties().get("dbname"));
-			ds2.setCreateDatabase((String) _cp.getProperties().get("dbcreate"));
-		}
-        TuscanyJDBCConfigurationImpl conf = new TuscanyJDBCConfigurationImpl(tm, ds2);
-        _cp.setInto(conf);
-		buildSchema = _cp.getProperties().get(
-				"openjpa.jdbc.SynchronizeMappings");
-
-		meta = conf.getMetaDataRepositoryInstance();
-        cp = _cp;
-        return new TuscanyBrokerFactory(conf);
-    }
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
deleted file mode 100644
index f5972142de..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyBrokerImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.openjpa.ee.ManagedRuntime;
-import org.apache.openjpa.kernel.BrokerImpl;
-
-public class TuscanyBrokerImpl extends BrokerImpl {
-    private TransactionManager tm;
-    
-    public TuscanyBrokerImpl(TransactionManager tm) {
-        this.tm = tm;
-    }
-    
-    public ManagedRuntime getManagedRuntime() {
-        return new TuscanyManagerRuntime(tm);
-    }
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
deleted file mode 100644
index 820121824a..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.jdbc.sql.DerbyDictionary;
-import org.apache.openjpa.kernel.BrokerImpl;
-import org.apache.openjpa.lib.conf.Configurations;
-import javax.sql.*;
-import org.apache.openjpa.ee.*;
-import org.apache.openjpa.kernel.*;
-
-public class TuscanyJDBCConfigurationImpl extends JDBCConfigurationImpl {
-    private TransactionManager tm;
-
-    public TuscanyJDBCConfigurationImpl(TransactionManager tm,DataSource _ds) {
-        this.tm = tm;
-		ds2 = _ds;
-    }
-    public ManagedRuntime getManagedRuntimeInstance() {
-		return new TuscanyManagerRuntime(tm);
-	}
-
-    public Object getConnectionFactory() {
-        return null;
-    }
- 
-    public DBDictionary getDBDictionaryInstance() {
-        DerbyDictionary dd = new DerbyDictionary();
-        Configurations.configureInstance(dd, this, "", "");
-        return dd;
-    }
-	private DataSource ds2;
-	@Override
-	public DataSource getDataSource2(StoreContext ctx) {
-	
-		return ds2;
-	}
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
deleted file mode 100644
index 2fb35f83a1..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyManagerRuntime.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
-import org.apache.openjpa.ee.ManagedRuntime;
-
-public class TuscanyManagerRuntime implements ManagedRuntime{
-	public TuscanyManagerRuntime(TransactionManager tm){
-		this.tm = tm;
-	}
-	public Throwable getRollbackCause() throws Exception {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Object getTransactionKey() throws Exception, SystemException {
-		// TODO Auto-generated method stub
-		return "Geng";
-	}
-	private TransactionManager tm;
-	public TransactionManager getTransactionManager() throws Exception {
-		
-		
-		return tm;
-	}
-
-	public void setRollbackOnly(Throwable cause) throws Exception {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
deleted file mode 100644
index 441ba666d7..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyStoreManager.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.XAConnection;
-
-import org.apache.openjpa.jdbc.kernel.JDBCStoreManager;
-
-public class TuscanyStoreManager extends JDBCStoreManager {
-    private XAConnection xaconn;
-
-    public TuscanyStoreManager(XAConnection xaconn) {
-        this.xaconn = xaconn;
-    }
-
-    protected _RefCountConnection connectInternal() throws SQLException {
-        Connection conn = xaconn.getConnection();
-        // conn.setAutoCommit(false);
-        _RefCountConnection rc = new _RefCountConnection(conn);
-        return rc;
-    }
-
-    class _RefCountConnection extends RefCountConnection {
-        public _RefCountConnection(Connection conn) {
-
-            super(conn);
-        }
-    }
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
deleted file mode 100644
index 2a7d1abd70..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationFactoryImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.openjpa.*;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-public class JPAImplementationFactoryImpl implements JPAImplementationFactory {
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-
-    public JPAImplementationFactoryImpl(AssemblyFactory aF, JavaInterfaceFactory javaIF) {
-        this.assemblyFactory = aF;
-        this.javaFactory = javaIF;
-    }
-
-    public JPAImplementation createOpenJpaImplementation() {
-        return new JPAImplementationImpl(assemblyFactory, javaFactory);
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
deleted file mode 100644
index 055ecd4a4d..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/impl/JPAImplementationImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa.impl;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-
-import org.apache.openjpa.persistence.PersistenceUnitInfoImpl;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.implementation.openjpa.JPAImplementation;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-public class JPAImplementationImpl implements JPAImplementation {
-    private Service jpaService;
-    private PersistenceUnitInfoImpl puii;
-    private Properties dsmeta;
-
-    public void setPersistenceUnitInfoImpl(PersistenceUnitInfoImpl puii) {
-        this.puii = puii;
-    }
-
-    public PersistenceUnitInfoImpl getPersistenceUnitInfoImpl() {
-        return this.puii;
-    }
-
-    public void setDataSourceMeta(Properties p) {
-        dsmeta = p;
-    }
-
-    public Properties getDataSourceMeta() {
-        return dsmeta;
-    }
-
-    JPAImplementationImpl(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) {
-
-        jpaService = assemblyFactory.createService();
-        jpaService.setName("EntityManager");
-        JavaInterface javaInterface;
-        try {
-            javaInterface = javaFactory.createJavaInterface(EntityManager.class);
-        } catch (InvalidInterfaceException e) {
-            throw new IllegalArgumentException(e);
-        }
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        interfaceContract.setInterface(javaInterface);
-        jpaService.setInterfaceContract(interfaceContract);
-    }
-
-    public boolean isUnresolved() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        // TODO Auto-generated method stub
-        return Collections.emptyList();
-    }
-
-    public List<Reference> getReferences() {
-        return Collections.emptyList();
-    }
-
-    public List<Service> getServices() {
-        return Collections.singletonList(jpaService);
-    }
-
-    public String getURI() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void setURI(String uri) {
-        // TODO Auto-generated method stub
-
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
deleted file mode 100644
index fbff09341c..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.TransactionManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.openjpa.kernel.Bootstrap;
-import org.apache.openjpa.kernel.BrokerFactory;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.PersistenceUnitInfoImpl;
-import org.apache.openjpa.persistence.PersistenceProductDerivation.ConfigurationProviderImpl;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.openjpa.JPAImplementation;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-public class JPAImplementationProvider implements ImplementationProvider {
-    private RuntimeComponent component;
-    private JPAImplementation implementation;
-    private EntityManagerFactory emf;
-    private TransactionManager tm;
-
-    public JPAImplementationProvider(RuntimeComponent component,
-                                         JPAImplementation implementation,
-                                         ExtensionPointRegistry extensionPoints) {
-        this.component = component;
-        this.implementation = implementation;
-        tm =
-            (TransactionManager)extensionPoints.getExtensionPoint(org.apache.geronimo.transaction.manager.XAWork.class);
-        try {
-            // tm.begin();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        initEntityManager();
-    }
-
-    private void initEntityManager() {
-        Map map = new HashMap();
-        map.put("TransactionManager", tm);
-        PersistenceUnitInfoImpl _info = implementation.getPersistenceUnitInfoImpl();
-        _info.fromUserProperties(map);
-        ConfigurationProviderImpl cp = new ConfigurationProviderImpl();
-        cp.addProperties(_info.toOpenJPAProperties());
-        cp.addProperties(implementation.getDataSourceMeta());
-
-        BrokerFactory factory = Bootstrap.newBrokerFactory(cp, null);
-
-        emf = JPAFacadeHelper.toEntityManagerFactory(factory);
-
-    }
-
-    private Log log = LogFactory.getLog(this.getClass());
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-
-        return new JPAInvoker(operation, emf, tm);
-    }
-
-    public void start() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void stop() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public boolean supportsOneWayInvocation() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
deleted file mode 100644
index 11a92c5064..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.openjpa.JPAImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-public class JPAImplementationProviderFactory implements ImplementationProviderFactory<JPAImplementation> {
-    private ExtensionPointRegistry eP;
-
-    public JPAImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-        eP = extensionPoints;
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-                                                               JPAImplementation implementation) {
-        return new JPAImplementationProvider(component, implementation, eP);
-    }
-
-    public Class<JPAImplementation> getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
deleted file mode 100644
index 8b74209d3e..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAInvoker.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.openjpa.provider;
-
-import java.lang.reflect.Method;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.TransactionManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-public class JPAInvoker implements Invoker {
-    private Operation operation;
-    private TransactionManager tm;
-
-    public JPAInvoker(Operation operation, EntityManagerFactory emf, TransactionManager tm) {
-        this.operation = operation;
-        this.tm = tm;
-        this.emf = emf;
-    }
-
-    private Log log = LogFactory.getLog(this.getClass());
-    private EntityManagerFactory emf;
-
-    public Message invoke(Message msg) {
-        try {
-            tm.begin();
-            Method method = JavaInterfaceUtil.findMethod(EntityManager.class, operation);
-            Object r = method.invoke(emf.createEntityManager(), (Object[])msg.getBody());
-            tm.commit();
-            log.info(method);
-            msg.setBody(r);
-            return msg;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-
-        }
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 3f8e373c88..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.openjpa.JPAImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.jpa,model=org.apache.tuscany.sca.implementation.openjpa.JPAImplementation
-\ No newline at end of file
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
deleted file mode 100644
index 13067543c9..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.openjpa.OpenJpaImplementationFactory
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License. 
-
-org.apache.tuscany.sca.implementation.openjpa.impl.JPAImplementationFactoryImpl
-\ No newline at end of file
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index fb62ff853b..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License. 
-
-# Implementation class for the implementation extension
-org.apache.tuscany.sca.implementation.openjpa.provider.JPAImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.openjpa.JPAImplementation
-\ No newline at end of file
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/org/apache/tuscany/sca/implementation/openjpa/ImplJpaTestCase.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/org/apache/tuscany/sca/implementation/openjpa/ImplJpaTestCase.java
deleted file mode 100644
index 900fab3242..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/org/apache/tuscany/sca/implementation/openjpa/ImplJpaTestCase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.implementation.openjpa;
-
-import junit.framework.*;
-import org.apache.tuscany.sca.host.embedded.*;
-import org.apache.commons.logging.*;
-import sample.*;
-import javax.persistence.*;
-import java.util.*;
-
-public class ImplJpaTestCase extends TestCase {
-    private EntityManager em;
-    private Log log = LogFactory.getLog(this.getClass());
-    private SCADomain domain;
-
-    public void setUp() {
-        domain = SCADomain.newInstance("openjpa.composite");
-        em = domain.getService(EntityManager.class, "OpenJPAServiceComponent");
-
-    }
-
-    public void testAccess() {
-        Abc a = new Abc();
-        int i = new Random().nextInt();
-        a.setId(i);
-        em.persist(a);
-        log.info(em.find(Abc.class, i));
-        Query q = em.createQuery("select a from Abc a");
-        q.setMaxResults(5);
-        log.info("There are " + q.getResultList().size() + " Abc in the database now");
-    }
-
-    public void testRollback() {
-        try {
-            Abc a = new Abc();
-            int i = new Random().nextInt();
-            a.setId(i);
-            em.persist(a);
-            Abc a2 = new Abc();
-            a2.setId(i);
-            em.persist(a2);
-
-        } catch (RuntimeException ex) {
-            log.info("An expected exception occured, Tuscany is rolling back...");
-        }
-    }
-
-    public void tearDown() {
-        em.close();
-        domain.close();
-    }
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/Abc.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/Abc.java
deleted file mode 100644
index 0f8e9e4391..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/Abc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package sample;
-import javax.persistence.*;
-@Entity
-public class Abc {
-	private int id;
-	@Id
-	public int getId(){
-		return id;
-	}
-	public void setId(int i){
-		id = i;
-	}
-	public String toString(){
-		return "My Id is "+id;
-	}
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/Message.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/Message.java
deleted file mode 100644
index da4fd1f3fc..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/Message.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package sample;
-
-import java.util.*;
-import javax.persistence.*;
-
-
-/** 
- * A very simple persistent entity that holds a "message", has a
- * "created" field that is initialized to the time at which the
- * object was created, and an id field that is initialized to the
- * current time.
- */
-@Entity
-public class Message {
-    @Id
-    private long id = System.currentTimeMillis();
-
-    @Basic
-    private String message;
-
-    @Basic
-    private Date created = new Date();
-
-    public Message() {
-    }
-
-    public Message(String msg) {
-        message = msg;
-    }
-
-    public void setId(long val) {
-        id = val;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setMessage(String msg) {
-        message = msg;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setCreated(Date date) {
-        created = date;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/MyObject.java b/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/MyObject.java
deleted file mode 100644
index d3b1baf182..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/java/sample/MyObject.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package sample;
-
-import java.io.*;
-import javax.persistence.*;
-@Entity	
-public class MyObject implements Serializable{
-	private int id;
-	@Id
-	public int getId(){
-		return id;
-	}
-	public void setId(int i){
-		id =i;
-	}
-}
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/resources/openjpa.composite b/branches/sca-java-1.5/modules/implementation-openjpa/src/test/resources/openjpa.composite
deleted file mode 100644
index 1c1b6976bd..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/src/test/resources/openjpa.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" 
-     targetNamespace="http://sample/openjpa"  name="impl-jpa">
-
-	<component name="OpenJPAServiceComponent">
-		<tuscany:implementation.jpa>
-			<tuscany:persistence-unit name="hellojpa">
-				<tuscany:openjpa.BrokerFactory>org.apache.tuscany.sca.implementation.openjpa.TuscanyBrokerFactory</tuscany:openjpa.BrokerFactory>
-				<tuscany:openjpa.TransactionMode>managed</tuscany:openjpa.TransactionMode>
-				<tuscany:openjpa.Log>DefaultLevel=WARN,SQL=TRACE</tuscany:openjpa.Log>
-				<tuscany:openjpa.jdbc.SynchronizeMappings>buildSchema</tuscany:openjpa.jdbc.SynchronizeMappings>
-
-				<tuscany:class>sample.Abc</tuscany:class>
-				<tuscany:class>sample.Message</tuscany:class>
-			</tuscany:persistence-unit>
-			<tuscany:datasource>
-				<dbtype>Derby</dbtype>
-				<dbname>test</dbname>
-				<dbcreate>create</dbcreate>
-			</tuscany:datasource>
-		</tuscany:implementation.jpa>
-	</component>
-
-</composite>
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/db.lck b/branches/sca-java-1.5/modules/implementation-openjpa/test/db.lck
deleted file mode 100644
index ad9dc5455d..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/db.lck
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/log/log.ctrl b/branches/sca-java-1.5/modules/implementation-openjpa/test/log/log.ctrl
deleted file mode 100644
index 9ce366fcb9..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/log/log.ctrl
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/log/log1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/log/log1.dat
deleted file mode 100644
index cc35dfe190..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/log/log1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/log/logmirror.ctrl b/branches/sca-java-1.5/modules/implementation-openjpa/test/log/logmirror.ctrl
deleted file mode 100644
index 9ce366fcb9..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/log/logmirror.ctrl
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c10.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c10.dat
deleted file mode 100644
index 7a0801a048..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c10.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c101.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c101.dat
deleted file mode 100644
index bf3e68815c..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c101.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c111.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c111.dat
deleted file mode 100644
index 1e0cedeb01..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c111.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c121.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c121.dat
deleted file mode 100644
index c8dfb77f24..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c121.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c130.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c130.dat
deleted file mode 100644
index 2b7138c98d..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c130.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c141.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c141.dat
deleted file mode 100644
index 52d555910b..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c141.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c150.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c150.dat
deleted file mode 100644
index 29e11535cb..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c150.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c161.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c161.dat
deleted file mode 100644
index 4cb160cf7c..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c161.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c171.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c171.dat
deleted file mode 100644
index 0a335bfa96..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c171.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c180.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c180.dat
deleted file mode 100644
index 30fc7aa23b..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c180.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c191.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c191.dat
deleted file mode 100644
index b2d149a0f3..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c191.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1a1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1a1.dat
deleted file mode 100644
index a0153570e1..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1a1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1b1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1b1.dat
deleted file mode 100644
index 396dc810ae..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1b1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1c0.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1c0.dat
deleted file mode 100644
index 359525a31a..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1c0.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1d1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1d1.dat
deleted file mode 100644
index 9f257df932..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1d1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1e0.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1e0.dat
deleted file mode 100644
index e43e52fb7f..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1e0.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1f1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1f1.dat
deleted file mode 100644
index 7e6ee3b1e0..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c1f1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c20.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c20.dat
deleted file mode 100644
index 0aa098f1ca..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c20.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c200.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c200.dat
deleted file mode 100644
index cae919d022..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c200.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c211.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c211.dat
deleted file mode 100644
index c7e311b00e..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c211.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c221.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c221.dat
deleted file mode 100644
index 28e89367ce..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c221.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c230.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c230.dat
deleted file mode 100644
index 528295a863..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c230.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c241.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c241.dat
deleted file mode 100644
index 5c8f825ad8..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c241.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c251.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c251.dat
deleted file mode 100644
index d3d6adf4fb..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c251.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c260.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c260.dat
deleted file mode 100644
index 8d7333df7d..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c260.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c271.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c271.dat
deleted file mode 100644
index af722f7d73..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c271.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c281.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c281.dat
deleted file mode 100644
index 3972983c2e..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c281.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c290.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c290.dat
deleted file mode 100644
index 31577b8124..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c290.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2a1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2a1.dat
deleted file mode 100644
index 0f700d13a7..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2a1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2b1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2b1.dat
deleted file mode 100644
index 1d6382fb3d..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2b1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2c1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2c1.dat
deleted file mode 100644
index 3bc60d886b..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2c1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2d0.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2d0.dat
deleted file mode 100644
index c542d3c91c..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2d0.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2e1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2e1.dat
deleted file mode 100644
index 16abd20b5f..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2e1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2f0.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2f0.dat
deleted file mode 100644
index eb26be5932..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c2f0.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c300.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c300.dat
deleted file mode 100644
index cb474d9335..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c300.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c31.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c31.dat
deleted file mode 100644
index ce609b1bb3..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c31.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c311.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c311.dat
deleted file mode 100644
index 5ad39aaab4..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c311.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c320.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c320.dat
deleted file mode 100644
index 1aacbe9fac..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c320.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c331.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c331.dat
deleted file mode 100644
index bb7a47c150..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c331.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c41.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c41.dat
deleted file mode 100644
index 3c730d1420..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c41.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c51.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c51.dat
deleted file mode 100644
index 9c861dbc56..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c51.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c60.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c60.dat
deleted file mode 100644
index 8165cc700e..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c60.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c71.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c71.dat
deleted file mode 100644
index 1696647e11..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c71.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c81.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c81.dat
deleted file mode 100644
index cfe999e650..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c81.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c90.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c90.dat
deleted file mode 100644
index 0bfa562d41..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/c90.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/ca1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/ca1.dat
deleted file mode 100644
index 188373cb62..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/ca1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cb1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cb1.dat
deleted file mode 100644
index ced876c84f..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cb1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cc0.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cc0.dat
deleted file mode 100644
index 5126021a83..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cc0.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cd1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cd1.dat
deleted file mode 100644
index 2e135b64ab..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cd1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/ce1.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/ce1.dat
deleted file mode 100644
index 076423c10a..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/ce1.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cf0.dat b/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cf0.dat
deleted file mode 100644
index 1a9a838ddf..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/seg0/cf0.dat
+++ /dev/null
diff --git a/branches/sca-java-1.5/modules/implementation-openjpa/test/service.properties b/branches/sca-java-1.5/modules/implementation-openjpa/test/service.properties
deleted file mode 100644
index ae366e6ef7..0000000000
--- a/branches/sca-java-1.5/modules/implementation-openjpa/test/service.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#D:\Projects\openjpa\openjpa\test
-# ********************************************************************
-# ***                Please do NOT edit this file.                 ***
-# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
-# ********************************************************************
-#Thu Nov 08 16:44:42 CST 2007
-SysschemasIndex2Identifier=225
-SyscolumnsIdentifier=144
-SysconglomeratesIndex1Identifier=49
-SysconglomeratesIdentifier=32
-SyscolumnsIndex2Identifier=177
-SysschemasIndex1Identifier=209
-SysconglomeratesIndex3Identifier=81
-SystablesIndex2Identifier=129
-SyscolumnsIndex1Identifier=161
-derby.serviceProtocol=org.apache.derby.database.Database
-SysschemasIdentifier=192
-derby.storage.propertiesId=16
-SysconglomeratesIndex2Identifier=65
-derby.serviceLocale=zh_CN
-SystablesIdentifier=96
-SystablesIndex1Identifier=113
author	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-05-18 05:36:14 +0000
committer	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-05-18 05:36:14 +0000
commit	52d2c2ca9573898a108a093f5b87d13ce53fa790 (patch)
tree	af91aba77efa579b51cdc1961827d001fb9cd0db /branches
parent	3054c4dbd2a75ebc99b2c0af461a65fb0adf53cd (diff)