Author: degenaro
Date: Sat Jun 18 07:26:32 2016
New Revision: 1748928
URL: http://svn.apache.org/viewvc?rev=1748928&view=rev
Log:
UIMA-4966 UIMA-DUCC Prepare for 2.1 Release
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1748928&r1=1748927&r2=1748928&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Sat Jun 18 07:26:32 2016
@@ -314,6 +314,8 @@ implements Orchestrator {
break;
}
break;
+ default:
+ break;
}
}
}
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1748928&r1=1748927&r2=1748928&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Sat Jun 18 07:26:32 2016
@@ -419,6 +419,8 @@ public class ProcessAccounting {
}
process.setProcessDeallocationType(ProcessDeallocationType.Killed);
break;
+ default:
+ break;
}
break;
default:
@@ -432,6 +434,8 @@ public class ProcessAccounting {
String userLogDir = service.getUserLogsDir();
UserLogging.error(userName, userLogDir, "reason
for stopping service instance["+service.getDuccId().getFriendly()+"]:
"+process.getReasonForStoppingProcess());
break;
+ default:
+ break;
}
break;
default:
@@ -652,6 +656,8 @@ public class ProcessAccounting {
break;
case Undefined:
break;
+ default:
+ break;
}
logger.trace(methodName, job.getDuccId(),
messages.fetch("exit"));
}
@@ -712,10 +718,16 @@ public class ProcessAccounting {
case Initializing:
stateJobAccounting.stateChange(job, JobState.Running);
break;
+
default:
+
break;
}
break;
+
default:
+
break;
}
}
+ default:
+
break;
}
//
Process Pipeline Components State
copyUimaPipelineComponentsState(job, inventoryProcess, process);
@@ -833,6 +845,8 @@ public class ProcessAccounting {
process.advanceProcessState(processState);
}
break;
+ default:
+ break;
}
}
}
@@ -850,6 +864,8 @@ public class ProcessAccounting {
break;
case Service:
break;
+ default:
+ break;
}
logger.trace(methodName, job.getDuccId(),
messages.fetch("exit"));
return;
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java?rev=1748928&r1=1748927&r2=1748928&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
Sat Jun 18 07:26:32 2016
@@ -131,6 +131,8 @@ public class StateJobAccounting {
switch(state) {
case Completing:
job.getStandardInfo().setDateOfCompletion(TimeStamp.getCurrentMillis());
+ default:
+ break;
}
switch(state) {
case Completed:
@@ -335,6 +337,8 @@ public class StateJobAccounting {
case Undefined:
retVal = true;
break;
+ default:
+ break;
}
if(retVal) {
job.setCompletion(completionType,completionRationale);
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1748928&r1=1748927&r2=1748928&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Sat Jun 18 07:26:32 2016
@@ -160,6 +160,8 @@ public class StateManager {
}
}
break;
+ default:
+ break;
}
logger.trace(methodName, null, messages.fetch("exit"));
return status;
@@ -210,6 +212,8 @@ public class StateManager {
hpm.saveService((IDuccWorkService)duccWorkJob);
retVal = true;
break;
+ default:
+ break;
}
}
catch(Exception e) {
@@ -280,6 +284,8 @@ public class StateManager {
}
}
break;
+ default:
+ break;
}
}
long t1 = System.currentTimeMillis();
@@ -573,6 +579,8 @@ public class StateManager {
break;
case Initializing:
break;
+ default:
+ break;
}
break;
case Running:
@@ -608,6 +616,8 @@ public class StateManager {
case Initializing:
stateJobAccounting.stateChange(duccWorkJob, JobState.Running);
break;
+ default:
+ break;
}
break;
case Completing:
@@ -1102,8 +1112,12 @@ public class StateManager {
case Undefined:
logger.warn(methodName,
duccId, messages.fetchLabel("unsuitable state")+serviceState);
break;
+ default:
+ break;
}
break;
+ default:
+ break;
}
}
}
@@ -1422,6 +1436,8 @@ public class StateManager {
case Undefined:
logger.warn(methodName, duccId,
messages.fetchLabel("unexpected job state")+jobState);
break;
+ default:
+ break;
}
}
else {
@@ -1581,6 +1597,8 @@ public class StateManager {
advanceToCompleted(service);
// </UIMA-3923>
break;
+ default:
+ break;
}
}
else {
@@ -1677,6 +1695,8 @@ public class StateManager {
service.setCompletion(completionType, exitCode);
service.getStandardInfo().setDateOfCompletion(TimeStamp.getCurrentMillis());
break;
+ default:
+ break;
}
advanceToCompleting(service);
break;
