Changeset 4311

Timestamp:

May 23, 2008, 2:24:56 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1024: Allow users to select a specific job-agent when creating a new job

Location:

trunk

Files:

• doc/src/docbook/admindoc/user_administration.xml (modified) (1 diff)
• doc/src/docbook/userdoc/jobs.xml (modified) (1 diff)
• src/clients/jobagent/net/sf/basedb/clients/jobagent/JobRunner.java (modified) (1 diff)
• src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/DummyJobExecutor.java (modified) (1 diff)
• src/core/common-queries.xml (modified) (3 diffs)
• src/core/net/sf/basedb/core/Install.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/InternalJobQueue.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Job.java (modified) (13 diffs)
• src/core/net/sf/basedb/core/JobAgent.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Permission.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/PluginResponse.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Update.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/data/JobData.java (modified) (1 diff)
• www/admin/roles/edit_role.jsp (modified) (3 diffs)
• www/admin/roles/view_role.jsp (modified) (2 diffs)
• www/common/plugin/finish_job.jsp (modified) (4 diffs)
• www/common/plugin/index.jsp (modified) (4 diffs)
• www/include/scripts/main.js (modified) (1 diff)
• www/views/jobs/list_jobs.jsp (modified) (6 diffs)
• www/views/jobs/view_job.jsp (modified) (4 diffs)

trunk/doc/src/docbook/admindoc/user_administration.xml

@@ -848 +848 @@
               </listitem>
             </varlistentry>
+
+            <varlistentry>
+              <term>
+                <guilabel>Select job agent for jobs</guilabel>
+              </term>
+              <listitem>
+                <para>
+                Allows the user to select a specific job agent when running jobs.
+                Users without this permission will always have a randomly selected
+                job agent.
+                </para>
+              </listitem>
+            </varlistentry>
+
             <varlistentry>
               <term>

trunk/doc/src/docbook/userdoc/jobs.xml

@@ -245 +245 @@
           <varlistentry>
             <term>
+              <guilabel>Job agent</guilabel>
+            </term>
+            <listitem>
+              <para>
+                The job agent the job is/was running on. It is also
+                possible to set this value before a job is executed. If that
+                has been done only the selected job agent will accept the job.
+                This options is normally only given to powers users and
+                needs the <emphasis>Select job agent</emphasis> permission.
+                See <xref linkend="user_administration.roles.edit" />. 
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
               <guilabel>User/Owner</guilabel>
             </term>

trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/JobRunner.java

@@ -108 +108 @@
       
       // Change the status to Job.Status.PREPARED
-      j.setPrepared(agent.getServerName());
+      j.setPrepared(agent.getServerName(), agent.getJobAgent(dc));
       try
       {

trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/DummyJobExecutor.java

@@ -99 +99 @@
       dc = sc.newDbControl();
       job = Job.getById(dc, job.getId());
-      job.start("Not really, but used for testing the job agent", agent.getServerName());
+      job.start("Not really, but used for testing the job agent", 
+        agent.getServerName(), agent.getJobAgent(dc));
       if (wait > 0)
       {

trunk/src/core/common-queries.xml

@@ -1424 +1424 @@
     <description>
       A Hibernate query that loads plugin jobs in the job queue waiting to be
-      executed sorted by priority and waiting type.
+      executed sorted by priority and waiting type. The query should return all
+      jobs, ignoring all settings specifying that the internal job queue should
+      not be used.
     </description>
   </query>
@@ -1435 +1437 @@
       AND job.type = :type
       AND job.pluginDefinition.useInternalJobQueue = true
+      AND job.jobAgentId IS NULL
       ORDER BY job.priority ASC, job.created ASC
     </sql>
@@ -1440 +1443 @@
       A Hibernate query that loads plugin jobs in the job queue waiting to be
       executed sorted by priority and waiting type. It should only return
-      jobs where the plug-in setting useInternalJobQueue=true
+      jobs where the plug-in setting useInternalJobQueue=true and no
+      specific job agent has been selected for the job.
     </description>
   </query>

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

@@ -107 +107 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(56).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(57).intValue();
   
   public static synchronized void createTables(boolean update, final ProgressReporter progress)
@@ -302 +302 @@
       
       HashMap<RoleData, Integer> systemPermissions = new HashMap<RoleData, Integer>();
-      systemPermissions.put(roleAdmin, Permission.grant(Permission.SHARE_TO_EVERYONE));
-      systemPermissions.put(rolePower, Permission.grant(Permission.SHARE_TO_EVERYONE));
+      systemPermissions.put(roleAdmin, Permission.grant(Permission.SHARE_TO_EVERYONE, Permission.SELECT_JOBAGENT));
+      systemPermissions.put(rolePower, Permission.grant(Permission.SHARE_TO_EVERYONE, Permission.SELECT_JOBAGENT));
       
       // System permissions
@@ -392 +392 @@
         agentPermissions.put(Item.JOBAGENT, PERMISSION_READ | PERMISSION_CREATE);
         agentPermissions.put(Item.MESSAGE, PERMISSION_CREATE);
-        agentPermissions.put(Item.SYSTEM, Permission.grant(Permission.ACT_AS_ANOTHER_USER));
+        agentPermissions.put(Item.SYSTEM, Permission.grant(Permission.ACT_AS_ANOTHER_USER, Permission.SELECT_JOBAGENT));
         addRolePermissions(roleJobAgent, agentPermissions);
       }
@@ -1799 +1799 @@
     }
   }
