svn commit: rev 56274 - in geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector: . deployment outbound

[dj...@apache.org]

Author: djencks
Date: Mon Nov  1 11:43:43 2004
New Revision: 56274

Added:
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
      - copied, changed from rev 56167, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java
      - copied, changed from rev 56167, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
Removed:
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java
Modified:
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Log:
Move runtime classes to appropriate runtime module

Copied: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java (from rev 56167, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java)
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java	Mon Nov  1 11:43:43 2004
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.connector.deployment;
+package org.apache.geronimo.connector;
 
 import java.util.Hashtable;
 import javax.management.MalformedObjectNameException;

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java	Mon Nov  1 11:43:43 2004
@@ -40,6 +40,7 @@
 
 import org.apache.geronimo.common.propertyeditor.PropertyEditors;
 import org.apache.geronimo.connector.ActivationSpecInfo;
+import org.apache.geronimo.connector.ResourceAdapterModuleImpl;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
@@ -50,6 +51,7 @@
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
 import org.apache.geronimo.connector.outbound.security.PasswordCredentialRealm;
+import org.apache.geronimo.connector.outbound.JCAConnectionFactoryImpl;
 import org.apache.geronimo.deployment.DeploymentException;
 import org.apache.geronimo.deployment.service.GBeanHelper;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
@@ -656,15 +658,15 @@
             throw new DeploymentException("Unable to create GMBean", e);
         }
         TransactionSupport transactionSupport = null;
-        if (connectionManager.getNoTransaction() != null) {
+        if (connectionManager.isSetNoTransaction()) {
             transactionSupport = NoTransactions.INSTANCE;
-        } else if (connectionManager.getLocalTransaction() != null) {
+        } else if (connectionManager.isSetLocalTransaction()) {
             transactionSupport = LocalTransactions.INSTANCE;
-        } else if (connectionManager.getTransactionLog() != null) {
+        } else if (connectionManager.isSetTransactionLog()) {
             transactionSupport = TransactionLog.INSTANCE;
-        } else if (connectionManager.getXaTransaction() != null) {
-            transactionSupport = new XATransactions(connectionManager.getXaTransaction().getTransactionCaching() != null,
-                    connectionManager.getXaTransaction().getThreadCaching() != null);
+        } else if (connectionManager.isSetXaTransaction()) {
+            transactionSupport = new XATransactions(connectionManager.getXaTransaction().isSetTransactionCaching(),
+                    connectionManager.getXaTransaction().isSetThreadCaching());
         } else {
             throw new DeploymentException("Unexpected transaction support element");
         }

Copied: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java (from rev 56167, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java)
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java	Mon Nov  1 11:43:43 2004
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.connector.deployment;
+package org.apache.geronimo.connector.outbound;
 
 import java.util.Hashtable;
 import javax.management.ObjectName;