Changeset 2372 for sandbox/workflow/trunk/inc/local/classes/class.JobBase.php

Timestamp:

03/29/10 14:46:01 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Merged 2197:2356 /sandbox/workflow/branches/609/ em /sandbox/workflow/trunk.

File:

• sandbox/workflow/trunk/inc/local/classes/class.JobBase.php (modified) (3 diffs)

sandbox/workflow/trunk/inc/local/classes/class.JobBase.php

@@ -89 +89 @@
         {
                 require_once 'common.inc.php';
-                $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();
+                Factory::getInstance('WorkflowMacro')->prepareEnvironment();
                 $this->jobID = $jobID;
                 $this->processID = $processID;
                 $this->currentDate = $currentDate;
-                $this->jobManager = &$GLOBALS['workflow']['factory']->getInstance('WorkflowJobManager');
+                $this->jobManager = Factory::getInstance('WorkflowJobManager');
                 $this->testMode = $testMode;
                 $this->maximumExecutionTime = $maximumExecutionTime;
@@ -148 +148 @@
         final private function prepareEnvironment()
         {
-                $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareProcessEnvironment($this->processID);
-
-                require_once PHPGW_SERVER_ROOT . '/workflow/inc/class.process_factory.inc.php';
+                Factory::getInstance('WorkflowMacro')->prepareProcessEnvironment($this->processID);
 
                 $this->environment = array();
-                $this->environment['factory']  = &new ProcessFactory();
+                $this->environment['factory']  = &Factory::newInstance('ProcessWrapperFactory');
         }
 
@@ -202 +200 @@
         final public function createNewInstance($startActivityId, $instanceName=false, $properties=false, $user=false)
         {
-                $activityManager = CreateObject('workflow.workflow_activitymanager');
+                $activityManager = Factory::getInstance('workflow_activitymanager');
                 $activity = $activityManager->get_activity($startActivityId);