[sakai] svn commit: r90630 - in msub/iu.edu/oncourse/sakai-2.7.1/scheduler: scheduler-api/src/java/org/sakaiproject/api/app/scheduler scheduler-component-shared/src/java/org/sakaiproject/component/app/scheduler scheduler-tool/src/bundle/org/sakaiproject/tool/scheduler/bundle scheduler-tool/src/java/org/sakaiproject/tool/app/scheduler scheduler-tool/src/webapp/scheduler

[swgithen at mtu.edu]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=90630

Author: swgithen at mtu.edu
Date: 2011-03-25 15:32:07 -0400 (Fri, 25 Mar 2011)
New Revision: 90630

Added:
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/webapp/scheduler/enabledServers.jspf
Modified:
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-api/src/java/org/sakaiproject/api/app/scheduler/SchedulerManager.java
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-component-shared/src/java/org/sakaiproject/component/app/scheduler/SchedulerManagerImpl.java
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/bundle/org/sakaiproject/tool/scheduler/bundle/Messages.properties
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/java/org/sakaiproject/tool/app/scheduler/SchedulerTool.java
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/webapp/scheduler/create_job.jsp
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/webapp/scheduler/create_trigger.jsp
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/webapp/scheduler/edit_triggers.jsp
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/webapp/scheduler/jobs.jsp
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/webapp/scheduler/main.jsp
   msub/iu.edu/oncourse/sakai-2.7.1/scheduler/scheduler-tool/src/webapp/scheduler/run_job_confirm.jsp
Log:
ONC-3581

Merging in changes from ONC-3581 r66387 for having specific nodes run Quartz jobs.
Manually merged failed hunks from below.

~/code/oncourse-2.7.1/scheduler$ patch -p0 < onc-3581-r66387.diff.txt 
patching file scheduler-component-shared/src/java/org/sakaiproject/component/app/scheduler/SchedulerManagerImpl.java
Hunk #1 FAILED at 35.
Hunk #2 succeeded at 64 (offset 6 lines).
Hunk #3 FAILED at 157.
2 out of 3 hunks FAILED -- saving rejects to file scheduler-component-shared/src/java/org/sakaiproject/component/app/scheduler/SchedulerManagerImpl.java.rej
patching file scheduler-api/src/java/org/sakaiproject/api/app/scheduler/SchedulerManager.java
patching file scheduler-tool/src/java/org/sakaiproject/tool/app/scheduler/SchedulerTool.java
Hunk #3 FAILED at 70.
Hunk #4 succeeded at 638 (offset 5 lines).
1 out of 4 hunks FAILED -- saving rejects to file scheduler-tool/src/java/org/sakaiproject/tool/app/scheduler/SchedulerTool.java.rej
patching file scheduler-tool/src/bundle/org/sakaiproject/tool/scheduler/bundle/Messages.properties
patching file scheduler-tool/src/webapp/scheduler/main.jsp
patching file scheduler-tool/src/webapp/scheduler/create_trigger.jsp
patching file scheduler-tool/src/webapp/scheduler/enabledServers.jspf
patching file scheduler-tool/src/webapp/scheduler/edit_triggers.jsp
patching file scheduler-tool/src/webapp/scheduler/run_job_confirm.jsp
patching file scheduler-tool/src/webapp/scheduler/create_job.jsp
patching file scheduler-tool/src/webapp/scheduler/jobs.jsp