Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 6127 invoked from network); 11 Mar 2006 10:44:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Mar 2006 10:44:17 -0000 Received: (qmail 17256 invoked by uid 500); 11 Mar 2006 10:44:15 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 17228 invoked by uid 500); 11 Mar 2006 10:44:15 -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 17217 invoked by uid 500); 11 Mar 2006 10:44:15 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 17214 invoked by uid 99); 11 Mar 2006 10:44:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Mar 2006 02:44:15 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 11 Mar 2006 02:44:14 -0800 Received: (qmail 6004 invoked by uid 65534); 11 Mar 2006 10:43:54 -0000 Message-ID: <20060311104354.6003.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r385054 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/description/AxisOperation.java core/src/org/apache/axis2/description/AxisService.java webapp/ServiceParaEdit.jsp webapp/ViewGlobalHandlers.jsp Date: Sat, 11 Mar 2006 10:43:52 -0000 To: axis2-cvs@ws.apache.org From: deepal@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: deepal Date: Sat Mar 11 02:43:51 2006 New Revision: 385054 URL: http://svn.apache.org/viewcvs?rev=385054&view=rev Log: -fixing module dis-engagement problem -fixing few jsps Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp webservices/axis2/trunk/java/modules/webapp/ViewGlobalHandlers.jsp Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=385054&r1=385053&r2=385054&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Sat Mar 11 02:43:51 2006 @@ -147,7 +147,18 @@ } } engagedModules.remove(module); + log.info("remove mdoule from engage module list " + module.getName().getLocalPart()); } + } + + /** + * To remove module from engage module list + * + * @param module + */ + public void removeFromEngageModueList(AxisModule module) { + engagedModules.remove(module); + log.info("remove mdoule from engage module list " + module.getName().getLocalPart()); } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=385054&r1=385053&r2=385054&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Sat Mar 11 02:43:51 2006 @@ -830,6 +830,7 @@ while (operations.hasNext()) { AxisOperation axisOperation = (AxisOperation) operations.next(); phaseResolver.disEngageModulefromOperationChian(module, axisOperation); + axisOperation.removeFromEngageModueList(module); } } else { if (isEngaged(module.getName())) { @@ -838,6 +839,7 @@ while (operations.hasNext()) { AxisOperation axisOperation = (AxisOperation) operations.next(); phaseResolver.disEngageModulefromOperationChian(module, axisOperation); + axisOperation.removeFromEngageModueList(module); } } } Modified: webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp?rev=385054&r1=385053&r2=385054&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp (original) +++ webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp Sat Mar 11 02:43:51 2006 @@ -90,4 +90,4 @@ %>
- + \ No newline at end of file Modified: webservices/axis2/trunk/java/modules/webapp/ViewGlobalHandlers.jsp URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/ViewGlobalHandlers.jsp?rev=385054&r1=385053&r2=385054&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/webapp/ViewGlobalHandlers.jsp (original) +++ webservices/axis2/trunk/java/modules/webapp/ViewGlobalHandlers.jsp Sat Mar 11 02:43:51 2006 @@ -36,7 +36,7 @@ getAttribute(Constants.GLOBAL_HANDLERS); if(axisConfig != null ){ ArrayList handlers ; - ArrayList phases = axisConfig.getInPhasesUptoAndIncludingPostDispatch(); + ArrayList phases = axisConfig.getGlobalInFlow(); %>

In Flow up to and including dispatcher