-
+  
   /**
     Create an {@link ItemKey}.

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

@@ -452 +452 @@
         
         // Change the status to Job.Status.PREPARED
-        job.setPrepared(Application.getHostName());
+        job.setPrepared(Application.getHostName(), null);
         try
         {

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

@@ -672 +672 @@
   
   /**
+    Get the job agent this job should run on, is running on or 
+    was running on.
+    @return A job agent or null if not known
+    @since 2.8
+  */
+  public JobAgent getJobAgent()
+  {
+    Integer id = getData().getJobAgentId();
+    JobAgent agent = null;
+    if (id != null)
+    {
+      try
+      {
+        agent = JobAgent.getById(getDbControl(), id);
+      }
+      catch (ItemNotFoundException ex)
+      {}
+    }
+    return agent;
+  }
+  
+  /**
+    Set the job agent this job should run on. If the job is already
+    running or has ended, this call is ignored.
+    <p>
+    NOTE! This method doesn't check that the specified job agent
+    has actually been configured to run the plug-in used by this job.
+    Setting this parameter to an incorrect value may result in the
+    job never being executed. 
+    
+    @param agent The job agent, or null to let any job agent run
+      the job
+    @throws PermissionDeniedException If the logged in user doesn't
+      have write permission on this job, or use permission on the
+      job agent or is lacking the {@link Permission#SELECT_JOBAGENT}
+      permission
+    @since 2.8
+  */
+  public void setJobAgent(JobAgent agent)
+  {
+    Job.Status status = getStatus();
+    if (status != Job.Status.WAITING) return;
+    checkPermission(Permission.WRITE);
+    if (agent != null) 
+    {
+      if (!getSessionControl().hasSystemPermission(Permission.SELECT_JOBAGENT))
+      {
+        throw new PermissionDeniedException(Permission.SELECT_JOBAGENT);
+      }
+      agent.checkPermission(Permission.USE);
+    }
+    getData().setJobAgentId(agent == null ? null : agent.getId());
+  }
+  
+  /**
     Set information needed to create a signal transporter object that can be used
     to send signals to the plug-in that is currently executing this job.
@@ -759 +814 @@
 
   /**
+    @deprecated Use {@link #setPrepared(String, JobAgent)} instead
+  */
+  public void setPrepared(String server)
+    throws PermissionDeniedException
+  {
+    setPrepared(server, null);
+  }
+  
+  /**
     Set the job's status to {@link Status#PREPARED}. This status is
-    used to signal that a job is about to be executed, but the actual exception
+    used to signal that a job is about to be executed, but the actual excecution
     hasn't started yet. This status prevents two job agents from trying to
     start the same job twice.
-    @param server Name of the server which this job will executed on. 
+    
+    @param server Name of the server which this job will executed on
+    @param agent The job agent that is going to execute the
+      job or null if it is executed by something else, eg. the
+      internal job queue
     @throws PermissionDeniedException If the logged in user doesn't have write permission.
-  */
-  public void setPrepared(String server)
+    @since 2.8
+  */
+  public void setPrepared(String server, JobAgent agent)
     throws PermissionDeniedException
   {
@@ -778 +847 @@
     data.setStatus(Status.PREPARED.getValue());
     data.setServer(StringUtil.setNullableString(server, "server", MAX_SERVER_LENGTH));
-  }
-  
-  /**
-    Register the job as started. Note! This method doesn't start the actual 
+    getData().setJobAgentId(agent == null ? null : agent.getId());
+  }
+
+  /**
+    @deprecated Use {@link #start(String, String, JobAgent)} instead
+  */
+  public void start(String statusMessage, String server)
+    throws PermissionDeniedException, InvalidDataException
+  {
+    start(statusMessage, server, null);
+  }
+  
+  /**
+    Register the job as started. Note! This method doesn't start the actual 
     execution of the job. This method should be called by an job runner application
     to tell the core that the job runner has started to execute the job.
@@ -788 +867 @@
     @param statusMessage A message
     @param server The name of the server where the job is started
+    @param agent The job agent that is going to execute the
+      job or null if it is executed by something else, eg. the
+      internal job queue
     @throws PermissionDeniedException If the logged in user doesn't have
       write permission
     @throws InvalidDataException If the status message is too long
-  */
-  public void start(String statusMessage, String server)
+    @since 2.8
+   */
+  public void start(String statusMessage, String server, JobAgent agent)
     throws PermissionDeniedException, InvalidDataException
   {
@@ -802 +885 @@
     data.setStarted(new Date());
     data.setPercentComplete(0);
-  }
-  
+    data.setJobAgentId(agent == null ? null : agent.getId());
+  }
+
   /**
     Get a progress reporter that reports progress by updating the information
@@ -815 +899 @@
   public ProgressReporter getProgressReporter(ProgressReporter chained)
   {
-    return new ProgressReporterImpl(this, null, chained);
+    return new ProgressReporterImpl(this, null, null, chained);
   }
   
@@ -941 +1025 @@
     data.setStackTrace(null);
     data.setServer(null);
+    data.setJobAgentId(null);
     if (useLatestConfiguration)
     {
@@ -992 +1077 @@
         this, parameters, context, pd, pd.getAllowImmediateExecution()
       );
-    request.setProgressReporter(new ProgressReporterImpl(this, null, null));
+    request.setProgressReporter(new ProgressReporterImpl(this, null, null, null));
     return request;
   }
@@ -1052 +1137 @@
     PluginConfiguration config = getPluginConfiguration();
     Plugin plugin = pd.newInstance(settings == null ? null : settings.getJarPath());
+    JobAgent agent = settings == null ? null : settings.getJobAgent();
     SessionControl sc = getSessionControl();
     ParameterValuesImpl parameters = new ParameterValuesImpl(this, true);
-    ProgressReporterImpl jobProgress = new ProgressReporterImpl(this, server, progress);
+    ProgressReporterImpl jobProgress = 
+      new ProgressReporterImpl(this, server, agent, progress);
     
     PluginExecutionRequest request = 
@@ -1373 +1460 @@
     private final String server;
     private final Job job;
+    private final JobAgent agent;
     private final ProgressReporter chained;
     private long lastUpdate;
@@ -1379 +1467 @@
     private int offset;
     
-    ProgressReporterImpl(Job job, String server, ProgressReporter chained)
+    ProgressReporterImpl(Job job, String server, JobAgent agent, ProgressReporter chained)
       throws BaseException
     {
@@ -1386 +1474 @@
       this.jobId = job.getId();
       this.server = server;
+      this.agent = agent;
       this.chained = chained;
       this.lastUpdate = 0;
@@ -1501 +1590 @@
           job.setSignalTransporter(signalTransporter, signalId);
         }
-        job.start("Starting...", server);
+        job.start("Starting...", server, agent);
         dc.commit();
       }

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

@@ -391 +391 @@
       AND (job.owner IN (:sharedToUsers) OR job.activeProjectId IN (:sharedToProjects)
       AND job.status = Job.Status.WAITING
+      AND job.jobAgentId IS NULL OR job.jobAgentId = this.id
       ORDER BY job.priority - jas.priorityBoost ASC, job.created ASC
     */
