Author: mriou
Date: Wed Jul 12 10:36:41 2006
New Revision: 421340
URL: http://svn.apache.org/viewvc?rev=421340&view=rev
Log:
Made configuration file optional (we have defaults for all values).
Modified:
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/Messages.java
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/PXEConfigProperties.java
Modified:
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/Messages.java
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/Messages.java?rev=421340&r1=421339&r2=421340&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/Messages.java
(original)
+++
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/Messages.java
Wed Jul 12 10:36:41 2006
@@ -8,7 +8,7 @@
public class Messages extends MessageBundle {
public String msgPxeInstallErrorCfgNotFound(File configFile) {
- return format("Error installing PXE component: config file {0} not
found!", configFile);
+ return format("Config file {0} not found, default values will be used.",
configFile);
}
public String msgPxeInstallErrorCfgReadError(File configFile) {
Modified:
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/PXEConfigProperties.java
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/PXEConfigProperties.java?rev=421340&r1=421339&r2=421340&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/PXEConfigProperties.java
(original)
+++
incubator/ode/scratch/pxe-iapi/axis/src/main/java/com/fs/pxe/axis/PXEConfigProperties.java
Wed Jul 12 10:36:41 2006
@@ -32,24 +32,22 @@
File configFile = new File(_installDir,
PXEConfigProperties.CONFIG_FILE_NAME);
if (!configFile.exists()) {
String errmsg =
PXEConfigProperties.__msgs.msgPxeInstallErrorCfgNotFound(configFile);
- PXEConfigProperties.__log.error(errmsg);
- throw new ServletException(errmsg);
+ PXEConfigProperties.__log.warn(errmsg);
+ } else {
+ FileInputStream fis = null;
+ try {
+ fis = new FileInputStream(configFile);
+ load(fis);
+ } catch (Exception ex) {
+ String errmsg =
PXEConfigProperties.__msgs.msgPxeInstallErrorCfgReadError(configFile);
+ PXEConfigProperties.__log.warn(errmsg,ex);
+ } finally {
+ if (fis != null)
+ try {
+ fis.close();
+ } catch (Exception ex) { ex.printStackTrace(); }
+ }
}
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(configFile);
- load(fis);
- } catch (Exception ex) {
- String errmsg =
PXEConfigProperties.__msgs.msgPxeInstallErrorCfgReadError(configFile);
- PXEConfigProperties.__log.error(errmsg,ex);
- throw new ServletException(errmsg);
- } finally {
- if (fis != null)
- try {
- fis.close();
- } catch (Exception ex) { ex.printStackTrace(); }
- }
-
}
/**
