Author: lresende
Date: Wed Mar 3 17:16:37 2010
New Revision: 918585
URL: http://svn.apache.org/viewvc?rev=918585&view=rev
Log:
TUSCANY-3474 - Further splitting policy transaction policy to allow for a
shared ProviderFactory and Providers... with TransactionManager specific code
available into specific modules (e.g transaction-policy-runtime-geronimo)
Added:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
- copied, changed from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
- copied, changed from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
(contents, props changed)
- copied, changed from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerWrapper.java
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
(contents, props changed)
- copied, changed from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionModuleActivator.java
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
- copied, changed from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
(contents, props changed)
- copied, changed from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelperTestCaseOFF.java
Removed:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerWrapper.java
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionModuleActivator.java
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/test/
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/pom.xml
Copied:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
(from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF?p2=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF&p1=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF&r1=918583&r2=918585&rev=918585&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
Wed Mar 3 17:16:37 2010
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
SCA-Version: 1.1
-Bundle-Name: Apache Tuscany Transaction Policy Model
+Bundle-Name: Apache Tuscany Transaction Policy Runtime Geronimo
Bundle-Vendor: The Apache Software Foundation
Bundle-Version: 2.0.0
Bundle-ManifestVersion: 2
@@ -27,6 +27,6 @@
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
org.oasisopen.sca;version="2.0.0"
-Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction
+Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction.runtime.geronimo
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Copied:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
(from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml?p2=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml&p1=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml&r1=918583&r2=918585&rev=918585&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
Wed Mar 3 17:16:37 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-policy-transaction-runtime</artifactId>
- <name>Apache Tuscany SCA Transaction Policy Runtime</name>
+ <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
+ <name>Apache Tuscany SCA Transaction Policy Runtime (Geronimo)</name>
<dependencies>
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-policy-transaction</artifactId>
+ <artifactId>tuscany-policy-transaction-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Copied:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
(from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerWrapper.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java?p2=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java&p1=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerWrapper.java&r1=918583&r2=918585&rev=918585&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerWrapper.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
Wed Mar 3 17:16:37 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.policy.transaction.runtime;
+package org.apache.tuscany.sca.policy.transaction.runtime.geronimo;
import java.io.File;
Propchange:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
(from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionModuleActivator.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java?p2=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java&p1=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionModuleActivator.java&r1=918583&r2=918585&rev=918585&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionModuleActivator.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
Wed Mar 3 17:16:37 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.policy.transaction.runtime;
+package org.apache.tuscany.sca.policy.transaction.runtime.geronimo;
import javax.transaction.TransactionManager;
Propchange:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
(from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator?p2=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator&p1=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator&r1=918583&r2=918585&rev=918585&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
Wed Mar 3 17:16:37 2010
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
# Implementation class for the ModuleActivator
-org.apache.tuscany.sca.policy.transaction.runtime.TransactionModuleActivator
+org.apache.tuscany.sca.policy.transaction.runtime.geronimo.TransactionModuleActivator
Copied:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
(from r918583,
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelperTestCaseOFF.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java?p2=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java&p1=tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelperTestCaseOFF.java&r1=918583&r2=918585&rev=918585&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelperTestCaseOFF.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
Wed Mar 3 17:16:37 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.policy.transaction.runtime;
+package org.apache.tuscany.sca.policy.transaction.runtime.geronimo;
import java.util.logging.Logger;
@@ -31,13 +31,13 @@
import org.apache.geronimo.transaction.manager.NamedXAResource;
import
org.apache.tuscany.sca.policy.transaction.runtime.TransactionManagerHelper;
-import
org.apache.tuscany.sca.policy.transaction.runtime.TransactionManagerWrapper;
+import
org.apache.tuscany.sca.policy.transaction.runtime.geronimo.TransactionManagerWrapper;
/**
* @version $Rev$ $Date$
*/
public class TransactionManagerHelperTestCaseOFF extends TestCase {
- private static final Logger logger =
Logger.getLogger(TransactionManagerHelper.class.getName());
+ private static final Logger logger =
Logger.getLogger(TransactionManagerHelperTestCaseOFF.class.getName());
public static class MockXAResource implements NamedXAResource {
Propchange:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF?rev=918585&r1=918584&r2=918585&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
Wed Mar 3 17:16:37 2010
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
SCA-Version: 1.1
-Bundle-Name: Apache Tuscany Transaction Policy Model
+Bundle-Name: Apache Tuscany Transaction Policy Runtime
Bundle-Vendor: The Apache Software Foundation
Bundle-Version: 2.0.0
Bundle-ManifestVersion: 2
@@ -27,6 +27,6 @@
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
org.oasisopen.sca;version="2.0.0"
-Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction
+Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction.runtime
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml?rev=918585&r1=918584&r2=918585&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml Wed
Mar 3 17:16:37 2010
@@ -51,20 +51,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy-transaction</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>2.1.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.1.3</version>
- </dependency>
-
+ </dependency>
</dependencies>
</project>
Modified: tuscany/sca-java-2.x/trunk/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/pom.xml?rev=918585&r1=918584&r2=918585&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/pom.xml Wed Mar 3 17:16:37 2010
@@ -109,7 +109,8 @@
<!--module>policy-xml-ws</module-->
<module>policy-logging</module>
<module>policy-transaction</module>
- <module>policy-transaction-runtime</module>
+ <module>policy-transaction-runtime</module>
+ <module>policy-transaction-runtime-geronimo</module>
<module>sca-api</module>
<module>sca-client-impl</module>
<module>sca-client-javascript</module>
