[jboss-svn-commits] JBL Code SVN: r5207 - labs/jbosslabs/trunk/portal-extensions/forge-service/src/java/org/jboss/forge/service

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2006-07-20 17:42:09 -0400 (Thu, 20 Jul 2006)
New Revision: 5207

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
Log:
Refactoring

Modified: labs/jbosslabs/trunk/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java	2006-07-20 21:35:44 UTC (rev 5206)
+++ labs/jbosslabs/trunk/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java	2006-07-20 21:42:09 UTC (rev 5207)
@@ -24,7 +24,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Calendar;
 
 import javax.ejb.Local;
 
@@ -35,9 +34,7 @@
 import org.jboss.forge.common.service.NodeWatcher;
 import org.jboss.logging.Logger;
 import org.jboss.shotoku.tools.Constants;
-import org.jboss.shotoku.tools.Tools;
 import org.jboss.shotoku.service.AdministratedServiceImpl;
-import org.jboss.shotoku.service.AdministratedServiceGetter;
 import org.jboss.shotoku.service.AdministratedService;
 
 /**
@@ -156,57 +153,25 @@
 
         // Setting the default timer interval.
         setTimerInterval(DEFAULT_TIMER_INTERVAL);
-        // And starting the timer.
-        //timer.scheduleTimer(DEFAULT_TIMER_INTERVAL);
 
-        // Enabling administration for this service.
-        Tools.getService().addAdministratedService(new AdministratedServiceGetter() {
-            public AdministratedService getService() {
-                return ForgeHelper.getForgeManagement();
-            }
-        });
-
         log.info("Forge service created, with timer interval: " + getTimerInterval());
     }
 
-    //@EJB
-    //private ForgeTimerLocal timer;
-
     public void start() throws Exception {
         super.start();
 
-        new Thread() {
-            {
-                setDaemon(true);
-            }
+        startUpdateThread();
 
-            public void run() {
-                while (getServiceRunnable()) {
-                    try {
-                        sleep(getTimerInterval());
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-
-                    try {
-                        update();
-                    } catch (Throwable t) {
-                        // Making sure that an exception won't stop the thread.
-                    }
-
-                    setLastUpdate(Calendar.getInstance().getTimeInMillis());
-                }
-
-                log.info("Forge service thread stopped.");
-            }
-        }.start();
-
         log.info("Forge service started.");
     }
 
     public void destroy() {
     }
 
+    public AdministratedService getServiceInstance() {
+        return ForgeHelper.getForgeManagement();
+    }
+
     public String getServiceId() {
         return "ForgeService";
     }