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 az...@apache.org on 2006/10/03 07:29:54 UTC
svn commit: r452309 - in /webservices/axis2/trunk/java/modules/kernel: conf/
src/org/apache/axis2/client/ src/org/apache/axis2/description/
src/org/apache/axis2/engine/ src/org/apache/axis2/phaseresolver/
src/org/apache/axis2/transport/http/ test/org/a...
Author: azeez
Date: Mon Oct 2 22:29:52 2006
New Revision: 452309
URL: http://svn.apache.org/viewvc?view=rev&rev=452309
Log:
s/disEngage/disengage
Added:
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
- copied, changed from r451982, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisEngagementTest.java
Removed:
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisEngagementTest.java
Modified:
webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
Modified: webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Mon Oct 2 22:29:52 2006
@@ -4,13 +4,13 @@
<!-- ================================================= -->
<parameter name="hotdeployment" locked="false">true</parameter>
<parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">false</parameter>
- <parameter name="enableSwA" locked="false">false</parameter>
-
+ <parameter name="enableMTOM" locked="false">false</parameter>
+ <parameter name="enableSwA" locked="false">false</parameter>
+
<!--Uncomment if you want to enable file caching for attachments -->
- <!--parameter name="cacheAttachments" locked="false">true</parameter>
- <parameter name="attachmentDIR" locked="false"></parameter>
- <parameter name="sizeThreshold" locked="false">4000</parameter-->
+ <!--parameter name="cacheAttachments" locked="false">true</parameter>
+ <parameter name="attachmentDIR" locked="false"></parameter>
+ <parameter name="sizeThreshold" locked="false">4000</parameter-->
<!--This will give out the timout of the configuration contexts, in seconds-->
<parameter name="ConfigContextTimeoutInterval" locked="false">30</parameter>
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Mon Oct 2 22:29:52 2006
@@ -300,10 +300,10 @@
*
* @param moduleName
*/
- public void disEngageModule(QName moduleName) {
+ public void disengageModule(QName moduleName) {
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
- axisService.disEngageModule(module);
+ axisService.disengageModule(module);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Mon Oct 2 22:29:52 2006
@@ -160,22 +160,22 @@
return addModuleOperations(moduleref, axisConfig, (AxisService) getParent());
}
- public void disEngageModule(AxisModule module) {
+ public void disengageModule(AxisModule module) {
if (module != null) {
if (getParent() != null) {
AxisService service = (AxisService) getParent();
AxisConfiguration axiConfiguration = service.getAxisConfiguration();
PhaseResolver phaseResolver = new PhaseResolver(axiConfiguration);
if (service.isEngaged(module.getName())) {
- phaseResolver.disEngageModulefromOperationChian(module, this);
+ phaseResolver.disengageModuleFromOperationChain(module, this);
} else if (axiConfiguration != null &&
axiConfiguration.isEngaged(module.getName())) {
- phaseResolver.disEngageModulefromOperationChian(module, this);
+ phaseResolver.disengageModuleFromOperationChain(module, this);
} else {
if (axiConfiguration != null) {
- phaseResolver.disEngageModulefromGlobalChains(module);
+ phaseResolver.disengageModuleFromGlobalChains(module);
}
- phaseResolver.disEngageModulefromOperationChian(module, this);
+ phaseResolver.disengageModuleFromOperationChain(module, this);
//removing operations added at the time of module engagemnt
HashMap moduleOperations = module.getOperations();
if (moduleOperations != null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Mon Oct 2 22:29:52 2006
@@ -1069,7 +1069,7 @@
return exposedTransports.contains(transport);
}
- public void disEngageModule(AxisModule module) {
+ public void disengageModule(AxisModule module) {
AxisConfiguration axisConfig = getAxisConfiguration();
if (axisConfig != null) {
PhaseResolver phaseResolver = new PhaseResolver(axisConfig);
@@ -1078,17 +1078,17 @@
Iterator operations = getChildren();
while (operations.hasNext()) {
AxisOperation axisOperation = (AxisOperation) operations.next();
- phaseResolver.disEngageModulefromOperationChian(module, axisOperation);
+ phaseResolver.disengageModuleFromOperationChain(module, axisOperation);
axisOperation.removeFromEngagedModuleList(module);
}
} else {
if (isEngaged(module.getName())) {
- phaseResolver.disEngageModulefromGlobalChains(module);
+ phaseResolver.disengageModuleFromGlobalChains(module);
removeModuleOperations(module);
Iterator operations = getChildren();
while (operations.hasNext()) {
AxisOperation axisOperation = (AxisOperation) operations.next();
- phaseResolver.disEngageModulefromOperationChian(module, axisOperation);
+ phaseResolver.disengageModuleFromOperationChain(module, axisOperation);
axisOperation.removeFromEngagedModuleList(module);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java Mon Oct 2 22:29:52 2006
@@ -141,7 +141,7 @@
public void disengageModule(AxisModule module) throws AxisFault {
for (Iterator serviceIter = getServices(); serviceIter.hasNext();) {
AxisService axisService = (AxisService) serviceIter.next();
- axisService.disEngageModule(module);
+ axisService.disengageModule(module);
}
removeFromEngageList(module.getName());
}
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?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- 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 Mon Oct 2 22:29:52 2006
@@ -410,14 +410,14 @@
*
* @param module
*/
- public void disEngageModule(AxisModule module) {
+ public void disengageModule(AxisModule module) {
if (module != null && isEngaged(module.getName())) {
PhaseResolver phaseResolver = new PhaseResolver(this);
- phaseResolver.disEngageModulefromGlobalChains(module);
+ phaseResolver.disengageModuleFromGlobalChains(module);
Iterator serviceItr = getServices().values().iterator();
while (serviceItr.hasNext()) {
AxisService axisService = (AxisService) serviceItr.next();
- axisService.disEngageModule(module);
+ axisService.disengageModule(module);
}
Iterator serviceGroups = getServiceGroups();
while (serviceGroups.hasNext()) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java Mon Oct 2 22:29:52 2006
@@ -202,7 +202,7 @@
*
* @param module
*/
- public void disEngageModulefromGlobalChains(AxisModule module) {
+ public void disengageModuleFromGlobalChains(AxisModule module) {
//INFLOW
Flow flow = module.getInFlow();
if (flow != null) {
@@ -245,7 +245,7 @@
*
* @param module
*/
- public void disEngageModulefromOperationChian(AxisModule module, AxisOperation operation) {
+ public void disengageModuleFromOperationChain(AxisModule module, AxisOperation operation) {
//INFLOW
Flow flow = module.getInFlow();
if (flow != null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java?view=diff&rev=452309&r1=452308&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java Mon Oct 2 22:29:52 2006
@@ -522,14 +522,14 @@
} else {
String opName = req.getParameter("operation");
AxisOperation op = service.getOperation(new QName(opName));
- op.disEngageModule(module);
+ op.disengageModule(module);
req.getSession().setAttribute("status", "disenged from the operation");
}
} else {
if (axisConfiguration.isEngaged(module.getName())) {
req.getSession().setAttribute("status", "can not disengage module has engage to top levle");
} else {
- service.disEngageModule(axisConfiguration.getModule(new QName(moduleName)));
+ service.disengageModule(axisConfiguration.getModule(new QName(moduleName)));
req.getSession().setAttribute("status", "disenged from the service");
}
}
Copied: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java (from r451982, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisEngagementTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java?view=diff&rev=452309&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisEngagementTest.java&r1=451982&p2=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java&r2=452309
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisEngagementTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java Mon Oct 2 22:29:52 2006
@@ -30,7 +30,7 @@
*
*/
-public class ModuleDisEngagementTest extends TestCase {
+public class ModuleDisengagementTest extends TestCase {
AxisConfiguration er;
String serviceName = "testService";
QName opName = new QName("testOperation");
@@ -67,7 +67,7 @@
er.engageModule(module.getName());
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
- er.disEngageModule(module);
+ er.disengageModule(module);
assertEquals(predisptah.getHandlerCount(), 0);
assertEquals(0, userPhase.getHandlerCount());
}
@@ -92,7 +92,7 @@
er.engageModule(module.getName());
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
- service.disEngageModule(module);
+ service.disengageModule(module);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(0, userPhase.getHandlerCount());
}
@@ -102,7 +102,7 @@
AxisModule module = er.getModule(new QName("testModule"));
assertNotNull(module);
er.engageModule(module.getName());
- er.disEngageModule(module);
+ er.disengageModule(module);
er.engageModule(module.getName());
}
@@ -126,7 +126,7 @@
er.engageModule(module.getName());
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
- operation.disEngageModule(module);
+ operation.disengageModule(module);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(0, userPhase.getHandlerCount());
}
@@ -151,7 +151,7 @@
service.engageModule(module, er);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
- service.disEngageModule(module);
+ service.disengageModule(module);
assertEquals(predisptah.getHandlerCount(), 0);
assertEquals(0, userPhase.getHandlerCount());
}
@@ -176,7 +176,7 @@
service.engageModule(module, er);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
- operation.disEngageModule(module);
+ operation.disengageModule(module);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(0, userPhase.getHandlerCount());
}
@@ -201,7 +201,7 @@
operation.engageModule(module, er);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
- operation.disEngageModule(module);
+ operation.disengageModule(module);
assertEquals(predisptah.getHandlerCount(), 0);
assertEquals(0, userPhase.getHandlerCount());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org