@@ -483 +484 @@
         Hql.property("status"), 
         Expressions.integer(Job.Status.WAITING.getValue())
+      )
+    );
+    
+    // Filter out jobs that have been marked for other job agents
+    // jobAgentId = this.id OR jobAgentId IS NULL
+    query.restrictPermanent(
+      Restrictions.or(
+        Restrictions.eq(
+          Hql.property("jobAgentId"),
+          Expressions.integer(getId())
+        ),
+        Restrictions.eq(Hql.property("jobAgentId"), null)
       )
     );

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

@@ -126 +126 @@
     item.
   */
-  ACT_AS_ANOTHER_USER(1024, 1024, "act as another user");
+  ACT_AS_ANOTHER_USER(1024, 1024, "act as another user"),
+
+  /**
+    This permission allows a user to specify which job agent
+    a job should be executed on using {@link Job#setJobAgent(JobAgent)}.
+    This is a system permission and is only meaningful for the role key 
+    for the {@link Item#SYSTEM} item.
+    @since 2.8
+  */
+  SELECT_JOBAGENT(2048, 2048, "select job agent");
 
   private final int grantValue;
@@ -299 +308 @@
   }
 
+  /**
+    Merges a list of integer permission values.
+    @param permissions The permission values, null values are ignored
+    @return The combined permissions
+    @since 2.8
+  */
+  static int merge(Integer... permissions)
+  {
+    int perm = 0;
+    for (Integer i : permissions)
+    {
+      if (i != null) perm |= i;
+    }
+    return perm;
+  }
+  
 }
 

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

