svn commit: r1528123 - /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java

[challngr]

Author: challngr
Date: Tue Oct  1 15:42:23 2013
New Revision: 1528123

URL: http://svn.apache.org/r1528123
Log:
UIMA-3260 RM should pick up default class if not supplied by CLI or OR.

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java?rev=1528123&r1=1528122&r2=1528123&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
 Tue Oct  1 15:42:23 2013
@@ -350,7 +350,20 @@ public class JobManagerConverter
         int memory        = toInt(si.getShareMemorySize(), 
scheduler.getDefaultMemory());
         String className  = si.getSchedulingClass();
         if ( className == null ) {
-            className = scheduler.getDefaultClassName();
+            switch ( job.getDuccType() ) {
+               case Job:              
+                   className = scheduler.getDefaultFairShareName();
+                   break;
+               case Service:
+               case Pop:
+               case Reservation:
+                   className = scheduler.getDefaultReserveName();
+                   break;
+            }
+            if ( className == null ) {
+                j.refuse("No scheduling class defined and no default class 
configured.");
+                return false;
+            }
         }
 
         j.setMinShares(min_shares);