Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 73527 invoked from network); 18 Mar 2008 19:17:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Mar 2008 19:17:20 -0000 Received: (qmail 17286 invoked by uid 500); 18 Mar 2008 19:17:18 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 17178 invoked by uid 500); 18 Mar 2008 19:17:18 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 17167 invoked by uid 500); 18 Mar 2008 19:17:18 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 17164 invoked by uid 99); 18 Mar 2008 19:17:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2008 12:17:18 -0700 X-ASF-Spam-Status: No, hits=-2000.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, 18 Mar 2008 19:16:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1F4231A9832; Tue, 18 Mar 2008 12:16:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r638514 - in /webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/engine/AxisConfiguration.java test-resources/deployment/module1/META-INF/module.xml Date: Tue, 18 Mar 2008 19:16:58 -0000 To: axis2-cvs@ws.apache.org From: gdaniels@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080318191659.1F4231A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gdaniels Date: Tue Mar 18 12:16:57 2008 New Revision: 638514 URL: http://svn.apache.org/viewvc?rev=638514&view=rev Log: Fix logic in deployment to allow duplicate phase names - now as long as the deployment rules don't conflict a module can specify an existing phase. Edit test module to make sure this functionality is working. Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=638514&r1=638513&r2=638514&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Tue Mar 18 12:16:57 2008 @@ -1203,17 +1203,21 @@ throw AxisFault.makeFault(e); } } - Phase phase = new Phase(); - phase.setName(d.getName()); - d.setTarget(phase); try { ec.deploy(d); + + if (d.getTarget() == null) { + Phase phase = new Phase(); + phase.setName(d.getName()); + d.setTarget(phase); + } + ec.rebuild(); } catch (Exception e) { throw AxisFault.makeFault(e); } - + phaseList = ec.getChain(); return phaseList; Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml?rev=638514&r1=638513&r2=638514&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml (original) +++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/module1/META-INF/module.xml Tue Mar 18 12:16:57 2008 @@ -54,4 +54,5 @@ + --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org