@@ -126 +126 @@
       throw new PermissionDeniedException("Can't execute immediately since response status is: " + getStatus());
     }
-    ProgressReporterImpl jobProgress = new ProgressReporterImpl(request.getJob(), Application.getHostName(), progress);
+    ProgressReporterImpl jobProgress = new ProgressReporterImpl(request.getJob(), Application.getHostName(), null, progress);
     PluginExecutionRequest executionRequest = new PluginExecutionRequest(request, Request.COMMAND_EXECUTE);
     executionRequest.setProgressReporter(jobProgress);

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

@@ -53 +53 @@
 import net.sf.basedb.core.data.ProjectData;
 import net.sf.basedb.core.data.RawBioAssayData;
+import net.sf.basedb.core.data.RoleData;
+import net.sf.basedb.core.data.RoleKeyData;
 import net.sf.basedb.core.data.SchemaVersionData;
 import net.sf.basedb.core.data.TransformationData;
@@ -642 +644 @@
       The update needs to calculate the number of reporters in existing
       lists.
+    </td>
+  </tr>
+  
+  <tr>
+    <td>57</td>
+    <td>
+      <ul>
+      <li>Added {@link net.sf.basedb.core.data.JobData#getJobAgentId()}. 
+      </ul>
+      The update grants {@link Permission#SELECT_JOBAGENT} to the
+      administrators, power users and job agent roles.
     </td>
   </tr>
@@ -906 +919 @@
         if (progress != null) progress.display((int)(55*progress_factor), "--Updating schema version: " + schemaVersion + " -> 56...");
         schemaVersion = updateToSchemaVersion56(session);
+      }
+      
+      if (schemaVersion < 57)
+      {
+        if (progress != null) progress.display((int)(56*progress_factor), "--Updating schema version: " + schemaVersion + " -> 57...");
+        schemaVersion = updateToSchemaVersion57(session);
       }
       
@@ -2232 +2251 @@
     return schemaVersion;
   }
