svn commit: r1524990 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator: OrchestratorComponent.java Validate.java

[degenaro]

Author: degenaro
Date: Fri Sep 20 13:11:55 2013
New Revision: 1524990

URL: http://svn.apache.org/r1524990
Log:
UIMA-3276 DUCC support for disabling Unmanaged Reservations

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1524990&r1=1524989&r2=1524990&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
 Fri Sep 20 13:11:55 2013
@@ -810,6 +810,12 @@ implements Orchestrator {
                                logger.error(methodName, null, error_message);
                                submitError(properties, error_message);
                        }
+                       else if(!Validate.accept(duccEvent)) {
+                               //String error_message = messages.fetch(" 
type=accept error, text=system is not configured to accept requests of this 
type.");
+                               String error_message = messages.fetch("Request 
was not accepted: System is configured to refuse reservations.");
+                               logger.error(methodName, null, error_message);
+                               submitError(properties, error_message);
+                       }
                        else if(Validate.request(duccEvent)) {
                                DuccWorkReservation duccWorkReservation = 
reservationFactory.create(common,(ReservationRequestProperties)properties);
                                long t0 = System.currentTimeMillis();

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java?rev=1524990&r1=1524989&r2=1524990&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
 Fri Sep 20 13:11:55 2013
@@ -23,6 +23,7 @@ import java.util.Properties;
 
 import org.apache.uima.ducc.common.utils.DuccLogger;
 import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
+import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
 import org.apache.uima.ducc.orchestrator.authentication.DuccWebAdministrators;
 import org.apache.uima.ducc.orchestrator.utilities.MemorySpecification;
 import org.apache.uima.ducc.transport.event.CancelJobDuccEvent;
@@ -126,6 +127,12 @@ public class Validate {
                return retVal;
        }
        
+       public static boolean accept(SubmitReservationDuccEvent duccEvent) {
+               String value = 
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_unmanaged_reservations_accepted);
+               Boolean result = new Boolean(value);
+               return result;
+       }
+               
        public static boolean request(SubmitReservationDuccEvent duccEvent) {
                boolean retVal = true;
                ReservationRequestProperties properties = 
(ReservationRequestProperties) duccEvent.getProperties();