Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 19162 invoked from network); 12 Feb 2005 18:17:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 12 Feb 2005 18:17:08 -0000 Received: (qmail 11714 invoked by uid 500); 12 Feb 2005 18:17:07 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 11565 invoked by uid 500); 12 Feb 2005 18:17:07 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 11552 invoked by uid 99); 12 Feb 2005 18:17:06 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 12 Feb 2005 10:17:06 -0800 Received: (qmail 19127 invoked by uid 65534); 12 Feb 2005 18:17:05 -0000 Message-ID: <20050212181705.19126.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 12 Feb 2005 18:17:05 -0000 Subject: svn commit: r153524 - geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java To: scm@geronimo.apache.org From: djencks@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: djencks Date: Sat Feb 12 10:17:04 2005 New Revision: 153524 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D153524 Log: don't assume there is an outbound adapter Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilder.java Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/gero= nimo/connector/deployment/ConnectorModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder= /src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.j= ava?view=3Ddiff&r1=3D153523&r2=3D153524 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilder.java (original) +++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilder.java Sat Feb 12 10:17:04 2005 @@ -393,7 +393,7 @@ =20 private void addConnectorGBeans(EARContext earContext, J2eeContext mod= uleJ2eeContext, ObjectName resourceAdapterModuleObjectName, ConnectorType c= onnector, GerConnectorType geronimoConnector, ClassLoader cl) throws Deploy= mentException { ResourceadapterType resourceadapter =3D connector.getResourceadapt= er(); - String transactionSupport =3D resourceadapter.getOutboundResourcea= dapter().getTransactionSupport().getStringValue().trim(); + GerResourceadapterType[] geronimoResourceAdapters =3D geronimoConn= ector.getResourceadapterArray(); for (int k =3D 0; k < geronimoResourceAdapters.length; k++) { GerResourceadapterType geronimoResourceAdapter =3D geronimoRes= ourceAdapters[k]; @@ -424,6 +424,10 @@ =20 // ManagedConnectionFactory setup if (geronimoResourceAdapter.isSetOutboundResourceadapter()) { + if (!resourceadapter.isSetOutboundResourceadapter()) { + throw new DeploymentException("Geronimo plan configure= s an outbound resource adapter but ra.xml does not describe any"); + } + String transactionSupport =3D resourceadapter.getOutboundR= esourceadapter().getTransactionSupport().getStringValue().trim(); for (int i =3D 0; i < geronimoResourceAdapter.getOutboundR= esourceadapter().getConnectionDefinitionArray().length; i++) { GerConnectionDefinitionType geronimoConnectionDefiniti= on =3D geronimoResourceAdapter.getOutboundResourceadapter().getConnectionDe= finitionArray(i); assert geronimoConnectionDefinition !=3D null: "Null G= eronimoConnectionDefinition";