Update of /var/cvs/src/org/mmbase/module/tools
In directory james.mmbase.org:/tmp/cvs-serv11245

Modified Files:
        MMAdmin.java 
Removed Files:
        MMAdminProbe.java 
Log Message:
simplified, limited scope, javadoc


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/tools


Index: MMAdmin.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/tools/MMAdmin.java,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- MMAdmin.java        23 Aug 2008 18:57:57 -0000      1.163
+++ MMAdmin.java        26 Aug 2008 22:58:30 -0000      1.164
@@ -40,7 +40,7 @@
  * @application Admin, Application
  * @author Daniel Ockeloen
  * @author Pierre van Rooden
- * @version $Id: MMAdmin.java,v 1.163 2008/08/23 18:57:57 michiel Exp $
+ * @version $Id: MMAdmin.java,v 1.164 2008/08/26 22:58:30 michiel Exp $
  */
 public class MMAdmin extends ProcessorModule {
     private static final Logger log = Logging.getLoggerInstance(MMAdmin.class);
@@ -134,8 +134,18 @@
             log.info("*** Server started in kiosk mode ***");
         }
         mmb = MMBase.getMMBase();
-
-        new MMAdminProbe(this, mmb);
+        org.mmbase.util.ThreadPools.jobsExecutor.execute(new Runnable() {
+                public void run() {
+                    while (!mmb.getState()) {
+                        try {Thread.sleep(2000);} catch (InterruptedException 
e){ return;}
+                    }
+                    try {
+                        MMAdmin.this.probeCall();
+                    } catch (Exception e) {
+                        log.error(e.getMessage(), e);
+                    }
+                }
+            });
     }
 
     /**
@@ -634,9 +644,11 @@
 
 
     /**
-     * @javadoc
+     * Called when MMBase is up.  It'll install the applications
+     * marked as 'autodeploy'.  It will do nothing, besides logging a
+     * warning, if the 'versions' builder could not be found.
      */
-    public void probeCall() throws SearchQueryException {
+    protected void probeCall() throws SearchQueryException {
         Versions ver = (Versions)mmb.getBuilder("versions");
         if (ver == null) {
             log.warn("Versions builder not installed, Can't auto deploy apps");


_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to