[addressing-devel] FuraSrc/Server/Plugins/TaskSubmissionPlugin/plugin/src/com/gridsystems/tasksubmission/internal/task TaskCompatibilityChecker.java, 1.4, 1.5 TaskResourceAssessment.java, 1.3, 1.4 TaskValidator.java, 1.5, 1.6

[Gridsystems C. <gsc...@us...>]

Update of /cvsroot/fura/FuraSrc/Server/Plugins/TaskSubmissionPlugin/plugin/src/com/gridsystems/tasksubmission/internal/task
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/TaskSubmissionPlugin/plugin/src/com/gridsystems/tasksubmission/internal/task

Modified Files:
	TaskCompatibilityChecker.java TaskResourceAssessment.java 
	TaskValidator.java 
Log Message:
cvssync-20080903232636

Index: TaskResourceAssessment.java
===================================================================
RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/TaskSubmissionPlugin/plugin/src/com/gridsystems/tasksubmission/internal/task/TaskResourceAssessment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TaskResourceAssessment.java	16 Jul 2008 06:56:05 -0000	1.3
--- TaskResourceAssessment.java	3 Sep 2008 21:27:23 -0000	1.4
***************
*** 51,55 ****
   * Type description.
   *
!  * @author <a href="mailto:rr...@gr...">Rodrigo Ruiz Aguayo</a>
   * @version 1.0
   */
--- 51,55 ----
   * Type description.
   *
!  * @author Rodrigo Ruiz Aguayo
   * @version 1.0
   */
***************
*** 426,430 ****
          exec = module.getExecutables();
        }
!       if (TaskCompatibilityChecker.isSelectable(resource, task, false, exec)) {
          assignable.add(resource.getId());
        }
--- 426,431 ----
          exec = module.getExecutables();
        }
!       if (TaskCompatibilityChecker.isSelectable(resource, task, false,
!         exec, new StringBuffer(), false)) {
          assignable.add(resource.getId());
        }
***************
*** 435,439 ****
     * Working hours calendar type.
     *
!    * @author <a href="mailto:rr...@gr...">Rodrigo Ruiz Aguayo</a>
     * @version 1.0
     */
--- 436,440 ----
     * Working hours calendar type.
     *
!    * @author Rodrigo Ruiz Aguayo
     * @version 1.0
     */

Index: TaskValidator.java
===================================================================
RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/TaskSubmissionPlugin/plugin/src/com/gridsystems/tasksubmission/internal/task/TaskValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TaskValidator.java	16 Jul 2008 06:56:05 -0000	1.5
--- TaskValidator.java	3 Sep 2008 21:27:23 -0000	1.6
***************
*** 50,54 ****
   * Helper class for Task instances validation.
   *
!  * @author <a href="mailto:rr...@gr...">Rodrigo Ruiz Aguayo</a>
   * @author Xmas
   * @version 1.0
--- 50,54 ----
   * Helper class for Task instances validation.
   *
!  * @author Rodrigo Ruiz Aguayo
   * @author Xmas
   * @version 1.0

Index: TaskCompatibilityChecker.java
===================================================================
RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/TaskSubmissionPlugin/plugin/src/com/gridsystems/tasksubmission/internal/task/TaskCompatibilityChecker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TaskCompatibilityChecker.java	16 Jul 2008 06:56:04 -0000	1.4
--- TaskCompatibilityChecker.java	3 Sep 2008 21:27:23 -0000	1.5
***************
*** 66,70 ****
    public static boolean isSelectable(Resource resource, TaskHolder task,
      Executable[] exec) throws KernelException {
!     return isSelectable(resource, task, true, exec);
    }
  
--- 66,70 ----
    public static boolean isSelectable(Resource resource, TaskHolder task,
      Executable[] exec) throws KernelException {
!     return isSelectable(resource, task, true, exec, new StringBuffer(), false);
    }
  