+  
+  /**
+    Grant {@link Permission#SELECT_JOBAGENT} permission to
+    administrators, power users and job agent roles.
+    
+    @return The new schema version (=57)
+  */
+  private static int updateToSchemaVersion57(org.hibernate.Session session)
+    throws BaseException
+  {
+    final int schemaVersion = 57;
+    org.hibernate.Transaction tx = null;
+    try
+    {
+      tx = HibernateUtil.newTransaction(session);
+      
+      int selectPermission = Permission.SELECT_JOBAGENT.grantValue();
+      
+      RoleData admin = HibernateUtil.loadData(session, RoleData.class, SystemItems.getId(Role.ADMINISTRATOR));
+      RoleData power = HibernateUtil.loadData(session, RoleData.class, SystemItems.getId(Role.POWER_USER));
+      RoleData agent = HibernateUtil.loadData(session, RoleData.class, SystemItems.getId(Role.JOBAGENT));
+      RoleKeyData systemKey = HibernateUtil.loadData(session, RoleKeyData.class, 
+          SystemItems.getRoleKeyId(Item.SYSTEM));
+      
+      Map<RoleData, Integer> rolePermissions = systemKey.getRoles();
+      rolePermissions.put(admin, Permission.merge(selectPermission, rolePermissions.get(admin)));
+      rolePermissions.put(power, Permission.merge(selectPermission, rolePermissions.get(power)));
+      rolePermissions.put(agent, Permission.merge(selectPermission, rolePermissions.get(agent)));
+
+      // Update the schema version number
+      setSchemaVersion(session, schemaVersion);
+  
+      // Commit the changes
+      HibernateUtil.commit(tx);
+      log.info("updateToSchemaVersion57: OK");
+    }
+    catch (BaseException ex)
+    {
+      if (tx != null) HibernateUtil.rollback(tx); 
+      log.error("updateToSchemaVersion57: FAILED", ex);
+      throw ex;
+    }
+    return schemaVersion;
+  }
+  
   /**
     Adjust the existing items in the database to be compatible with the latest mappings.

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

@@ -378 +378 @@
   }
   
+  private Integer jobAgentId;
+  /**
+    The ID of the job agent this job should run/is running/was running on.
+    We store this as an ID value only and not a reference to {@link JobAgentData}
+    since it would then be impossible to delete a job agent without also deleting
+    all jobs that has been running on it.
+    @since 2.8
+    @hibernate.property column="`jobagent_id`" type="int" not-null="false"
+  */
+  public Integer getJobAgentId()
+  {
+    return jobAgentId;
+  }
+  public void setJobAgentId(Integer jobAgentId)
+  {
+    this.jobAgentId = jobAgentId;
+  }
+  
   private Map<String, ParameterValueData<?>> parameters;
   /**

trunk/www/admin/roles/edit_role.jsp

@@ -137 +137 @@
   final boolean hasShareToEveryone = role == null ? false : system.getPermissions(role).contains(Permission.SHARE_TO_EVERYONE);
   final boolean hasActAsAnotherUser = role == null ? false : system.getPermissions(role).contains(Permission.ACT_AS_ANOTHER_USER);
+  final boolean hasSelectJobagent = role == null ? false : system.getPermissions(role).contains(Permission.SELECT_JOBAGENT);
   
   // Query to retrieve role keys
@@ -187 +188 @@
         if (frm.share_to_everyone.checked) systemPermission += <%=PermissionUtil.getPermissionCode(EnumSet.of(Permission.SHARE_TO_EVERYONE))%>;
         if (frm.act_as_another_user.checked) systemPermission += <%=PermissionUtil.getPermissionCode(EnumSet.of(Permission.ACT_AS_ANOTHER_USER))%>;
+        if (frm.select_jobagent.checked) systemPermission += <%=PermissionUtil.getPermissionCode(EnumSet.of(Permission.SELECT_JOBAGENT))%>;
         frm['<%=Item.SYSTEM.name()%>'].value = systemPermission;
         frm.submit();
@@ -366 +368 @@
           <input type="checkbox" value="1" name="act_as_another_user" 
             <%=hasActAsAnotherUser ? "checked" : ""%>
-            >Act as another user
+            >Act as another user<br>
+          <input type="checkbox" value="1" name="select_jobagent" 
+            <%=hasSelectJobagent ? "checked" : ""%>
+            >Select job agent for jobs<br>
         </td>
       </tr>

trunk/www/admin/roles/view_role.jsp

@@ -92 +92 @@
   final boolean hasShareToEveryone = system.getPermissions(role).contains(Permission.SHARE_TO_EVERYONE);
   final boolean hasActAsAnotherUser = system.getPermissions(role).contains(Permission.ACT_AS_ANOTHER_USER);
+  final boolean hasSelectJobagent = system.getPermissions(role).contains(Permission.SELECT_JOBAGENT);
   
   final boolean writePermission = role.hasPermission(Permission.WRITE);
@@ -252 +253 @@
           <td class="prompt">Share to everyone</td>
           <td><%=hasShareToEveryone ? "yes" : "no"%></td>
+          <td class="prompt">Select job agent</td>
+          <td><%=hasSelectJobagent ? "yes" : "no"%></td>
         </tr>
         <tr>

trunk/www/common/plugin/finish_job.jsp

@@ -36 +36 @@
   import="net.sf.basedb.core.ItemResultList"
   import="net.sf.basedb.core.Include"
+  import="net.sf.basedb.core.Permission"
   import="net.sf.basedb.core.Job"
+  import="net.sf.basedb.core.JobAgent"
+  import="net.sf.basedb.core.PluginResponse"
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.core.query.Expressions"
@@ -43 +46 @@
   import="net.sf.basedb.core.plugin.GuiContext"
   import="net.sf.basedb.core.plugin.Plugin"
+  import="net.sf.basedb.core.plugin.Response"
   import="net.sf.basedb.core.plugin.InteractivePlugin"
   import="net.sf.basedb.core.plugin.AutoDetectingImporter"
@@ -63 +67 @@
   Job job = (Job)sc.getSessionSetting("plugin.configure.job");
   dc.reattachItem(job);
-  PluginDefinition plugin = job.getPluginDefinition(); //(PluginDefinition)sc.getSessionSetting("plugin.configure.plugin");
-  PluginConfiguration pluginConfig = job.getPluginConfiguration(); // (PluginConfiguration)sc.getSessionSetting("plugin.configure.config");
+  PluginDefinition plugin = job.getPluginDefinition();
+  PluginConfiguration pluginConfig = job.getPluginConfiguration();
   boolean sendMessage = Values.getBoolean(sc.getUserClientSetting("plugins.sendmessage"), true);
   boolean removeJobWhenFinished = Values.getBoolean(sc.getUserClientSetting("plugins.removejob"), false);
+
+  PluginResponse pluginResponse = (PluginResponse)sc.getSessionSetting("plugin.configure.response");
+  boolean executeImmediately =
+    pluginResponse != null && pluginResponse.getStatus() == Response.Status.EXECUTE_IMMEDIATELY;
+
+  List<JobAgent> agents = null;
+  if (!executeImmediately && sc.hasSystemPermission(Permission.SELECT_JOBAGENT))
+  {
+    ItemQuery<JobAgent> agentQuery = JobAgent.getQuery();
+    agentQuery.join(Hql.innerJoin("plugins", "plg"));
+    agentQuery.restrict(Restrictions.eq(Hql.index("plg", null), Hql.entity(plugin)));
+    agentQuery.include(Include.ALL);
+    agentQuery.order(Orders.asc(Hql.property("name")));
+    agents = agentQuery.list(dc);
+  }
   %>
   <base:page type="popup" title="Set job name and options">
@@ -112 +131 @@
         </td>
       </tr>
+      
+      <%
+      if (agents != null && agents.size() > 0)
+      {
+        %>
+        <tr valign="top">
+          <td class="prompt">Use job agent</td>
+          <td>
+            <select name="agent_id">
+            <option value="">- automatic -
+            <%
+            for (JobAgent agent : agents)
+            {
+              %>
+              <option value="<%=agent.getId()%>"><%=HTML.encodeTags(agent.getName())%>
+              <%
+            }
+            %>
+            </select>
+          </td>
+        </tr>
+        <%
+      }
+      %>
+      
       <tr valign="top">
         <td class="prompt">Job description</td>

trunk/www/common/plugin/index.jsp

@@ -51 +51 @@
   import="net.sf.basedb.core.Path"
   import="net.sf.basedb.core.Job"
+  import="net.sf.basedb.core.JobAgent"
   import="net.sf.basedb.core.Type"
   import="net.sf.basedb.core.Experiment"
@@ -517 +518 @@
     Job job = (Job)sc.getSessionSetting("plugin.configure.job");
     PluginResponse pluginResponse = (PluginResponse)sc.getSessionSetting("plugin.configure.response");
+    boolean executeImmediately =
+      pluginResponse != null && pluginResponse.getStatus() == Response.Status.EXECUTE_IMMEDIATELY;
 
     job.setName(Values.getStringOrNull(request.getParameter("name")));
@@ -523 +526 @@
     job.setRemoveJobWhenFinished(Values.getBoolean(request.getParameter("remove_job")));
     dc.saveItem(job);
+    
+    if (!executeImmediately)
+    {
+      int agentId = Values.getInt(request.getParameter("agent_id"), -1);
+      if (agentId >= 0)
+      {
+        job.setJobAgent(agentId == 0 ? null : JobAgent.getById(dc, agentId));
+      }
+    }
+    
     if (pluginResponse != null) pluginResponse.saveParameters(dc);
     dc.commit();
@@ -532 +545 @@
     sc.setSessionSetting("plugin.configure.config", null);
     sc.setSessionSetting("plugin.configure.currentContext", null);
-    if (pluginResponse != null && pluginResponse.getStatus() == Response.Status.EXECUTE_IMMEDIATELY)
+    if (executeImmediately)
     {
       PluginExecutionRequest executionRequest = pluginResponse.getExecutionRequest(null);

trunk/www/include/scripts/main.js

@@ -398 +398 @@
     this.controllers['BIOASSAYSET'] = { url:'views/experiments/bioassaysets/index.jsp', width:800, height:500 };
     this.controllers['TRANSFORMATION'] = { url:'views/experiments/transformations/index.jsp', width:500, height:300 };
-    this.controllers['JOB'] = { url:'views/jobs/index.jsp', width:600, height:440, popup:true, edit:false };
+    this.controllers['JOB'] = { url:'views/jobs/index.jsp', width:640, height:480, popup:true, edit:false };
     this.controllers['FORMULA'] = { url:'views/formulas/index.jsp', width:740, height:500 };
     this.controllers['HYBRIDIZATION'] = { url:'views/hybridizations/index.jsp', width:800, height:500 };

trunk/www/views/jobs/list_jobs.jsp

@@ -31 +31 @@
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.Job"
+  import="net.sf.basedb.core.JobAgent"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.Include"
@@ -40 +41 @@
   import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.core.query.Hql"
+  import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Restrictions"
   import="net.sf.basedb.core.query.Expressions"
@@ -94 +96 @@
 try
 {
+  
+  // Get all job agents
+  final ItemQuery<JobAgent> agentQuery = JobAgent.getQuery();
+  agentQuery.include(Include.ALL);
+  agentQuery.order(Orders.asc(Hql.property("name")));
+  agentQuery.setCacheResult(true);
+  Enumeration<String, String> agents = new Enumeration<String, String>();
+  for (JobAgent a : agentQuery.list(dc))
+  {
+    agents.add(Integer.toString(a.getId()), a.getName());
+  }
+  
   Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
   try
@@ -277 +291 @@
         filterable="true"
         exportable="true"
+      />
+      <tbl:columndef 
+        id="jobagent"
+        property="jobAgentId"
+        datatype="int"
+        title="Job agent"
+        filterable="true"
+        enumeration="<%=agents%>"
       />
       <tbl:columndef 
@@ -497 +519 @@
                 readPlugin = false;
               }
+              JobAgent agent = null;
+              boolean readAgent = true;
+              try
+              {
+                agent = item.getJobAgent();
+              }
+              catch (PermissionDeniedException ex)
+              {
+                readAgent = false;
+              }
               %>
               <tbl:row>
@@ -545 +577 @@
                 <tbl:cell column="stackTrace"><%=HTML.encodeTags(item.getStackTrace())%></tbl:cell>
                 <tbl:cell column="server"><%=HTML.encodeTags(item.getServer())%></tbl:cell>
+                <tbl:cell column="jobagent"><%=Base.getLinkedName(ID, agent, !readAgent, true)%></tbl:cell>
                 <tbl:cell column="estimatedExecutionTime"><%=item.getEstimatedExecutionTime()%></tbl:cell>
                 <tbl:cell column="percentComplete">

trunk/www/views/jobs/view_job.jsp

@@ -35 +35 @@
   import="net.sf.basedb.core.Permission"
   import="net.sf.basedb.core.Job"
+  import="net.sf.basedb.core.JobAgent"
   import="net.sf.basedb.core.BasicItem"
   import="net.sf.basedb.core.Nameable"
@@ -97 +98 @@
     readCurrentConfig = false;
   }
+  boolean readAgent = true;
+  JobAgent agent = null;
+  try
+  {
+    agent = job.getJobAgent();
+  }
+  catch (PermissionDeniedException ex)
+  {
+    readAgent = false;
+  }
 
   int parameterVersion = job.getParameterVersion();
@@ -174 +185 @@
   <base:body onload="autoUpdate()">
     <h3 class="docked"><%=title%> <base:help tabcontrol="main" /></h3>
-    <t:tabcontrol id="main" active="<%=tab%>" position="bottom" contentstyle="<%="height: "+(int)(scale*320)+"px;"%>">
+    <t:tabcontrol id="main" active="<%=tab%>" position="bottom" contentstyle="<%="height: "+(int)(scale*350)+"px;"%>">
     <t:tab id="properties" title="Properties" helpid="job.view.properties">
 
@@ -287 +298 @@
           <%=HTML.encodeTags(job.getServer())%>
         </td>
+      </tr>
+      <tr valign="top">
+        <td class="prompt">Job agent</td>
+        <td><%=Base.getEncodedName(agent, !readAgent)%></td>
       </tr>
       <tr valign="top">