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 gd...@apache.org on 2007/05/08 04:39:08 UTC
svn commit: r536043 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/engine/
kernel/src/org/apache/axis2/client/ kernel/src/org/apache/axis2/deployment/
kernel/src/org/apache/axis2/description/ kernel/src/org/apache/axis2/e...
Author: gdaniels
Date: Mon May 7 19:39:07 2007
New Revision: 536043
URL: http://svn.apache.org/viewvc?view=rev&rev=536043
Log:
Refactor AxisDescription.engageModule() as discussed on axis-dev (remove AxisConfiguration argument).
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.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/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Mon May 7 19:39:07 2007
@@ -103,7 +103,7 @@
dispatchPhase.addHandler(smbd);
dispatchPhase.addHandler(id);
config.getGlobalInFlow().add(dispatchPhase);
- service.engageModule(m1, config);
+ service.engageModule(m1);
AxisOperation axisOperation = new OutInAxisOperation(
);
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=536043&r1=536042&r2=536043
==============================================================================
--- 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 May 7 19:39:07 2007
@@ -320,7 +320,7 @@
synchronized (this) {
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
- axisService.engageModule(module, axisConfig);
+ axisService.engageModule(module);
} else {
throw new AxisFault("Unable to engage module : " + moduleName);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java Mon May 7 19:39:07 2007
@@ -154,8 +154,7 @@
moduleName = axisModule.getName();
if (!axisDescription.isEngaged(moduleName)) {
- axisDescription.engageModule(axisModule, axisDescription
- .getAxisConfiguration());
+ axisDescription.engageModule(axisModule);
(axisModule.getModule()).engageNotify(axisDescription);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Mon May 7 19:39:07 2007
@@ -452,7 +452,7 @@
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
- serviceGroup.engageModule(axisConfig.getModule(moduleName), axisConfig);
+ serviceGroup.engageModule(axisConfig.getModule(moduleName));
} else {
throw new DeploymentException(
Messages.getMessage(
@@ -484,7 +484,7 @@
((QName) list.get(i)).getLocalPart()));
}
- axisService.engageModule(module, axisConfig);
+ axisService.engageModule(module);
}
for (Iterator iterator = axisService.getOperations(); iterator.hasNext();) {
@@ -496,7 +496,7 @@
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
- opDesc.engageModule(module, axisConfig);
+ opDesc.engageModule(module);
} else {
throw new DeploymentException(
Messages.getMessage(
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Mon May 7 19:39:07 2007
@@ -20,9 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.util.WSDLSerializationUtil;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMFactory;
@@ -98,7 +96,7 @@
return null;
}
- public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig) throws AxisFault {
+ public void engageModule(AxisModule axisModule) throws AxisFault {
throw new UnsupportedOperationException("Sorry we do not support this");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Mon May 7 19:39:07 2007
@@ -21,16 +21,11 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.SOAPModuleMessage;
-import org.apache.axis2.wsdl.HTTPHeaderMessage;
-import org.apache.axis2.wsdl.SOAPHeaderMessage;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMAbstractFactory;
-import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.Map;
import java.util.ArrayList;
@@ -107,7 +102,7 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig) throws AxisFault {
+ public void engageModule(AxisModule axisModule) throws AxisFault {
throw new UnsupportedOperationException("Sorry we do not support this");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java Mon May 7 19:39:07 2007
@@ -22,7 +22,6 @@
import org.apache.axis2.Constants;
import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMFactory;
@@ -97,7 +96,7 @@
return null;
}
- public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig) throws AxisFault {
+ public void engageModule(AxisModule axisModule) throws AxisFault {
throw new UnsupportedOperationException("Sorry we do not support this");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Mon May 7 19:39:07 2007
@@ -245,7 +245,7 @@
/**
* Applies the policies on the Description Hierarchy recursively.
*
- * @throws AxisFault
+ * @throws AxisFault an error occurred applying the policy
*/
public void applyPolicy() throws AxisFault {
@@ -359,7 +359,7 @@
if (!(module == null || description.isEngaged(axisModule.getName()))) {
// engages the module to AxisDescription
- description.engageModule(axisModule, getAxisConfiguration());
+ description.engageModule(axisModule);
// notifies the module about the engagement
axisModule.getModule().engageNotify(description);
}
@@ -382,13 +382,11 @@
public abstract Object getKey();
/**
- * Engaging a module to different level
+ * Engage a Module at this level
*
- * @param axisModule
- * @param axisConfig
+ * @param axisModule the Module to engage
*/
- public abstract void engageModule(AxisModule axisModule,
- AxisConfiguration axisConfig) throws AxisFault;
+ public abstract void engageModule(AxisModule axisModule) throws AxisFault;
// /**
// * @deprecate Please use String version instead
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java Mon May 7 19:39:07 2007
@@ -19,7 +19,6 @@
package org.apache.axis2.description;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMFactory;
@@ -103,7 +102,7 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig) throws AxisFault {
+ public void engageModule(AxisModule axisModule) throws AxisFault {
throw new UnsupportedOperationException("Sorry we do not support this");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java?view=diff&rev=536043&r1=536042&r2=536043
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java Mon May 7 19:39:07 2007
@@ -18,7 +18,6 @@
package org.apache.axis2.description;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.wsdl.SOAPHeaderMessage;
import org.apache.ws.commons.schema.*;
@@ -164,7 +163,7 @@
return soapHeaders;
}
- public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig) throws AxisFault {
+ public void engageModule(AxisModule axisModule) throws AxisFault {
throw new UnsupportedOperationException("Sorry we do not support this");
}
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=536043&r1=536042&r2=536043
==============================================================================
--- 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 May 7 19:39:07 2007
@@ -148,9 +148,9 @@
* @param moduleref
* @throws AxisFault
*/
- public final void engageModule(AxisModule moduleref, AxisConfiguration axisConfig)
+ public final void engageModule(AxisModule moduleref)
throws AxisFault {
- ArrayList moduleOperations = engageModuleToOperation(moduleref, axisConfig);
+ ArrayList moduleOperations = engageModuleToOperation(moduleref);
AxisService service = (AxisService) getParent();
if (service != null) {
for (int i = 0; i < moduleOperations.size(); i++) {
@@ -160,7 +160,7 @@
}
}
- private ArrayList engageModuleToOperation(AxisModule moduleref, AxisConfiguration axisConfig)
+ private ArrayList engageModuleToOperation(AxisModule moduleref)
throws AxisFault {
if (moduleref == null) {
return null;
@@ -176,6 +176,7 @@
return new ArrayList();
}
}
+ AxisConfiguration axisConfig = getAxisConfiguration();
PhaseResolver phaseResolver = new PhaseResolver(axisConfig);
phaseResolver.engageModuleToOperation(this, moduleref);
Module module = moduleref.getModule();
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=536043&r1=536042&r2=536043
==============================================================================
--- 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 May 7 19:39:07 2007
@@ -470,8 +470,7 @@
*
* @param module
*/
- public void addModuleOperations(AxisModule module, AxisConfiguration axisConfig)
- throws AxisFault {
+ public void addModuleOperations(AxisModule module) throws AxisFault {
HashMap map = module.getOperations();
Collection col = map.values();
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
@@ -514,11 +513,6 @@
while (modules.hasNext()) {
AxisModule module = (AxisModule) modules.next();
AxisServiceGroup parent = (AxisServiceGroup) getParent();
- AxisConfiguration axisConfig = null;
-
- if (parent != null) {
- axisConfig = (AxisConfiguration) parent.getParent();
- }
try {
Module moduleImpl = module.getModule();
@@ -526,7 +520,7 @@
// notifying module for service engagement
moduleImpl.engageNotify(axisOperation);
}
- axisOperation.engageModule(module, axisConfig);
+ axisOperation.engageModule(module);
} catch (AxisFault axisFault) {
log.info(Messages.getMessage("modulealredyengagetoservice", module.getName()));
}
@@ -660,7 +654,7 @@
*
* @param axisModule
*/
- public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig)
+ public void engageModule(AxisModule axisModule)
throws AxisFault {
if (axisModule == null) {
throw new AxisFault(Messages.getMessage("modulenf"));
@@ -683,13 +677,13 @@
moduleImpl.engageNotify(this);
}
// adding module operations
- addModuleOperations(axisModule, axisConfig);
+ addModuleOperations(axisModule);
Iterator operations = getOperations();
while (operations.hasNext()) {
AxisOperation axisOperation = (AxisOperation) operations.next();
- axisOperation.engageModule(axisModule, axisConfig);
+ axisOperation.engageModule(axisModule);
}
engagedModules.add(axisModule);
}
@@ -761,7 +755,6 @@
+ " named " + axisOperation.getName());
}
}
- return;
} else {
operationsAliasesMap.put(action, axisOperation);
}
@@ -854,7 +847,7 @@
}
} else {
String[] eprArray = getEPRs(requestIP);
- getWSDL(out, eprArray, servicePath);
+ getWSDL(out, eprArray);
}
}
@@ -963,7 +956,7 @@
} else {
setWsdlFound(true);
//pick the endpointName and take it as the epr for the WSDL
- getWSDL(out, new String[]{this.endpointName}, "services");
+ getWSDL(out, new String[]{this.endpointName});
}
}
@@ -993,8 +986,7 @@
}
}
- private void getWSDL(OutputStream out, String[] serviceURL,
- String servicePath) throws AxisFault {
+ private void getWSDL(OutputStream out, String[] serviceURL) throws AxisFault {
// Retrieve WSDL using the same data retrieval path for GetMetadata request.
DataRetrievalRequest request = new DataRetrievalRequest();
request.putDialect(DRConstants.SPEC.DIALECT_TYPE_WSDL);
@@ -2127,7 +2119,7 @@
public Data[] getData(DataRetrievalRequest request,
MessageContext msgContext) throws AxisFault {
- Data[] data = null;
+ Data[] data;
String dialect = request.getDialect();
AxisDataLocator dataLocator = null;
int nextDataLocatorIndex = 0;
@@ -2140,6 +2132,8 @@
}
}
+ if (dataLocator == null) return null;
+
data = dataLocator.getData(request, msgContext);
// Null means Data Locator not understood request. Automatically find
// Data Locator in the hierarchy to process the request.
@@ -2200,7 +2194,7 @@
*/
private AxisDataLocator getDataLocator(LocatorType locatorType, String dialect)
throws AxisFault {
- AxisDataLocator locator = null;
+ AxisDataLocator locator;
if (locatorType == LocatorType.SERVICE_DIALECT) {
locator = getServiceDataLocator(dialect);
} else if (locatorType == LocatorType.SERVICE_LEVEL) {
@@ -2238,7 +2232,7 @@
*/
private AxisDataLocator getServiceDataLocator(String dialect)
throws AxisFault {
- AxisDataLocator locator = null;
+ AxisDataLocator locator;
locator = (AxisDataLocator) dataLocators.get(dialect);
if (locator == null) {
String className = (String) dataLocatorClassNames.get(dialect);
@@ -2283,7 +2277,7 @@
protected AxisDataLocator loadDataLocator(String className)
throws AxisFault {
- AxisDataLocator locator = null;
+ AxisDataLocator locator;
try {
Class dataLocator;
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=536043&r1=536042&r2=536043
==============================================================================
--- 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 May 7 19:39:07 2007
@@ -66,9 +66,9 @@
}
/**
- * Adds module configuration , if there is moduleConfig tag in service.
+ * Adds module configuration, if there is moduleConfig tag in service.
*
- * @param moduleConfiguration
+ * @param moduleConfiguration the ModuleConfiguration to add
*/
public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
if (moduleConfigmap == null) {
@@ -109,7 +109,7 @@
// notyfying module for service engagement
moduleImpl.engageNotify(service);
}
- service.engageModule(axisModule, axisConfig);
+ service.engageModule(axisModule);
} else {
throw new AxisFault(Messages.getMessage("modulenotavailble", moduleName));
}
@@ -141,7 +141,7 @@
// notyfying module for service engagement
moduleImpl.engageNotify(service);
}
- service.engageModule(axisModule, axisConfig);
+ service.engageModule(axisModule);
} else {
throw new AxisFault(Messages.getMessage("modulenotavailble", moduleName));
}
@@ -176,7 +176,7 @@
engagedModules.remove(moduleName);
}
- public void engageModule(AxisModule module, AxisConfiguration axisConfig) throws AxisFault {
+ public void engageModule(AxisModule module) throws AxisFault {
String moduleName = module.getName();
boolean isEngagable;
for (Iterator iterator = engagedModules.iterator(); iterator.hasNext();) {
@@ -188,7 +188,7 @@
}
for (Iterator serviceIter = getServices(); serviceIter.hasNext();) {
AxisService axisService = (AxisService) serviceIter.next();
- axisService.engageModule(module, axisConfig);
+ axisService.engageModule(module);
}
addToengagedModules(moduleName);
}
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=536043&r1=536042&r2=536043
==============================================================================
--- 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 May 7 19:39:07 2007
@@ -297,7 +297,7 @@
Iterator enModule = engagedModules.iterator();
while (enModule.hasNext()) {
String moduleName = (String) enModule.next();
- axisServiceGroup.engageModule(getModule(moduleName), this);
+ axisServiceGroup.engageModule(getModule(moduleName));
}
services = axisServiceGroup.getServices();
while (services.hasNext()) {
@@ -427,12 +427,7 @@
}
}
- public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig)
- throws AxisFault {
- engageModule(axisModule);
- }
-
- private void engageModule(AxisModule module) throws AxisFault {
+ public void engageModule(AxisModule module) throws AxisFault {
boolean isEngagable;
if (module != null) {
String moduleName = module.getName();
@@ -452,7 +447,7 @@
while (servicegroups.hasNext()) {
AxisServiceGroup serviceGroup = (AxisServiceGroup) servicegroups
.next();
- serviceGroup.engageModule(module, this);
+ serviceGroup.engageModule(module);
}
engagedModules.add(module.getName());
}
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=536043&r1=536042&r2=536043
==============================================================================
--- 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 May 7 19:39:07 2007
@@ -314,8 +314,7 @@
serviceName).getOperation(new QName(operationName));
od.engageModule(
- configContext.getAxisConfiguration().getModule(moduleName),
- configContext.getAxisConfiguration());
+ configContext.getAxisConfiguration().getModule(moduleName));
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName
+
@@ -348,8 +347,7 @@
if ((serviceName != null) && (moduleName != null)) {
try {
configContext.getAxisConfiguration().getService(serviceName).engageModule(
- configContext.getAxisConfiguration().getModule(moduleName),
- configContext.getAxisConfiguration());
+ configContext.getAxisConfiguration().getModule(moduleName));
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName
+
@@ -384,8 +382,7 @@
if ((serviceName != null) && (moduleName != null)) {
configContext.getAxisConfiguration().getServiceGroup(serviceName).engageModule(
- configContext.getAxisConfiguration().getModule(moduleName),
- configContext.getAxisConfiguration());
+ configContext.getAxisConfiguration().getModule(moduleName));
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName
+
Modified: 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=536043&r1=536042&r2=536043
==============================================================================
--- 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 May 7 19:39:07 2007
@@ -150,7 +150,7 @@
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(0);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
- service.engageModule(module, er);
+ service.engageModule(module);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
service.disengageModule(module);
@@ -175,7 +175,7 @@
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(0);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
- service.engageModule(module, er);
+ service.engageModule(module);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
operation.disengageModule(module);
@@ -200,7 +200,7 @@
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(0);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
- operation.engageModule(module, er);
+ operation.engageModule(module);
assertEquals(predisptah.getHandlerCount(), 2);
assertEquals(1, userPhase.getHandlerCount());
operation.disengageModule(module);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org