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 di...@apache.org on 2007/03/25 04:29:43 UTC
svn commit: r522148 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment:
AxisConfigBuilder.java DeploymentEngine.java RepositoryListener.java
repository/util/WSInfoList.java
Author: dims
Date: Sat Mar 24 19:29:38 2007
New Revision: 522148
URL: http://svn.apache.org/viewvc?view=rev&rev=522148
Log:
- change log.info to log.debug for the NoClassDefFoundError from the recent jms stuff in axis2.xml
- Fixing problem where, If there are 20 services in the repo, if the 10th one fails, we used to bail out and not even try the rest.
- Remove totally unnecessary bubbling of exception though we don't do anything with it.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=522148&r1=522147&r2=522148
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Sat Mar 24 19:29:38 2007
@@ -526,7 +526,7 @@
// adding to axis2 config
axisConfig.addTransportOut(transportout);
} catch (NoClassDefFoundError e) {
- log.info(Messages.getMessage("errorinloadingts", clasName), e);
+ log.debug(Messages.getMessage("errorinloadingts", clasName), e);
} catch (ClassNotFoundException e) {
log.debug(Messages.getMessage("errorinloadingts", clasName), e);
throw new DeploymentException(e);
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=522148&r1=522147&r2=522148
==============================================================================
--- 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 Sat Mar 24 19:29:38 2007
@@ -560,20 +560,28 @@
wsToUnDeploy.add(file);
}
- public void doDeploy() throws DeploymentException {
+ public void doDeploy() {
try {
if (wsToDeploy.size() > 0) {
for (int i = 0; i < wsToDeploy.size(); i++) {
DeploymentFileData currentDeploymentFile = (DeploymentFileData) wsToDeploy.get(i);
String type = currentDeploymentFile.getType();
if (TYPE_SERVICE.equals(type)) {
- serviceDeployer.deploy(currentDeploymentFile);
+ try {
+ serviceDeployer.deploy(currentDeploymentFile);
+ } catch (DeploymentException e) {
+ log.debug(e);
+ }
} else if (TYPE_MODULE.equals(type)) {
moduleDeployer.deploy(currentDeploymentFile);
} else {
Deployer deployer = (Deployer) extensioToDeployerMappingMap.get(type);
if (deployer != null) {
- deployer.deploy(currentDeploymentFile);
+ try {
+ deployer.deploy(currentDeploymentFile);
+ } catch (DeploymentException e) {
+ log.debug(e);
+ }
}
}
@@ -641,7 +649,7 @@
scheduler.schedule(new SchedulerTask(listener), new DeploymentIterator());
}
- public void unDeploy() throws DeploymentException {
+ public void unDeploy() {
try {
if (wsToUnDeploy.size() > 0) {
for (int i = 0; i < wsToUnDeploy.size(); i++) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=522148&r1=522147&r2=522148
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Sat Mar 24 19:29:38 2007
@@ -148,11 +148,7 @@
cl = cl.getParent();
}
- try {
- deploymentEngine.doDeploy();
- } catch (DeploymentException e) {
- // no need to do anything here, it has already been logged at the DeploymentEngine call
- }
+ deploymentEngine.doDeploy();
}
/**
@@ -186,12 +182,7 @@
public void checkServices() {
findServicesInDirectory();
loadOtherDirectories();
-
- try {
- update();
- } catch (DeploymentException e) {
- // no need to log anything here, it has been logged at DeploymentEngine
- }
+ update();
}
/**
@@ -202,11 +193,7 @@
wsInfoList.init();
checkModules();
directoryToExtensionMappingMap = deploymentEngine.getDirectoryToExtensionMappingMap();
- try {
- deploymentEngine.doDeploy();
- } catch (DeploymentException e) {
- // no need to do anything here, it has already been logged
- }
+ deploymentEngine.doDeploy();
}
//This will load the files from the directories
@@ -272,15 +259,11 @@
/** Method invoked from the scheduler to start the listener. */
public void startListener() {
checkServices();
- try {
- update();
- } catch (DeploymentException e) {
- // no need to log the exception once again
- }
+ update();
}
/** Updates WSInfoList object. */
- public void update() throws DeploymentException {
+ public void update() {
wsInfoList.update();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?view=diff&rev=522148&r1=522147&r2=522148
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Sat Mar 24 19:29:38 2007
@@ -194,7 +194,7 @@
/**
*
*/
- public void update() throws DeploymentException {
+ public void update() {
synchronized (deployer) {
checkForUndeployedServices();
deployer.unDeploy();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org