Changeset 2139

Timestamp:

Mar 31, 2006, 2:56:55 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #176: Running jobs with a project activated
INCLUDES DATABASE CHANGES. Please update the database.

Location:

trunk/src/core/net/sf/basedb/core

Files:

• InternalJobQueue.java (modified) (1 diff)
• Job.java (modified) (3 diffs)
• data/JobData.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/InternalJobQueue.java

@@ -413 +413 @@
         job = Job.getById(dc, jobId);
         
+        // Set the active project
+        int projectId = job.getActiveProjectId();
+        if (projectId != 0)
+        {
+          try
+          {
+            Project activeProject = Project.getById(dc, projectId);
+            impersonated.setActiveProject(activeProject);
+          }
+          catch (Throwable t)
+          {
+            log.error("Exception while setting active project. Continuing with no active project.", t);
+          }
+        }
+        
         // Get an execution request and close the db connection
         PluginExecutionRequest exec = null;

trunk/src/core/net/sf/basedb/core/Job.java

@@ -25 +25 @@
 package net.sf.basedb.core;
 
+import net.sf.basedb.core.Transactional.Action;
 import net.sf.basedb.core.data.JobData;
 import net.sf.basedb.core.data.MessageData;
@@ -221 +222 @@
     return getStatus() == Status.EXECUTING;
   }
+  /**
+    Set's the project id to the currently active project.
+  */
+  @Override
+  void onBeforeCommit(Action action)
+    throws NotLoggedInException, BaseException
+  {
+    super.onBeforeCommit(action);
+    int projectId = getSessionControl().getActiveProjectId();
+    if (projectId != 0)
+    {
+      getData().setActiveProjectId(projectId);
+    }
+  }
   // -------------------------------------------
 
@@ -356 +371 @@
     if (priority < 1 || priority > 10) throw new NumberOutOfRangeException("priority", priority, 1, 10);
     getData().setPriority(priority);
+  }
+  
+  /**
+    The ID of the project that should be made the active project while running
+    this job. If the project can't be loaded the job should be executed without
+    an active project.
+    @return The ID of the active project, or 0 if no project should be active
+   */
+  public int getActiveProjectId()
+  {
+    return getData().getActiveProjectId();
   }
   

trunk/src/core/net/sf/basedb/core/data/JobData.java

@@ -204 +204 @@
   }
 
+  private int activeProjectId;
+  /**
+    The ID of the project that should be made active when running this job.
+    @hibernate.property column="`project_id`" type="int" not-null="true"
+  */
+  public int getActiveProjectId()
+  {
+    return activeProjectId;
+  }
+  public void setActiveProjectId(int activeProjectId)
+  {
+    this.activeProjectId = activeProjectId;
+  }
+  
   private Date created;
   /**