From 6a3ca6736c808c1647854e405ef379b609f276db Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:45 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835126 13f79535-47bb-0310-9956-ffa450edef68 --- .../transaction/AccountNotFoundException.java | 36 ------ .../sca/itest/transaction/AccountService.java | 31 ----- .../sca/itest/transaction/AccountServiceImpl.java | 70 ---------- .../transaction/CheckingAccountServiceImpl.java | 143 --------------------- .../sca/itest/transaction/OverDraftException.java | 36 ------ .../transaction/SavingsAccountServiceImpl.java | 133 ------------------- .../sca/itest/transaction/TransferService.java | 31 ----- .../sca/itest/transaction/TransferServiceImpl.java | 64 --------- .../src/main/resources/accounts.composite | 43 ------- .../transaction/src/main/resources/definitions.xml | 99 -------------- .../src/main/resources/log4j.properties | 29 ----- .../transaction/ConcurrentXAResourceTestCase.java | 119 ----------------- .../sca/itest/transaction/TransactionTestCase.java | 53 -------- 13 files changed, 887 deletions(-) delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.composite delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java delete mode 100644 branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java (limited to 'branches/sca-java-1.2.1/itest/transaction/src') 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 accounts = new HashMap(); - - /** - * @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 @@ - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Used to indicate the transaction environment desired by a component implementation. - - - - Used to indicate that a component implementation requires a managed global transaction. - - - - - Used to indicate that a component implementation requires a managed local transaction. - - - - - Used to indicate that a component implementation will manage its own transaction resources. - - - - - Used to indicate that a reference will propagate any client transaction or that a service will be dispatched - under any received transaction. - - - - - Used to indicate that a reference will not propagate any client transaction or that a service will not be - dispatched under any received transaction. - - - - - 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. - - - - - 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. - - - - \ 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 diff --git a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java deleted file mode 100644 index c23628ff91..0000000000 --- a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.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.itest.transaction; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.logging.Logger; - -import javax.sql.XAConnection; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; - -import junit.framework.TestCase; - -import org.apache.derby.jdbc.EmbeddedXADataSource; -import org.apache.tuscany.sca.policy.transaction.TransactionManagerHelper; -import org.apache.tuscany.sca.policy.transaction.TransactionManagerWrapper; - -public class ConcurrentXAResourceTestCase extends TestCase { - class TestThread extends Thread { - private int counter; - - TestThread(int i) { - counter = i; - } - - public void run() { - log.info(this + " running..."); - - EmbeddedXADataSource xads = new EmbeddedXADataSource(); - xads.setDatabaseName("target/test" + counter); - xads.setCreateDatabase("create"); - Connection conn = null; - try { - - Transaction trans = helper.managedGlobalTransactionPreInvoke(); - - XAConnection xaconn = xads.getXAConnection(); - - trans.enlistResource(xaconn.getXAResource()); - - conn = xaconn.getConnection(); - try { - conn.prepareStatement("create table T1(col1 char(100))").execute(); - } catch (SQLException ex) { - log.info("table T1 exists"); - } - conn.prepareStatement("insert into T1 values('kkkkkkkk')").execute(); - ResultSet rs = conn.prepareStatement("select count(*) from T1").executeQuery(); - rs.next(); - log.info(String.valueOf(rs.getInt(1))); - - helper.managedGlobalTransactionPostInvoke(trans, false); - - } catch (Exception ex) { - ex.printStackTrace(); - } finally { - try { - conn.close(); - } catch (Exception _ex) { - _ex.printStackTrace(); - } - } - } - - } - private TransactionManagerWrapper activator; - private TransactionManagerHelper helper; - - private Logger log = Logger.getLogger(this.getClass().getName()); - - public void setUp() throws Exception { - activator = new TransactionManagerWrapper(); - activator.start(); - TransactionManager tm = activator.getTransactionManager(); - helper = new TransactionManagerHelper(tm); - } - - public void tearDown() throws Exception { - activator.stop(); - - } - - public void testConcurrent() { - TestThread[] tts = new TestThread[5]; - for (int i = 0; i < tts.length; i++) { - tts[i] = new TestThread(i); - tts[i].start(); - // log.info("one TestThread started..."); - } - try { - for (TestThread tt : tts) { - while (tt != null && tt.isAlive()) { - // log.info("wait for..."); - Thread.sleep(200); - } - } - } catch (Exception ex) { - ex.printStackTrace(); - } - } -} diff --git a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java deleted file mode 100644 index 36884f6098..0000000000 --- a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java +++ /dev/null @@ -1,53 +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.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class TransactionTestCase { - private static SCADomain domain; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("accounts.composite"); - } - - @AfterClass - public static void destroy() throws Exception { - if (domain != null) { - domain.close(); - } - } - - @Test - public void testTransaction() throws Exception { - TransferService service = domain.getService(TransferService.class, "TransferServiceComponent"); - String[] accounts = service.getAccounts(); - for (int i = 0; i < accounts.length; i++) { - float balance = service.getBalance(accounts[i]); - System.out.println("[" + i + "] " + accounts[i] + ":" + balance); - } - service.transfer(accounts[0], accounts[2], 200.0f); - } - -} -- cgit v1.2.3