You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2006/03/11 11:43:52 UTC
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
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 @@
%>
<form>
-<jsp:include page="include/adminfooter.jsp"></jsp:include>
+<jsp:include page="include/adminfooter.jsp"></jsp:include>
\ 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();
%>
<h3> In Flow up to and including dispatcher </h3>
<ul>