Moving 1.x branches

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

27 files changed, 0 insertions, 1999 deletions

diff --git a/branches/sca-java-20080910/modules/policy-transaction/LICENSE b/branches/sca-java-20080910/modules/policy-transaction/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/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-20080910/modules/policy-transaction/NOTICE b/branches/sca-java-20080910/modules/policy-transaction/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/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-20080910/modules/policy-transaction/pom.xml b/branches/sca-java-20080910/modules/policy-transaction/pom.xml
deleted file mode 100644
index 42f4005306..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/pom.xml
+++ /dev/null
@@ -1,127 +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.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-policy-transaction</artifactId>
-    <name>Apache Tuscany SCA Transaction Policy Model</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <!-- 
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>4.1.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-            <scope>test</scope>
-        </dependency>
-        -->
-        <!-- 
-            <dependency>
-            <groupId>jotm</groupId>
-            <artifactId>jotm</artifactId>
-            <version>2.0.10</version>
-            <exclusions>
-            <exclusion>
-            <artifactId>jta</artifactId>
-            <groupId>javax.transaction</groupId>
-            </exclusion>
-            <exclusion>
-            <artifactId>connector</artifactId>
-            <groupId>javax.resource</groupId>
-            </exclusion>
-            </exclusions>
-            </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.policy.transaction</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.transaction*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
deleted file mode 100644
index 8a242924ee..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
+++ /dev/null
@@ -1,44 +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.policy.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class IncompatibleIntentException extends Exception {
-    private static final long serialVersionUID = -2993825019200280397L;
-
-    public IncompatibleIntentException() {
-        super();
-    }
-
-    public IncompatibleIntentException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public IncompatibleIntentException(String message) {
-        super(message);
-    }
-
-    public IncompatibleIntentException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
deleted file mode 100644
index 3c11fef865..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.transaction;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionImplementationPolicyProvider implements PolicyProvider {
-    private TransactionManagerHelper helper;
-    private List<PolicySet> policySets;
-
-    public TransactionImplementationPolicyProvider(TransactionManagerHelper helper, PolicySetAttachPoint attachPoint) {
-        super();
-        this.helper = helper;
-        this.policySets = attachPoint.getApplicablePolicySets();
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        for (PolicySet policySet : policySets) {
-            for (Object p : policySet.getPolicies()) {
-                if (p instanceof TransactionPolicy) {
-                    TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, false, (TransactionPolicy)p, null);
-                    return interceptor;
-                }
-            }
-        }
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.IMPLEMENTATION_POLICY;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
deleted file mode 100644
index b3e90c23cd..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ /dev/null
@@ -1,28 +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.policy.transaction;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public enum TransactionIntent {
-    managedTransactionLocal, managedTransactionGlobal, noManagedTransaction, propagatesTransacton, suspendsTransaction, transactedOneWay, immediateOneWay
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
deleted file mode 100644
index 0de98592cb..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ /dev/null
@@ -1,122 +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.policy.transaction;
-
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionInterceptor implements Interceptor {
-    private Invoker next;
-    private TransactionManagerHelper helper;
-    private boolean outbound;
-    private TransactionPolicy interactionPolicy;
-    private TransactionPolicy implementationPolicy;
-
-    public TransactionInterceptor(TransactionManagerHelper helper,
-                                  boolean outbound,
-                                  TransactionPolicy interactionPolicy,
-                                  TransactionPolicy implementationPolicy) {
-        super();
-        this.helper = helper;
-        this.outbound = outbound;
-        this.interactionPolicy = interactionPolicy;
-        this.implementationPolicy = implementationPolicy;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#getNext()
-     */
-    public Invoker getNext() {
-        return next;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#setNext(org.apache.tuscany.sca.invocation.Invoker)
-     */
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
-     */
-    public Message invoke(Message msg) {
-        TransactionalInvocation invocation = new TransactionalInvocation(next, msg);
-
-        Message result = null;
-        if (msg.getOperation().isNonBlocking()) {
-
-        }
-        TransactionIntent interactionIntent = TransactionIntent.propagatesTransacton;
-        if (interactionPolicy != null) {
-            if (interactionPolicy.getAction() == TransactionPolicy.Action.PROPAGATE) {
-                interactionIntent = TransactionIntent.propagatesTransacton;
-            } else {
-                interactionIntent = TransactionIntent.suspendsTransaction;
-            }
-        }
-        TransactionIntent implementationIntent = TransactionIntent.managedTransactionGlobal;
-        if (implementationPolicy != null) {
-            switch (implementationPolicy.getAction()) {
-                case REQUIRE_GLOBAL:
-                    implementationIntent = TransactionIntent.managedTransactionGlobal;
-                    break;
-                case REQUIRE_LOCAL:
-                    implementationIntent = TransactionIntent.managedTransactionLocal;
-                    break;
-                default:
-                    implementationIntent = TransactionIntent.noManagedTransaction;
-                    break;
-            }
-        }
-        try {
-            if (outbound) {
-                result = helper.handlesOutbound(interactionIntent, implementationIntent, invocation);
-            } else {
-                result = helper.handlesInbound(interactionIntent, implementationIntent, invocation);
-            }
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-    private static class TransactionalInvocation implements TransactionalAction<Message> {
-        private final Invoker invoker;
-        private final Message message;
-
-        public TransactionalInvocation(Invoker invoker, Message message) {
-            super();
-            this.invoker = invoker;
-            this.message = message;
-        }
-
-        public Message run() throws Exception {
-            return invoker.invoke(message);
-        }
-
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
deleted file mode 100644
index defe12967e..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ /dev/null
@@ -1,243 +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.policy.transaction;
-
-import java.lang.reflect.InvocationTargetException;
-
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionManagerHelper {
-    // private static final Logger logger = Logger.getLogger(TransactionManagerHelper.class.getName());
-
-    private TransactionManager tm;
-
-    public TransactionManagerHelper(TransactionManager tm) {
-        super();
-        this.tm = tm;
-    }
-
-    public Transaction managedGlobalTransactionPreInvoke() throws SystemException, NotSupportedException {
-        int status = tm.getStatus();
-        if (status == Status.STATUS_COMMITTED || status == Status.STATUS_NO_TRANSACTION
-            || status == Status.STATUS_ROLLEDBACK) {
-            tm.begin();
-            return tm.getTransaction();
-        }
-        return null;
-    }
-
-    public void managedGlobalTransactionPostInvoke(Transaction created, boolean rollback)
-        throws InvalidTransactionException, IllegalStateException, SystemException, SecurityException,
-        HeuristicMixedException, HeuristicRollbackException, RollbackException {
-        if (created != null) {
-            int status = created.getStatus();
-            if (status == Status.STATUS_MARKED_ROLLBACK) {
-                created.rollback();
-            } else if (status == Status.STATUS_ACTIVE) {
-                if (rollback) {
-                    created.rollback();
-                } else {
-                    created.commit();
-                }
-            }
-        }
-    }
-
-    public Transaction suspendsTransactionPreInvoke() throws SystemException {
-        if (tm.getTransaction() != null) {
-            return tm.suspend();
-        } else {
-            return null;
-        }
-    }
-
-    public void suspendsTransactionPostInvoke(Transaction suspended) throws InvalidTransactionException,
-        IllegalStateException, SystemException {
-        if (suspended != null) {
-            tm.resume(suspended);
-        }
-    }
-
-    public TransactionManager getTransactionManager() {
-        return tm;
-    }
-
-    public void setTransactionManager(TransactionManager tm) {
-        this.tm = tm;
-    }
-
-    public void validateOneway(TransactionIntent onewayIntent, TransactionIntent implIntent)
-        throws IncompatibleIntentException {
-        if (onewayIntent == TransactionIntent.transactedOneWay) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(onewayIntent + "<-X->" + implIntent);
-            }
-        }
-    }
-
-    public void validateInbound(TransactionIntent serviceIntent, TransactionIntent implIntent)
-        throws IncompatibleIntentException {
-        if (serviceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(serviceIntent + "<-X->" + implIntent);
-            }
-        }
-    }
-
-    public void validateOutbound(TransactionIntent referenceIntent, TransactionIntent implIntent)
-        throws IncompatibleIntentException {
-        if (referenceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(referenceIntent + "<-X->" + implIntent);
-            }
-        }
-    }
-
-    public <T> T handlesOutbound(TransactionIntent referenceIntent,
-                                 TransactionIntent implIntent,
-                                 TransactionalAction<T> action) throws Exception {
-
-        if (implIntent == null) {
-            implIntent = TransactionIntent.noManagedTransaction;
-        }
-
-        if (referenceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(referenceIntent + "<-X->" + implIntent);
-            } else {
-                // propagates the current TX
-                return run(action);
-            }
-        } else if (referenceIntent == TransactionIntent.suspendsTransaction) {
-            Transaction tx = suspendsTransactionPreInvoke();
-            try {
-                return run(action);
-            } finally {
-                suspendsTransactionPostInvoke(tx);
-            }
-        } else {
-            return run(action);
-        }
-    }
-
-    private <T> T run(TransactionalAction<T> action) throws Exception {
-        // Make sure a global TX is in place
-        Transaction tx = managedGlobalTransactionPreInvoke();
-        boolean rollback = false;
-        try {
-            return action.run();
-        } catch (InvocationTargetException e) {
-            throw e;
-        } catch (Throwable e) {
-            rollback = true;
-            if (e instanceof Error) {
-                throw (Error)e;
-            } else if (e instanceof RuntimeException) {
-                throw (RuntimeException)e;
-            } else {
-                throw (Exception)e;
-            }
-        } finally {
-            managedGlobalTransactionPostInvoke(tx, rollback);
-        }
-    }
-
-    public <T> T handlesInbound(TransactionIntent serviceIntent,
-                                TransactionIntent implIntent,
-                                TransactionalAction<T> action) throws Exception {
-        if (serviceIntent == null && implIntent == null) {
-            return run(action);
-        }
-
-        if (implIntent == null) {
-            implIntent = TransactionIntent.noManagedTransaction;
-        }
-
-        if (serviceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(serviceIntent + "<-X->" + implIntent);
-            } else {
-                return run(action);
-            }
-        } else if (serviceIntent == TransactionIntent.suspendsTransaction) {
-            Transaction tx1 = suspendsTransactionPreInvoke();
-            try {
-                if (implIntent == TransactionIntent.managedTransactionGlobal) {
-                    return run(action);
-                } else {
-                    return action.run();
-                }
-            } finally {
-                suspendsTransactionPostInvoke(tx1);
-            }
-        } else {
-            if (implIntent == TransactionIntent.managedTransactionGlobal) {
-                // Start a new TX
-                return run(action);
-            } else {
-                return action.run();
-            }
-        }
-    }
-
-    public <T> void handlesOneWay(TransactionIntent onewayIntent,
-                                  TransactionIntent implIntent,
-                                  TransactionalAction<T> action) throws Exception {
-        if (implIntent == null) {
-            implIntent = TransactionIntent.noManagedTransaction;
-        }
-
-        if (onewayIntent == null) {
-            // Assume transactedOneWay
-            run(action);
-            return;
-        }
-
-        if (onewayIntent == TransactionIntent.transactedOneWay) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(onewayIntent + "<-X->" + implIntent);
-            } else {
-                run(action);
-                return;
-            }
-        } else {
-            // TransactionIntent.immediateOneWay
-            Transaction tx = suspendsTransactionPreInvoke();
-            try {
-                run(action);
-                return;
-            } finally {
-                suspendsTransactionPostInvoke(tx);
-            }
-        }
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
deleted file mode 100644
index 31beab4fca..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ /dev/null
@@ -1,90 +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.policy.transaction;
-
-import java.io.File;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.geronimo.transaction.log.HOWLLog;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.geronimo.transaction.manager.XidFactory;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionManagerWrapper {
-    private TransactionManager transactionManager;
-    private HOWLLog howlLog;
-
-    private String logFileDir = "target/logs";
-    private String bufferClassName = "org.objectweb.howl.log.BlockLogBuffer";
-    private int bufferSizeKBytes = 32;
-    private boolean checksumEnabled = true;
-    private boolean adler32Checksum = true;
-    private int flushSleepTimeMilliseconds = 50;
-    private String logFileExt = "log";
-    private String logFileName = "transaction";
-    private int maxBlocksPerFile = -1;
-    private int maxLogFiles = 2;
-    private int maxBuffers = 0;
-    private int minBuffers = 4;
-    private int threadsWaitingForceThreshold = -1;
-    private File serverBaseDir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
-
-    public TransactionManagerWrapper() {
-        super();
-    }
-
-    public void start() {
-        try {
-            XidFactory xidFactory = new XidFactoryImpl();
-            howlLog =
-                new HOWLLog(bufferClassName, bufferSizeKBytes, checksumEnabled, adler32Checksum,
-                            flushSleepTimeMilliseconds, logFileDir, logFileExt, logFileName, maxBlocksPerFile,
-                            maxBuffers, maxLogFiles, minBuffers, threadsWaitingForceThreshold, xidFactory,
-                            serverBaseDir);
-
-            howlLog.doStart();
-            transactionManager = new GeronimoTransactionManager(1200, xidFactory, howlLog);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#stop(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void stop() {
-        try {
-            if (howlLog != null) {
-                howlLog.doStop();
-            }
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    public TransactionManager getTransactionManager() {
-        return transactionManager;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
deleted file mode 100644
index 3339f2e338..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
+++ /dev/null
@@ -1,84 +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.policy.transaction;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionModuleActivator implements ModuleActivator {
-    private TransactionManagerWrapper wrapper;
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#start(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void start(ExtensionPointRegistry registry) {
-        if (registry != null) {
-            UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-            TransactionManager transactionManager = utilities.getUtility(TransactionManager.class);
-            if (transactionManager != null) {
-                // The transaction manage is provided by the hosting environment
-//                RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint =
-//                    registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-//                TransactionManagerHelper helper = new TransactionManagerHelper(transactionManager);
-//                wireProcessorExtensionPoint.addWireProcessor(new TransactionRuntimeWireProcessor(helper));
-                return;
-            }
-        }
-        try {
-            wrapper = new TransactionManagerWrapper();
-            wrapper.start();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-        if (registry != null) {
-            UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-            utilities.addUtility(wrapper.getTransactionManager());
-//            RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint =
-//                registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-//            TransactionManagerHelper helper = new TransactionManagerHelper(wrapper.getTransactionManager());
-//            wireProcessorExtensionPoint.addWireProcessor(new TransactionRuntimeWireProcessor(helper));
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#stop(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void stop(ExtensionPointRegistry registry) {
-        try {
-            if (wrapper != null) {
-                wrapper.stop();
-                wrapper = null;
-            }
-            if (registry != null && wrapper != null) {
-                UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-                utilities.removeUtility(wrapper.getTransactionManager());
-            }
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
deleted file mode 100644
index a13748f232..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.transaction;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * The model for Tuscany transaction policy
- * 
- * @version $Rev$ $Date$
- */
-public interface TransactionPolicy extends Policy {
-    QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "transactionPolicy");
-
-    enum Action {
-        PROPAGATE, SUSPEND, REQUIRE_GLOBAL, REQUIRE_LOCAL, REQUIRE_NONE
-    };
-
-    int getTransactionTimeout();
-
-    void setTransactionTimeout(int seconds);
-
-    void setAction(Action action);
-
-    Action getAction();
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
deleted file mode 100644
index 7b10a7d568..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.transaction;
-
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions related to transaction
- *
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyDefinitionsProvider implements SCADefinitionsProvider {
-    private static final String scaDefinitionsFile = "definitions.xml";
-    private static final String tuscanyDefinitionsFile = "tuscany_definitions.xml";
-    private URLArtifactProcessor urlArtifactProcessor;
-
-    public TransactionPolicyDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors =
-            registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-
-        try {
-            SCADefinitions scaTransactionPolicyDefns = null;
-            SCADefinitions tuscanyTransactionPolicyDefns = null;
-
-            URI uri = new URI(scaDefinitionsFile);
-            URL defintionsFileUrl = getClass().getResource(scaDefinitionsFile);
-            scaTransactionPolicyDefns = (SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
-
-            uri = new URI(tuscanyDefinitionsFile);
-            defintionsFileUrl = getClass().getResource(tuscanyDefinitionsFile);
-            tuscanyTransactionPolicyDefns = (SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
-
-            SCADefinitionsUtil.aggregateSCADefinitions(tuscanyTransactionPolicyDefns, scaTransactionPolicyDefns);
-
-            return scaTransactionPolicyDefns;
-        } catch (Exception e) {
-            throw new SCADefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
deleted file mode 100644
index f178876a72..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.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.policy.transaction;
-
-import javax.xml.namespace.QName;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyImpl implements TransactionPolicy {
-    private boolean unresolved;
-    private int transactionTimeout = 1200;
-    private Action action = Action.PROPAGATE;
-
-    public int getTransactionTimeout() {
-        return transactionTimeout;
-    }
-
-    public void setTransactionTimeout(int transactionTimeout) {
-        this.transactionTimeout = transactionTimeout;
-    }
-
-    public Action getAction() {
-        return action;
-    }
-
-    public void setAction(Action policy) {
-        this.action = policy;
-    }
-
-    public QName getSchemaName() {
-        return NAME;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
deleted file mode 100644
index 0579890a42..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ /dev/null
@@ -1,96 +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.policy.transaction;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-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.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;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyProcessor implements StAXArtifactProcessor<TransactionPolicy> {
-    public static final String TIMEOUT = "transactionTimeout";
-    public static final String ACTION = "action";
-    
-    public QName getArtifactType() {
-        return TransactionPolicy.NAME;
-    }
-
-    public TransactionPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    public TransactionPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        TransactionPolicy txPolicy = new TransactionPolicyImpl();
-        int event = reader.getEventType();
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT: {
-                    String timeout = reader.getAttributeValue(null, TIMEOUT);
-                    if (timeout != null) {
-                        txPolicy.setTransactionTimeout(Integer.parseInt(timeout));
-                    }
-                    String action = reader.getAttributeValue(null, ACTION);
-                    if (action != null) {
-                        txPolicy.setAction(TransactionPolicy.Action.valueOf(action));
-                    }
-                    break;
-                }
-            }
-
-            if (event == END_ELEMENT) {
-                if (TransactionPolicy.NAME.equals(reader.getName())) {
-                    break;
-                }
-            }
-
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-
-        return txPolicy;
-    }
-
-    public void write(TransactionPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-    }
-
-    public Class<TransactionPolicy> getModelType() {
-        return TransactionPolicy.class;
-    }
-
-    public void resolve(TransactionPolicy policy, ModelResolver resolver) throws ContributionResolveException {
-
-    }
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
deleted file mode 100644
index be97090378..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
+++ /dev/null
@@ -1,92 +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.policy.transaction;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyProviderFactory implements PolicyProviderFactory<TransactionPolicy> {
-    private TransactionManagerHelper helper;
-
-    public TransactionPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        TransactionManager tm = utilities.getUtility(TransactionManager.class);
-        this.helper = new TransactionManagerHelper(tm);
-    }
-    
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation)
-     */
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        if (component instanceof PolicySetAttachPoint) {
-            return new TransactionImplementationPolicyProvider(helper, (PolicySetAttachPoint)component);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        if (binding instanceof PolicySetAttachPoint) {
-            return new TransactionReferencePolicyProvider(helper, (PolicySetAttachPoint)binding);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                      RuntimeComponentService service,
-                                                      Binding binding) {
-        if (binding instanceof PolicySetAttachPoint) {
-            return new TransactionServicePolicyProvider(helper, (PolicySetAttachPoint)binding);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class<TransactionPolicy> getModelType() {
-        return TransactionPolicy.class;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
deleted file mode 100644
index 0795a4e5cf..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.transaction;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionReferencePolicyProvider implements PolicyProvider {
-    private TransactionManagerHelper helper;
-    private List<PolicySet> policySets;
-
-    public TransactionReferencePolicyProvider(TransactionManagerHelper helper, PolicySetAttachPoint attachPoint) {
-        super();
-        this.helper = helper;
-        this.policySets = attachPoint.getApplicablePolicySets();
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        for (PolicySet policySet : policySets) {
-            for (Object p : policySet.getPolicies()) {
-                if (p instanceof TransactionPolicy) {
-                    TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null);
-                    return interceptor;
-                }
-            }
-        }
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.REFERENCE_POLICY;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
deleted file mode 100644
index 9f9088a380..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.transaction;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionServicePolicyProvider implements PolicyProvider {
-    private TransactionManagerHelper helper;
-    private List<PolicySet> policySets;
-
-    public TransactionServicePolicyProvider(TransactionManagerHelper helper, PolicySetAttachPoint attachPoint) {
-        super();
-        this.helper = helper;
-        this.policySets = attachPoint.getApplicablePolicySets();
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        for (PolicySet policySet : policySets) {
-            for (Object p : policySet.getPolicies()) {
-                if (p instanceof TransactionPolicy) {
-                    TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null);
-                    return interceptor;
-                }
-            }
-        }
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.SERVICE_POLICY;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
deleted file mode 100644
index 5a7ae5c4cc..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.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.policy.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TransactionalAction<T> {
-    /**
-     * @return
-     * @throws Exception
-     */
-    T run() throws Exception;
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 1d034e23a2..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/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.policy.transaction.TransactionPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#transactionPolicy,model=org.apache.tuscany.sca.policy.transaction.TransactionPolicy
\ No newline at end of file
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 9a35d62cad..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /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.

-# Implementation class for the ModuleActivator

-org.apache.tuscany.sca.policy.transaction.TransactionModuleActivator

diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index eeec814f60..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /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 policy extension

-org.apache.tuscany.sca.policy.transaction.TransactionPolicyProviderFactory;model=org.apache.tuscany.sca.policy.transaction.TransactionPolicy

diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index e9d9fab519..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ /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 SCA Definitions Providers
-org.apache.tuscany.sca.policy.transaction.TransactionPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/log4j.properties b/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/log4j.properties
deleted file mode 100644
index 698ee41d7e..0000000000
--- a/branches/sca-java-20080910/modules/policy-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-20080910/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
deleted file mode 100644
index ff51b131b7..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ /dev/null
@@ -1,66 +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">
-
-    <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-20080910/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
deleted file mode 100644
index 324fa03da6..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
+++ /dev/null
@@ -1,54 +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://tuscany.apache.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="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="NoManagedTransactionPolicySet" provides="noManagedTransaction"
-        appliesTo="implementation">
-        <tuscany:transactionPolicy action="REQUIRE_NONE" />
-    </policySet>
-
-    <policySet name="PropagatesTransactionPolicySet" provides="propagatesTransaction" appliesTo="binding">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="SuspendsTransactionPolicySet" provides="suspendsTransaction" appliesTo="binding">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <policySet name="TransactedOneWayPolicySet" provides="transactedOneWay" appliesTo="binding">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="ImmediateOneWayPolicySet" provides="immediateOneWay" appliesTo="binding">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/branches/sca-java-20080910/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
deleted file mode 100644
index e8560d775d..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ /dev/null
@@ -1,54 +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.policy.transaction;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-/**
- * Test the reading of ws config params policy.
- *
- * @version $Rev$ $Date$
- */
-public class PolicyReadTestCase extends TestCase {
-
-    @Override
-    public void setUp() throws Exception {
-    }
-
-    public void testPolicyReading() throws Exception {
-
-        TransactionPolicyProcessor processor = new TransactionPolicyProcessor(null, null);
-
-        URL url = getClass().getResource("/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml");
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-
-        InputStream urlStream = url.openStream();
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
-
-        TransactionPolicy policy = processor.read(reader);
-        assertEquals(1200, policy.getTransactionTimeout());
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/branches/sca-java-20080910/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
deleted file mode 100644
index 544e0f68c0..0000000000
--- a/branches/sca-java-20080910/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ /dev/null
@@ -1,194 +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.policy.transaction;
-
-import java.util.logging.Logger;
-
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import junit.framework.TestCase;
-
-import org.apache.geronimo.transaction.manager.NamedXAResource;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionManagerHelperTestCase extends TestCase {
-    private static final Logger logger = Logger.getLogger(TransactionManagerHelper.class.getName());
-
-    public static class MockXAResource implements NamedXAResource {
-
-        private String rm;
-        private String id;
-        private int timeout = 1000;
-
-        public MockXAResource(String rm, String id) {
-            super();
-            this.rm = rm;
-            this.id = id;
-        }
-
-        public String getName() {
-            return rm + ":" + id;
-        }
-
-        public void commit(Xid xid, boolean onePhase) throws XAException {
-            logger.info(id + ": commit(" + xid + "," + onePhase + ")");
-        }
-
-        public void end(Xid xid, int flags) throws XAException {
-            logger.info(id + ": end(" + xid + "," + toString(flags) + ")");
-        }
-
-        public void forget(Xid xid) throws XAException {
-            logger.info(id + ": forget(" + xid + ")");
-        }
-
-        public int getTransactionTimeout() throws XAException {
-            return timeout;
-        }
-
-        public boolean isSameRM(XAResource xares) throws XAException {
-            if (xares instanceof MockXAResource) {
-                MockXAResource res = (MockXAResource)xares;
-                return res.rm.endsWith(rm);
-            } else {
-                return false;
-            }
-        }
-
-        public int prepare(Xid xid) throws XAException {
-            logger.info(id + ": prepare(" + xid + ")");
-            return XA_OK;
-        }
-
-        public Xid[] recover(int flag) throws XAException {
-            return null;
-        }
-
-        public void rollback(Xid xid) throws XAException {
-            logger.info(id + ": rollback(" + xid + ")");
-        }
-
-        public boolean setTransactionTimeout(int seconds) throws XAException {
-            this.timeout = seconds;
-            return true;
-        }
-
-        public void start(Xid xid, int flags) throws XAException {
-            logger.info(id + ": start(" + xid + "," + toString(flags) + ")");
-        }
-
-        private String toString(int flags) {
-            StringBuffer sb = new StringBuffer();
-            if ((flags & TMENDRSCAN) != 0) {
-                sb.append("TMENDRSCAN ");
-            }
-            if ((flags & TMFAIL) != 0) {
-                sb.append("TMFAIL ");
-            }
-            if ((flags & TMJOIN) != 0) {
-                sb.append("TMJOIN ");
-            }
-            if ((flags & TMONEPHASE) != 0) {
-                sb.append("TMONEPHASE ");
-            }
-            if ((flags & TMRESUME) != 0) {
-                sb.append("TMRESUME ");
-            }
-            if ((flags & TMSTARTRSCAN) != 0) {
-                sb.append("TMSTARTRSCAN ");
-            }
-            if ((flags & TMSUCCESS) != 0) {
-                sb.append("TMSUCCESS ");
-            }
-            if ((flags & TMSUSPEND) != 0) {
-                sb.append("TMSUSPEND ");
-            }
-            if (sb.length() == 0) {
-                sb.append("TMNOFLAGS");
-            } else {
-                sb.deleteCharAt(sb.length() - 1);
-            }
-            return sb.toString();
-        }
-
-    }
-
-    public void testHelper() throws Exception {
-        TransactionManagerWrapper activator = new TransactionManagerWrapper();
-        activator.start();
-        TransactionManager tm = activator.getTransactionManager();
-        // GeronimoUserTransaction tx = new GeronimoUserTransaction(tm);
-        TransactionManagerHelper helper = new TransactionManagerHelper(tm);
-
-        // No TX yet
-        assertNull(tm.getTransaction());
-        Transaction t1 = helper.managedGlobalTransactionPreInvoke();
-        // Should create T1
-        assertNotNull(t1);
-        // The current TX should be T1
-        assertSame(t1, tm.getTransaction());
-        
-        XAResource res1 = new MockXAResource("Derby", "001");
-        XAResource res2 = new MockXAResource("DB2", "002");
-        tm.getTransaction().enlistResource(res1);
-        tm.getTransaction().enlistResource(res2);
-
-        Transaction suspended = helper.suspendsTransactionPreInvoke();
-        suspended.delistResource(res1, XAResource.TMSUSPEND);
-        suspended.delistResource(res2, XAResource.TMSUSPEND);
-       
-        // T1 is suspended
-        assertSame(t1, suspended);
-        // No more active TX
-        assertNull(tm.getTransaction());
-
-        Transaction t2 = helper.managedGlobalTransactionPreInvoke();
-        assertNotNull(t2);
-        // The current TX should be T2
-        assertSame(t2, tm.getTransaction());
-        
-        XAResource res3 = new MockXAResource("Oracle", "003");
-        tm.getTransaction().enlistResource(res3);
-
-        tm.getTransaction().delistResource(res3, XAResource.TMSUCCESS);
-        tm.rollback();
-
-        // Skip post
-        // helper.managedGlobalTransactionPostInvoke(t2);
-
-        helper.suspendsTransactionPostInvoke(suspended);
-        suspended.enlistResource(res1);
-        suspended.enlistResource(res2);
-        // T1 is now resumed
-        assertSame(t1, tm.getTransaction());
-
-        helper.managedGlobalTransactionPostInvoke(t1, false);
-        assertNotNull(tm.getTransaction());
-        assertEquals(6, t1.getStatus());
-
-        activator.stop();
-    }
-}