[MMBASE SCM] r41976 - in mmbase/trunk/utils/src/main/java/org/mmbase: core/event module/core util

[michiel]

Author: michiel
Date: 2010-04-20 15:23:19 +0200 (Tue, 20 Apr 2010)
New Revision: 41976

Modified:
   mmbase/trunk/utils/src/main/java/org/mmbase/core/event/SystemEvent.java
   mmbase/trunk/utils/src/main/java/org/mmbase/module/core/MMBaseContext.java
   mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java
Log:
MMB-1653 (default searchdir)

Modified: 
mmbase/trunk/utils/src/main/java/org/mmbase/core/event/SystemEvent.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/core/event/SystemEvent.java     
2010-04-20 13:14:05 UTC (rev 41975)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/core/event/SystemEvent.java     
2010-04-20 13:23:19 UTC (rev 41976)
@@ -50,6 +50,16 @@
         }
     }
 
+    public static class ServletContext extends Collectable  {
+        private final javax.servlet.ServletContext servletContext;
+        public ServletContext(javax.servlet.ServletContext sc) {
+            servletContext = sc;
+        }
+        public javax.servlet.ServletContext getServletContext() {
+            return servletContext;
+        }
+    }
+
     public static class Shutdown extends Collectable {
     }
 
@@ -68,9 +78,14 @@
 
     static {
         SystemEventListener logger = new SystemEventListener() {
+                @Override
                 public void notify(SystemEvent s) {
                     LOG.service(" Received " + s);
                 }
+                @Override
+                public String toString() {
+                    return "SystemEventLogger";
+                }
             };
         EventManager.getInstance().addEventListener(logger);
     }

Modified: 
mmbase/trunk/utils/src/main/java/org/mmbase/module/core/MMBaseContext.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/module/core/MMBaseContext.java  
2010-04-20 13:14:05 UTC (rev 41975)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/module/core/MMBaseContext.java  
2010-04-20 13:23:19 UTC (rev 41976)
@@ -16,6 +16,7 @@
 
 import org.mmbase.core.util.DaemonTask;
 import org.mmbase.core.util.DaemonThread;
+import org.mmbase.core.event.*;
 import org.mmbase.util.ResourceLoader;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -70,13 +71,14 @@
             if (servletContext == null) {
                 throw new IllegalArgumentException();
             }
-
             if (initialized) {
                 log.info("Reinitializing, this time with ServletContext");
             }
 
             // store the current context
             sx = servletContext;
+            EventManager.getInstance().propagateEvent(new 
SystemEvent.ServletContext(sx));
+
             // Get the user directory using the user.dir property.
             // default set to the startdir of the appserver
             userDir = sx.getInitParameter("user.dir");
@@ -107,7 +109,6 @@
             initOutputfile(outputFile);
 
             ResourceLoader.init(sx);
-            org.mmbase.util.ResourceWatcher.reinitWatchers();
 
 
             // Init logging.

Modified: mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java        
2010-04-20 13:14:05 UTC (rev 41975)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/util/ResourceLoader.java        
2010-04-20 13:23:19 UTC (rev 41976)
@@ -33,6 +33,7 @@
 
 // used for Unicode Escaping when editing property files
 import org.mmbase.util.transformers.*;
+import org.mmbase.core.event.*;
 
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs