Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 80639 invoked from network); 12 Mar 2007 17:40:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Mar 2007 17:40:14 -0000 Received: (qmail 9934 invoked by uid 500); 12 Mar 2007 17:40:23 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 9901 invoked by uid 500); 12 Mar 2007 17:40:23 -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 9890 invoked by uid 99); 12 Mar 2007 17:40:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2007 10:40:22 -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; Mon, 12 Mar 2007 10:40:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 988061A983A; Mon, 12 Mar 2007 10:39:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517304 - /geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java Date: Mon, 12 Mar 2007 17:39:53 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070312173953.988061A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Mon Mar 12 10:39:52 2007 New Revision: 517304 URL: http://svn.apache.org/viewvc?view=rev&rev=517304 Log: GERONIMO-2956 don't try to process class level HanlderChain annotations until we understand what they mean, if anything Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java?view=diff&rev=517304&r1=517303&r2=517304 ============================================================================== --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java (original) +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java Mon Mar 12 10:39:52 2007 @@ -103,17 +103,21 @@ private static void processHandlerChain(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException { log.debug("processHandlerChain(): Entry: AnnotatedApp: " + annotatedApp.toString()); - List classeswithHandlerChain = classFinder.findAnnotatedClasses(HandlerChain.class); +// List classeswithHandlerChain = classFinder.findAnnotatedClasses(HandlerChain.class); List methodswithHandlerChain = classFinder.findAnnotatedMethods(HandlerChain.class); List fieldswithHandlerChain = classFinder.findAnnotatedFields(HandlerChain.class); - // Class-level annotation - for ( Class cls : classeswithHandlerChain ) { - HandlerChain handlerChain = (HandlerChain) cls.getAnnotation(HandlerChain.class); - if ( handlerChain != null ) { - addHandlerChain(annotatedApp, handlerChain, cls, null, null); - } - } +// TODO: GERONIMO-2956 +// If we ultimately determine that handler chain annotations at a class-level do not need to be processed +// in conjunction with any other annotations, which seems likely at this point, then these comments can be +// removed +// Class-level annotation +// for ( Class cls : classeswithHandlerChain ) { +// HandlerChain handlerChain = (HandlerChain) cls.getAnnotation(HandlerChain.class); +// if ( handlerChain != null ) { +// addHandlerChain(annotatedApp, handlerChain, cls, null, null); +// } +// } // Method-level annotation for ( Method method : methodswithHandlerChain ) {