***************
*** 92,101 ****
     *              <code>false</code> if the task can be in any state
     * @return <code>true</code> if it can be selected for execution
     * @throws KernelException on error
     */
    public static boolean isSelectable(Resource resource, TaskHolder task,
!     boolean now, Executable[] exec) throws KernelException {
      log.debug("starting isSelectable for " + resource.getId().getResourceName()
!         + " now: " + now);
      ResourceId resourceId = resource.getId();
  
--- 92,104 ----
     *              <code>false</code> if the task can be in any state
     * @return <code>true</code> if it can be selected for execution
+    * @param debugStr To print debug.
+    * @param debug used to indicate that must write messages in debugStr.
     * @throws KernelException on error
     */
    public static boolean isSelectable(Resource resource, TaskHolder task,
!     boolean now, Executable[] exec, StringBuffer debugStr, boolean debug)
!     throws KernelException {
      log.debug("starting isSelectable for " + resource.getId().getResourceName()
!       + " now: " + now);
      ResourceId resourceId = resource.getId();
  
***************
*** 107,128 ****
      try {
        selectable = !now || isInProgress(task);
!       boolean workForThisResources;
!       if (task.getTaskDef().isExecuteInAllResources()) { // EIAR task
!         // if the resource is in the active or canceled or failed microtask list
!         // (the resource is working / has worked)
!         if (task.getActiveCanceledFailedMicroTasks().
!           isResourceInActiveOrFinishedOrFailedList(resourceId)) {
!           log.debug("The resource " + resourceId + " has already received "
!             + "a microtask of task " + task.getId());
!           workForThisResources = false;
          } else {
!           // the resource needs to receive a canceled or a new microtask
!           workForThisResources = true;
          }
-       } else {
-         workForThisResources = task.hasAssignedOrAssignableMicroTasks();
        }
        selectable &= !now || workForThisResources;
        selectable &= runsOn(resourceId, exec);
        String user = task.getSubmitter();
        if (user == null) {
--- 110,138 ----
      try {
        selectable = !now || isInProgress(task);
!       debugStr.append("      - after isInProgress? " + selectable + "\r\n");
!       boolean workForThisResources = false;
!       if (selectable) {
!         if (task.getTaskDef().isExecuteInAllResources()) { // EIAR task
!           // if the resource is in the active or canceled or failed microtask list
!           // (the resource is working / has worked)
!           if (task.getActiveCanceledFailedMicroTasks().
!             isResourceInActiveOrFinishedOrFailedList(resourceId)) {
!             if (log.isDebugEnabled()) {
!               log.debug("The resource " + resourceId + " has already received "
!                 + "a microtask of task " + task.getId());
!             }
!             workForThisResources = false;
!           } else {
!             // the resource needs to receive a canceled or a new microtask
!             workForThisResources = true;
!           }
          } else {
!           workForThisResources = task.hasAssignedOrAssignableMicroTasks();
          }
        }
        selectable &= !now || workForThisResources;
+       debugStr.append("      - after workForThisResources? " + selectable + "\r\n");
        selectable &= runsOn(resourceId, exec);
+       debugStr.append("      - after runsOn? " + selectable + "\r\n");
        String user = task.getSubmitter();
        if (user == null) {
***************
*** 131,145 ****
        selectable &= AssignmentProcessor.isExecutionAllowed(resource, user, now,
            task.getTaskQoS().getGroups());
        selectable &= task.getBlackList().isSelectable(resourceId);
        selectable &= isResultPoliciesSupported(resource, task);
      } catch (Exception e1) {
        throw ApiUtils.processException(e1);
      }
  
-     // Applies the filter
-     if (selectable) {
-       selectable = applyFilters(resource, task);
-     }
- 
      return selectable;
    }
--- 141,156 ----
        selectable &= AssignmentProcessor.isExecutionAllowed(resource, user, now,
            task.getTaskQoS().getGroups());
+       debugStr.append("      - after isExecutionAllowed? " + selectable + "\r\n");
        selectable &= task.getBlackList().isSelectable(resourceId);
+       debugStr.append("      - after getBlackList? " + selectable + "\r\n");
        selectable &= isResultPoliciesSupported(resource, task);
+       debugStr.append("      - after ResultPolicies? " + selectable + "\r\n");
+       // Applies the filter
+       selectable &= applyFilters(resource, task);
+       debugStr.append("      - after applyFilters? " + selectable + "\r\n");
      } catch (Exception e1) {
        throw ApiUtils.processException(e1);
      }
  
      return selectable;
    }