svn commit: r153524 - geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java

[djencks]

Author: djencks
Date: Sat Feb 12 10:17:04 2005
New Revision: 153524

URL: http://svn.apache.org/viewcvs?view=rev&rev=153524
Log:
don't assume there is an outbound adapter

Modified:
    
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java

Modified: 
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?view=diff&r1=153523&r2=153524
==============================================================================
--- 
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
 (original)
+++ 
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
 Sat Feb 12 10:17:04 2005
@@ -393,7 +393,7 @@
 
     private void addConnectorGBeans(EARContext earContext, J2eeContext 
moduleJ2eeContext, ObjectName resourceAdapterModuleObjectName, ConnectorType 
connector, GerConnectorType geronimoConnector, ClassLoader cl) throws 
DeploymentException {
         ResourceadapterType resourceadapter = connector.getResourceadapter();
-        String transactionSupport = 
resourceadapter.getOutboundResourceadapter().getTransactionSupport().getStringValue().trim();
+
         GerResourceadapterType[] geronimoResourceAdapters = 
geronimoConnector.getResourceadapterArray();
         for (int k = 0; k < geronimoResourceAdapters.length; k++) {
             GerResourceadapterType geronimoResourceAdapter = 
geronimoResourceAdapters[k];
@@ -424,6 +424,10 @@
 
             // ManagedConnectionFactory setup
             if (geronimoResourceAdapter.isSetOutboundResourceadapter()) {
+                if (!resourceadapter.isSetOutboundResourceadapter()) {
+                    throw new DeploymentException("Geronimo plan configures an 
outbound resource adapter but ra.xml does not describe any");
+                }
+                String transactionSupport = 
resourceadapter.getOutboundResourceadapter().getTransactionSupport().getStringValue().trim();
                 for (int i = 0; i < 
geronimoResourceAdapter.getOutboundResourceadapter().getConnectionDefinitionArray().length;
 i++) {
                     GerConnectionDefinitionType geronimoConnectionDefinition = 
geronimoResourceAdapter.getOutboundResourceadapter().getConnectionDefinitionArray(i);
                     assert geronimoConnectionDefinition != null: "Null 
GeronimoConnectionDefinition";