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 2007/06/28 09:45:22 UTC
svn commit: r551484 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description:
AxisDescription.java AxisOperation.java AxisService.java
AxisServiceGroup.java
Author: deepal
Date: Thu Jun 28 00:45:20 2007
New Revision: 551484
URL: http://svn.apache.org/viewvc?view=rev&rev=551484
Log:
we need to call engageNotify when we engage module to any description.
I think its ok to call both parent and its children
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.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
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=551484&r1=551483&r2=551484
==============================================================================
--- 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 Thu Jun 28 00:45:20 2007
@@ -431,16 +431,21 @@
String existing = ((AxisModule)iterator.next()).getName();
if (!Utils.checkVersion(moduleName, existing)) {
throw new AxisFault(Messages.getMessage("mismatchedModuleVersions",
- getClass().getName(),
- moduleName,
- existing));
+ getClass().getName(),
+ moduleName,
+ existing));
}
}
-
+ //We need to call engageNotify before we engage the module , then only
+ // we can make sure everything is ok to engage the module to description (as an example policy)
+ Module module = axisModule.getModule();
+ if (module != null) {
+ module.engageNotify(this);
+ }
// If we have anything specific to do, let that happen
onEngage(axisModule, source);
- engagedModules.put(axisModule.getName(), axisModule);
+ engagedModules.put(axisModule.getName(), axisModule);
}
protected void onEngage(AxisModule module, AxisDescription engager) throws AxisFault {
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=551484&r1=551483&r2=551484
==============================================================================
--- 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 Thu Jun 28 00:45:20 2007
@@ -164,14 +164,9 @@
service.addModuleOperations(axisModule);
}
}
-
AxisConfiguration axisConfig = getAxisConfiguration();
PhaseResolver phaseResolver = new PhaseResolver(axisConfig);
phaseResolver.engageModuleToOperation(this, axisModule);
- Module module = axisModule.getModule();
- if (module != null) {
- module.engageNotify(this);
- }
}
protected void onDisengage(AxisModule module) {
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=551484&r1=551483&r2=551484
==============================================================================
--- 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 Thu Jun 28 00:45:20 2007
@@ -520,11 +520,6 @@
while (modules.hasNext()) {
AxisModule module = (AxisModule) modules.next();
try {
- Module moduleImpl = module.getModule();
- if (moduleImpl != null) {
- // notifying module for service engagement
- moduleImpl.engageNotify(axisOperation);
- }
axisOperation.engageModule(module);
} catch (AxisFault axisFault) {
log.info(Messages.getMessage("modulealredyengagetoservice", module.getName()));
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=551484&r1=551483&r2=551484
==============================================================================
--- 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 Thu Jun 28 00:45:20 2007
@@ -98,11 +98,6 @@
} else {
throw new AxisFault(Messages.getMessage("modulenotavailble"));
}
- Module moduleImpl = axisModule.getModule();
- if (moduleImpl != null) {
- // notyfying module for service engagement
- moduleImpl.engageNotify(service);
- }
service.engageModule(axisModule);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org