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 st...@apache.org on 2006/03/21 23:12:52 UTC
svn commit: r387643 -
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Author: stevel
Date: Tue Mar 21 14:12:51 2006
New Revision: 387643
URL: http://svn.apache.org/viewcvs?rev=387643&view=rev
Log:
1. when bad things happen, include the trace in the log.
2. close files after opening.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=387643&r1=387642&r2=387643&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Mar 21 14:12:51 2006
@@ -411,23 +411,26 @@
log.debug(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_WS,
currentArchiveFile.getName()));
} catch (DeploymentException de) {
- log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
+ log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
currentArchiveFile.getName(),
- de.getMessage()));
+ de.getMessage()),
+ de);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
de.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
} catch (AxisFault axisFault) {
- log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
+ log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
currentArchiveFile.getName(),
- axisFault.getMessage()));
+ axisFault.getMessage()),
+ axisFault);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
axisFault.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
} catch (Exception e) {
- log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
+ log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
currentArchiveFile.getName(),
- e.getMessage()));
+ e.getMessage()),
+ e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
@@ -456,16 +459,18 @@
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
metaData.getName().getLocalPart()));
} catch (DeploymentException e) {
- log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
+ log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
currentArchiveFile.getName(),
- e.getMessage()));
+ e.getMessage()),
+ e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
} catch (AxisFault axisFault) {
- log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
+ log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
currentArchiveFile.getName(),
- axisFault.getMessage()));
+ axisFault.getMessage()),
+ axisFault);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
axisFault.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
@@ -480,7 +485,8 @@
}
} catch (AxisFault axisFault) {
log.info(Messages.getMessage(DeploymentErrorMsgs.ERROR_SETTING_CLIENT_HOME,
- axisFault.getMessage()));
+ axisFault.getMessage()),
+ axisFault);
}
}
}
@@ -545,13 +551,21 @@
}
return axisConfig;
} else {
- InputStream in;
+ InputStream in=null;
try {
in = new FileInputStream(axis2_xml_file_name);
+ populateAxisConfiguration(in);
} catch (FileNotFoundException e) {
throw new DeploymentException(e);
+ } finally {
+ if (in!=null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ //swallow
+ }
+ }
}
- populateAxisConfiguration(in);
return findRepositoryFromAxisConfiguration();
}
}