| 53,15 → 53,15 |
|---|
| try { |
| // get config |
| ConfigRoot defaultConfig = readConfig(defaultStream); |
| logger.debug("Default:\n" + defaultConfig); |
| logger.debug("default:\n" + defaultConfig); |
| checkConfigVersion("default", defaultConfig); |
| |
| ConfigRoot userConfig = readConfig(userStream); |
| logger.debug("User:\n" + userConfig); |
| logger.debug("user:\n" + userConfig); |
| checkConfigVersion("user", userConfig); |
| |
| config = defaultConfig.merge(userConfig); |
| logger.debug("Result:\n" + config); |
| logger.info("result config:\n" + config); |
| } |
| catch(Exception ex) { |
| throw new ModelException("Cannot read config: " + ex); |
| 81,6 → 81,8 |
|---|
| for(Iterator i = config.getInitialization().iterator(); i.hasNext(); ) { |
| ConfigInitialization ci = (ConfigInitialization)i.next(); |
| |
| if(ci.getIgnore()) continue; |
| |
| // get class |
| Class c = null; |
| try { |
| 107,7 → 109,7 |
|---|
| Map params = new HashMap(); |
| for(Iterator j = ci.getInitParam().iterator(); j.hasNext(); ) { |
| ConfigInitParam p = (ConfigInitParam)j.next(); |
| params.put(p.getName(), p.getValue()); |
| params.put(p.getName(), (String[])p.getValues().toArray(new String[0])); |
| } |
| |
| o.init(params); |
| 143,6 → 145,8 |
|---|
| ConfigInitialization.class); |
| digester.addBeanPropertySetter("hostadmiral/initializations/initialization/class", |
| "className"); |
| digester.addBeanPropertySetter("hostadmiral/initializations/initialization/ignore", |
| "ignore"); |
| digester.addSetNext("hostadmiral/initializations/initialization", "addInitialization"); |
| |
| digester.addObjectCreate("hostadmiral/initializations/initialization/init-param", |