You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2007/07/04 09:17:14 UTC
svn commit: r553108 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment:
DeploymentEngine.java ServiceDeployer.java
Author: deepal
Date: Wed Jul 4 00:17:13 2007
New Revision: 553108
URL: http://svn.apache.org/viewvc?view=rev&rev=553108
Log:
I think we need to delete the service if user delete that from the repo no matter whether the hotuodate is enable or not.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
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=553108&r1=553107&r2=553108
==============================================================================
--- 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 Wed Jul 4 00:17:13 2007
@@ -613,11 +613,9 @@
for (int i = 0; i < wsToUnDeploy.size(); i++) {
WSInfo wsInfo = (WSInfo) wsToUnDeploy.get(i);
if (wsInfo.getType() == WSInfo.TYPE_SERVICE) {
- if (isHotUpdate()) {
- serviceDeployer.unDeploy(wsInfo.getFileName());
- } else {
- axisConfig.removeFaultyService(wsInfo.getFileName());
- }
+ //No matter what we need to undeploy the service
+ // if user has deleted the file from the repository
+ serviceDeployer.unDeploy(wsInfo.getFileName());
} else {
if (isHotUpdate()) {
Deployer deployer = wsInfo.getDeployer();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?view=diff&rev=553108&r1=553107&r2=553108
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Wed Jul 4 00:17:13 2007
@@ -159,9 +159,13 @@
try {
fileName = DeploymentEngine.getAxisServiceName(fileName);
AxisServiceGroup serviceGroup = axisConfig.removeServiceGroup(fileName);
- configCtx.removeServiceGroupContext(serviceGroup);
- log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
- fileName));
+ if (serviceGroup != null) {
+ configCtx.removeServiceGroupContext(serviceGroup);
+ log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
+ fileName));
+ } else {
+ axisConfig.removeFaultyService(fileName);
+ }
} catch (AxisFault axisFault) {
//May be a faulty service
axisConfig.removeFaultyService(fileName);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org