Changeset 3167 for branches/2.2/workflow/inc/class.so_adminjobs.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.so_adminjobs.inc.php (modified) (3 diffs)

branches/2.2/workflow/inc/class.so_adminjobs.inc.php

@@ -10 +10 @@
 \**************************************************************************/
 
-require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php';
-require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'JobManager.php';
-require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php';
 
 /**
@@ -96 +93 @@
                 $this->isAdmin = $_SESSION['phpgw_info']['workflow']['user_is_admin'];
                 $this->acl = &$GLOBALS['ajax']->acl;
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
-                $this->jobManager = new JobManager(&$this->db);
+                $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
+                $this->jobManager = &Factory::newInstance('JobManager');
         }
 
@@ -229 +226 @@
                 $output = array();
                 $job = $this->jobManager->getJob($jobID);
-                $jobScheduler = &$GLOBALS['workflow']['factory']->getInstance('JobScheduler');
+                $jobScheduler =& Factory::getInstance('JobScheduler');
                 $totalTime = microtime(true);
                 $thread = $jobScheduler->execute($job, true);