Update of /var/cvs/src/org/mmbase/module/tools
In directory james.mmbase.org:/tmp/cvs-serv23719
Modified Files:
Tag: MMBase-1_8
MMAdmin.java
Log Message:
MMB-1696
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/tools
See also: http://www.mmbase.org/jira/browse/MMB-1696
Index: MMAdmin.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/tools/MMAdmin.java,v
retrieving revision 1.144.2.2
retrieving revision 1.144.2.3
diff -u -b -r1.144.2.2 -r1.144.2.3
--- MMAdmin.java 2 Oct 2007 12:15:34 -0000 1.144.2.2
+++ MMAdmin.java 29 Jul 2008 16:52:07 -0000 1.144.2.3
@@ -40,7 +40,7 @@
* @application Admin, Application
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: MMAdmin.java,v 1.144.2.2 2007/10/02 12:15:34 michiel Exp $
+ * @version $Id: MMAdmin.java,v 1.144.2.3 2008/07/29 16:52:07 michiel Exp $
*/
public class MMAdmin extends ProcessorModule {
private static final Logger log = Logging.getLoggerInstance(MMAdmin.class);
@@ -789,6 +789,12 @@
ModuleReader mod = getModuleReader(modulename);
if (mod != null) {
Map props = mod.getProperties();
+ try {
+ Map contextMap =
ApplicationContextReader.getProperties("mmbase/" + modulename);
+ props.putAll(contextMap);
+ } catch (Exception e) {
+ log.error(e);
+ }
for (Iterator i = props.keySet().iterator(); i.hasNext();) {
String key = (String)i.next();
String value = (String)props.get(key);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
