Moving 1.x branches

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

11 files changed, 0 insertions, 715 deletions

diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
deleted file mode 100644
index d7d18181d9..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.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.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AccountNotFoundException extends Exception {
-    private static final long serialVersionUID = -4709084750220950706L;
-
-    public AccountNotFoundException() {
-        super();
-    }
-
-    public AccountNotFoundException(String message) {
-        super(message);
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
deleted file mode 100644
index ac986dd417..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AccountService {
-    float getBalance(String accountNumber) throws AccountNotFoundException;
-
-    void deposit(String accountNumber, float amount) throws AccountNotFoundException;
-
-    void withdraw(String accountNumber, float amount) throws OverDraftException, AccountNotFoundException;
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
deleted file mode 100644
index a6ea036da7..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.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.apache.tuscany.sca.itest.transaction;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public abstract class AccountServiceImpl implements AccountService {
-    protected Map<String, Float> accounts = new HashMap<String, Float>();
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#deposit(String, float)
-     */
-    public void deposit(String accountNumber, float amount) throws AccountNotFoundException {
-        float balance = getBalance(accountNumber);
-        balance += amount;
-        save(accountNumber, balance);
-        accounts.put(accountNumber, balance);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#getBalance(String)
-     */
-    public float getBalance(String accountNumber) throws AccountNotFoundException {
-        Float balance = accounts.get(accountNumber);
-        if (balance == null) {
-            balance = load(accountNumber);
-            accounts.put(accountNumber, balance);
-        }
-        return balance;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#withdraw(String, float)
-     */
-    public void withdraw(String accountNumber, float amount) throws OverDraftException, AccountNotFoundException {
-        float balance = getBalance(accountNumber);
-        if (amount > balance) {
-            throw new OverDraftException("Insufficient fund");
-        }
-        balance -= amount;
-        save(accountNumber, balance);
-        accounts.put(accountNumber, balance);
-    }
-
-    protected abstract float load(String accountNumber) throws AccountNotFoundException;
-
-    protected abstract void save(String accountNumber, float balance) throws AccountNotFoundException;
-
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
deleted file mode 100644
index e0a7a0ed9f..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.itest.transaction;
-
-import java.io.File;
-import java.util.Enumeration;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.broker.BrokerService;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountService.class)
-@Scope("COMPOSITE")
-public class CheckingAccountServiceImpl extends AccountServiceImpl {
-    private static final String url = "tcp://localhost:61616";
-    private BrokerService broker;
-    private Queue queue;
-
-    @Init
-    public void init() throws Exception {
-        broker = new BrokerService();
-        broker.setBrokerName("localhost");
-        broker.setDataDirectory(new File("target/activemq-data/localhost"));
-        broker.addConnector(url);
-        broker.start();
-
-        ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-        Connection conn = connFac.createConnection();
-        ActiveMQSession session = (ActiveMQSession)conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-        queue = session.createQueue("CheckAccounts");
-        MessageProducer producer = session.createProducer(queue);
-        MapMessage map = session.createMapMessage();
-
-        for (int i = 0; i < 3; i++) {
-            String accountNumber = "C00" + (i + 1);
-            float balance = (float)(1000.0 + Math.random() * 200.0);
-            map.setStringProperty("accountNumber", accountNumber);
-            map.setFloatProperty("balance", balance);
-
-            map.setString("accountNumber", accountNumber);
-            map.setFloat("balance", balance);
-
-            producer.send(map);
-        }
-        session.commit();
-        conn.close();
-    }
-
-    @Destroy
-    public void destroy() throws Exception {
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-    @Override
-    protected float load(String accountNumber) throws AccountNotFoundException {
-        try {
-            ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-            Connection conn = connFac.createConnection();
-            conn.start();
-            Session session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            QueueBrowser browser = session.createBrowser(queue, "accountNumber = '" + accountNumber + "'");
-            Enumeration msgs = browser.getEnumeration();
-            if (msgs.hasMoreElements()) {
-                MapMessage msg = (MapMessage)msgs.nextElement();
-                float balance = msg.getFloat("balance");
-                conn.close();
-                return balance;
-            } else {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (JMSException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Override
-    protected void save(String accountNumber, float balance) throws AccountNotFoundException {
-        try {
-            ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-            Connection conn = connFac.createConnection();
-            conn.start();
-            ActiveMQSession session = (ActiveMQSession)conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            MessageConsumer consumer = session.createConsumer(queue, "accountNumber = '" + accountNumber + "'");
-            Message msg = consumer.receive(1000);
-            if (msg == null) {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-            MapMessage map = session.createMapMessage();
-            map.setStringProperty("accountNumber", accountNumber);
-            map.setFloatProperty("balance", balance);
-
-            map.setString("accountNumber", accountNumber);
-            map.setFloat("balance", balance);
-
-            MessageProducer producer = session.createProducer(queue);
-            producer.send(map);
-            conn.close();
-
-        } catch (JMSException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
deleted file mode 100644
index 4d504a6a36..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.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.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OverDraftException extends Exception {
-    private static final long serialVersionUID = -4709084750220950706L;
-
-    public OverDraftException() {
-        super();
-    }
-
-    public OverDraftException(String message) {
-        super(message);
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
deleted file mode 100644
index 156b34227d..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.itest.transaction;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import javax.sql.XAConnection;
-
-import org.apache.derby.jdbc.EmbeddedXADataSource;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountService.class)
-@Scope("COMPOSITE")
-public class SavingsAccountServiceImpl extends AccountServiceImpl {
-    private final static Logger log = Logger.getLogger(SavingsAccountServiceImpl.class.getName());
-    private EmbeddedXADataSource xads;
-
-    @Init
-    public void init() throws SQLException {
-        // Create the database and a table
-        xads = new EmbeddedXADataSource();
-        xads.setDatabaseName("target/test");
-        xads.setCreateDatabase("create");
-
-        XAConnection xaconn = xads.getXAConnection();
-        Connection conn = xaconn.getConnection();
-        PreparedStatement ps =
-            conn.prepareStatement("create table SavingsAccounts(accountNumber char(100), balance float)");
-        try {
-            ps.execute();
-        } catch (SQLException ex) {
-            log.info(ex.getMessage());
-        }
-        ps = conn.prepareStatement("delete from SavingsAccounts");
-        ps.execute();
-        
-        ps = conn.prepareStatement("insert into SavingsAccounts(accountNumber, balance) values(?, ?)");
-        for (int i = 0; i < 2; i++) {
-            ps.setString(1, "S00" + (i+1));
-            ps.setFloat(2, (float)(1000.0f + Math.random() * 500.0));
-            ps.executeUpdate();
-        }
-        conn.commit();
-        conn.close();
-    }
-
-    @Override
-    protected float load(String accountNumber) throws AccountNotFoundException {
-        try {
-            XAConnection xaconn = xads.getXAConnection();
-
-            Connection conn = xaconn.getConnection();
-            PreparedStatement ps = conn.prepareStatement("select balance from SavingsAccounts where accountNumber=?");
-            ps.setString(1, accountNumber);
-            ResultSet rs1 = ps.executeQuery();
-            boolean found = rs1.next();
-            if (found) {
-                float balance = rs1.getFloat(1);
-                conn.commit();
-                conn.close();
-                return balance;
-            } else {
-                conn.commit();
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Override
-    protected void save(String accountNumber, float balance) throws AccountNotFoundException {
-        try {
-            XAConnection xaconn = xads.getXAConnection();
-
-            Connection conn = xaconn.getConnection();
-            PreparedStatement ps = conn.prepareStatement("update SavingsAccounts set balance=? where accountNumber=?");
-            ps.setFloat(1, balance);
-            ps.setString(2, accountNumber);
-            int rows = ps.executeUpdate();
-            conn.commit();
-            boolean found = (rows >= 1);
-            if (found) {
-                conn.close();
-            } else {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Destroy
-    public void destroy() throws SQLException {
-        XAConnection xaconn = xads.getXAConnection();
-        Connection conn = xaconn.getConnection();
-        PreparedStatement ps = conn.prepareStatement("drop table SavingsAccounts");
-        ps.execute();
-        conn.commit();
-        conn.close();
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
deleted file mode 100644
index b7ea5f2663..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TransferService {
-    String[] getAccounts();
-
-    float getBalance(String accountNumber) throws AccountNotFoundException;
-
-    void transfer(String from, String to, float amount) throws OverDraftException, AccountNotFoundException;
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
deleted file mode 100644
index 341a7e53e3..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.itest.transaction;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TransferService.class)
-public class TransferServiceImpl implements TransferService {
-    @Reference
-    protected AccountService savings;
-
-    @Reference
-    protected AccountService checking;
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.TransferService#transfer(java.lang.String, java.lang.String, float)
-     */
-    public void transfer(String from, String to, float amount) throws OverDraftException, AccountNotFoundException {
-        if (from.startsWith("C")) {
-            checking.withdraw(from, amount);
-        } else {
-            savings.withdraw(from, amount);
-        }
-        if (to.startsWith("C")) {
-            checking.deposit(to, amount);
-        } else {
-            savings.deposit(to, amount);
-        }
-    }
-    
-    public float getBalance(String accountNumber) throws AccountNotFoundException {
-        if(accountNumber.startsWith("C")) {
-            return checking.getBalance(accountNumber);
-        } else {
-            return savings.getBalance(accountNumber);
-        }
-    }
-
-    public String[] getAccounts() {
-        return new String[] {"S001", "S002", "C001"};
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.composite b/branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.composite
deleted file mode 100644
index f4c6b650c7..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.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" targetNamespace="http://account"

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

-

-    <component name="TransferServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.TransferServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="TransferService" />

-        <reference name="savings" requires="propagatesTransaction" target="SavingsAccountServiceComponent"></reference>

-        <reference name="checking" requires="propagatesTransaction" target="CheckingAccountServiceComponent"></reference>

-    </component>

-

-    <component name="SavingsAccountServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.SavingsAccountServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="AccountService" requires="propagatesTransaction" />

-    </component>

-

-    <component name="CheckingAccountServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.CheckingAccountServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="AccountService" requires="propagatesTransaction" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml b/branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml
deleted file mode 100644
index b1599c0633..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,99 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <policySet name="tuscany:ManagedTransactionPolicySet" provides="managedTransaction" appliesTo="implementation">
-        <intentMap provides="managedTransaction" default="global">
-            <qualifier name="global">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_GLOBAL" />
-            </qualifier>
-            <qualifier name="local">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_LOCAL" />
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="tuscany:NoManagedTransactionPolicySet" provides="noManagedTransaction"
-        appliesTo="implementation">
-        <tuscany:transactionPolicy action="REQUIRE_NONE" />
-    </policySet>
-
-    <policySet name="tuscany:PropagatesTransactionPolicySet" provides="propagatesTransaction" appliesTo="binding">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="tuscany:SuspendsTransactionPolicySet" provides="suspendsTransaction" appliesTo="binding">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <policySet name="tuscany:TransactedOneWayPolicySet" provides="transactedOneWay" appliesTo="binding">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="tuscany:ImmediateOneWayPolicySet" provides="immediateOneWay" appliesTo="binding">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <intent name="managedTransaction" constrains="implementation">
-        <description>Used to indicate the transaction environment desired by a component implementation.</description>
-    </intent>
-    <intent name="managedTransaction.global">
-        <description>
-            Used to indicate that a component implementation requires a managed global transaction.
-        </description>
-    </intent>
-    <intent name="managedTransaction.local">
-        <description>
-            Used to indicate that a component implementation requires a managed local transaction.
-        </description>
-    </intent>
-    <intent name="noManagedTransaction" constrains="implementation">
-        <description>
-            Used to indicate that a component implementation will manage its own transaction resources.
-        </description>
-    </intent>
-    <intent name="propagatesTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will propagate any client transaction or that a service will be dispatched
-            under any received transaction.
-        </description>
-    </intent>
-    <intent name="suspendsTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will not propagate any client transaction or that a service will not be
-            dispatched under any received transaction.
-        </description>
-    </intent>
-    <intent name="transactedOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to transact OneWay send of messages as part of
-            any client global transaction or to transact oneWay message receipt as part of any service global
-            transaction.
-        </description>
-    </intent>
-    <intent name="immediateOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to process the sending or receiving of OneWay
-            messages immediately, regardless of any transaction under which the sending/receiving component runs.
-        </description>
-    </intent>
-
-</definitions>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties b/branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties
deleted file mode 100644
index 698ee41d7e..0000000000
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,29 +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.
-#  
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, CONSOLE
-
-# CONSOLE is set to be a ConsoleAppender.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-
-
-# Print only messages of level WARN or above in the package com.foo.
-log4j.logger.org.apache.tuscany=INFO
\ No newline at end of file