Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 4125 invoked from network); 13 Nov 2007 02:56:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Nov 2007 02:56:10 -0000 Received: (qmail 18063 invoked by uid 500); 13 Nov 2007 02:55:57 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 18028 invoked by uid 500); 13 Nov 2007 02:55:57 -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 18017 invoked by uid 99); 13 Nov 2007 02:55:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2007 18:55:57 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Tue, 13 Nov 2007 02:56:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E63FA1A9832; Mon, 12 Nov 2007 18:55:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r594403 - in /geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src: main/java/org/apache/geronimo/j2ee/deployment/annotation/ test/java/org/apache/geronimo/j2ee/deployment/annotation/ test/resources/annotation/ Date: Tue, 13 Nov 2007 02:55:44 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071113025545.E63FA1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Nov 12 18:55:43 2007 New Revision: 594403 URL: http://svn.apache.org/viewvc?rev=594403&view=rev Log: handlerChains in DD overwrite HandlerChain annotation (GERONIMO-3598) Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java?rev=594403&r1=594402&r2=594403&view=diff ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java (original) +++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java Mon Nov 12 18:55:43 2007 @@ -217,7 +217,7 @@ ServiceRefType[] serviceRefs = annotatedApp.getServiceRefArray(); boolean exists = false; for ( ServiceRefType serviceRef : serviceRefs ) { - if ( serviceRef.getServiceRefName().getStringValue().trim().equals(serviceRefName) ) { + if ( serviceRef.getServiceRefName().getStringValue().trim().equals(serviceRefName) && !serviceRef.isSetHandlerChains()) { ServiceRefHandlerChainsType serviceRefHandlerChains = serviceRef.addNewHandlerChains(); for (HandlerChainType handlerChain : handlerChains.getHandlerChainArray()) { ServiceRefHandlerChainType serviceRefHandlerChain = serviceRefHandlerChains.addNewHandlerChain(); Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java?rev=594403&r1=594402&r2=594403&view=diff ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java (original) +++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java Mon Nov 12 18:55:43 2007 @@ -113,7 +113,7 @@ List annotatedMethods = classFinder.findAnnotatedMethods(HandlerChain.class); assertNotNull(annotatedMethods); - assertEquals(2, annotatedMethods.size()); + assertEquals(3, annotatedMethods.size()); assertTrue(annotatedMethods.contains(HandlerChainAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class}))); assertTrue(annotatedMethods.contains(HandlerChainAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{int.class}))); @@ -233,7 +233,7 @@ List annotatedMethods = classFinder.findAnnotatedMethods(WebServiceRef.class); assertNotNull(annotatedMethods); - assertEquals(4, annotatedMethods.size()); + assertEquals(5, annotatedMethods.size()); assertTrue(annotatedMethods.contains(WebServiceRefAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{boolean.class}))); assertTrue(annotatedMethods.contains(WebServiceRefAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class}))); assertTrue(annotatedMethods.contains(HandlerChainAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class}))); Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java?rev=594403&r1=594402&r2=594403&view=diff ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java (original) +++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java Mon Nov 12 18:55:43 2007 @@ -61,4 +61,12 @@ public void setAnnotatedMethod2(int ii) { } + @WebServiceRef(name = "WebServiceRef100", + value = javax.xml.ws.Service.class, + wsdlLocation = "WEB-INF/wsdl/WebServiceRef4.wsdl", + mappedName = "mappedName") + @HandlerChain(file = "annotation/handlers5.xml") + public void setAnnotatedMethod3(int ii) { + } + } Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml?rev=594403&r1=594402&r2=594403&view=diff ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml (original) +++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml Mon Nov 12 18:55:43 2007 @@ -101,5 +101,17 @@ annotatedField2 - + + WebServiceRef100 + int + int + + + + MyHandler + org.apache.handler.WebServiceHandler3 + + + + Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml?rev=594403&r1=594402&r2=594403&view=diff ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml (original) +++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml Mon Nov 12 18:55:43 2007 @@ -77,5 +77,17 @@ annotatedField2 - + + WebServiceRef100 + int + int + + + + MyHandler + org.apache.handler.WebServiceHandler3 + + + + Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml?rev=594403&r1=594402&r2=594403&view=diff ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml (original) +++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml Mon Nov 12 18:55:43 2007 @@ -59,6 +59,17 @@ + WebServiceRef100 + javax.xml.ws.Service + int + WEB-INF/wsdl/WebServiceRef4.wsdl + mappedName + + org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationTest + annotatedMethod3 + + + WebServiceRef14 boolean boolean