Update of /var/cvs/src/org/mmbase/module/tools
In directory james.mmbase.org:/tmp/cvs-serv23597
Modified Files:
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.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- MMAdmin.java 29 Jul 2008 09:18:19 -0000 1.161
+++ MMAdmin.java 29 Jul 2008 16:50:44 -0000 1.162
@@ -40,7 +40,7 @@
* @application Admin, Application
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: MMAdmin.java,v 1.161 2008/07/29 09:18:19 michiel Exp $
+ * @version $Id: MMAdmin.java,v 1.162 2008/07/29 16:50:44 michiel Exp $
*/
public class MMAdmin extends ProcessorModule {
private static final Logger log = Logging.getLoggerInstance(MMAdmin.class);
@@ -787,6 +787,14 @@
ModuleReader mod = getModuleReader(modulename);
if (mod != null) {
Map<String,String> props = mod.getProperties();
+
+ try {
+ Map<String, String> contextMap =
ApplicationContextReader.getProperties("mmbase/" + modulename);
+ props.putAll(contextMap);
+ } catch (Exception e) {
+ log.error(e);
+ }
+
for (String key : props.keySet()) {
String value = props.get(key);
results.add(key);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
