Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 14055 invoked from network); 3 May 2007 00:00:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 May 2007 00:00:54 -0000 Received: (qmail 52711 invoked by uid 500); 3 May 2007 00:01:00 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 52664 invoked by uid 500); 3 May 2007 00:01:00 -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 List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 52652 invoked by uid 99); 3 May 2007 00:01:00 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 17:01:00 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 17:00:53 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6FD1D1A9838; Wed, 2 May 2007 17:00:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r534660 - /geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Date: Thu, 03 May 2007 00:00:33 -0000 To: scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070503000033.6FD1D1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Wed May 2 17:00:32 2007 New Revision: 534660 URL: http://svn.apache.org/viewvc?view=rev&rev=534660 Log: Don't try and process annotations pointing to derivations of EJBContext Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?view=diff&rev=534660&r1=534659&r2=534660 ============================================================================== --- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original) +++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Wed May 2 17:00:32 2007 @@ -301,6 +301,10 @@ String resourceName = getResourceName(annotation, method, field); String resourceType = getResourceType(annotation, method, field); + if (resourceType.equals("javax.ejb.SessionContext")) return true; + if (resourceType.equals("javax.ejb.MessageDrivenContext")) return true; + if (resourceType.equals("javax.ejb.EntityContext")) return true; + //If it already exists in xml as a message-destination-ref or resource-env-ref, we are done. MessageDestinationRefType[] messageDestinationRefs = annotatedApp.getMessageDestinationRefArray(); for (MessageDestinationRefType messageDestinationRef : messageDestinationRefs) {