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)

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

9 files changed, 113 insertions, 23 deletions

diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..6f3f8d345f
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0

+SCA-Version: 1.1

+Bundle-Name: Apache Tuscany Transaction Policy Runtime Geronimo

+Bundle-Vendor: The Apache Software Foundation

+Bundle-Version: 2.0.0

+Bundle-ManifestVersion: 2

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-Description: Apache Tuscany Security Policy Model

+Import-Package: javax.security.auth.callback,

+ javax.security.auth.login,

+ javax.transaction;version="1.1.0",

+ javax.transaction.xa;version="1.1.0",

+ javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",

+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

+ org.apache.tuscany.sca.core;version="2.0.0",

+ org.apache.tuscany.sca.definitions;version="2.0.0",

+ org.apache.tuscany.sca.definitions.util;version="2.0.0",

+ org.apache.tuscany.sca.interfacedef;version="2.0.0",

+ org.apache.tuscany.sca.invocation;version="2.0.0",

+ org.apache.tuscany.sca.monitor;version="2.0.0",

+ org.apache.tuscany.sca.policy;version="2.0.0",

+ org.apache.tuscany.sca.policy.transaction;version="2.0.0",

+ org.apache.tuscany.sca.policy.util;version="2.0.0",

+ 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.runtime.geronimo

+Bundle-DocURL: http://www.apache.org/

+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
new file mode 100644
index 0000000000..2f8e9d0da0
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
@@ -0,0 +1,70 @@
+<?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>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
+    <name>Apache Tuscany SCA Transaction Policy Runtime (Geronimo)</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-transaction-runtime</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>
+        
+    </dependencies>
+
+</project>
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerWrapper.java b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
index eac7293e62..27e777b2c8 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerWrapper.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
@@ -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;
 
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionModuleActivator.java b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
index b027f3c117..3f43cac8d1 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionModuleActivator.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
@@ -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;
 
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 8e7b3d1728..890ac4694b 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -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

diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelperTestCaseOFF.java b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
index 18d42848d7..07ce921ebe 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelperTestCaseOFF.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
@@ -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 junit.framework.TestCase;
 
 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 {
 
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
index b9ce437176..9085f26d0e 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
@@ -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 @@ Import-Package: javax.security.auth.callback,
  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
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml b/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
index 81c1b8774f..fed1e69501 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml
index 7cf2a926ed..88eba37a7f 100644
--- a/sca-java-2.x/trunk/modules/pom.xml
+++ b/sca-java-2.x/trunk/modules/pom.xml
@@ -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>