Author: challngr
Date: Sun Mar 10 15:43:55 2013
New Revision: 1454867
URL: http://svn.apache.org/r1454867
Log:
UIMA-2687
Frist pass, all of CLI except for DuccServiceApi is refactored to use common
code and implement
an API.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/api/test/Test.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelJobDuccEvent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelReservationDuccEvent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelServiceDuccEvent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitJobDuccEvent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitReservationDuccEvent.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/api/test/Test.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/api/test/Test.java?rev=1454867&r1=1454866&r2=1454867&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/api/test/Test.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/api/test/Test.java
Sun Mar 10 15:43:55 2013
@@ -27,7 +27,7 @@ public class Test {
public static void main(String[] args) {
try {
IDuccMessageProcessor messageHandler = new
MessageHandler();
- DuccJobMonitor duccJobMonitor = new
DuccJobMonitor(messageHandler);
+ DuccJobMonitor duccJobMonitor = new
DuccJobMonitor(messageHandler, false);
duccJobMonitor.run(args);
} catch (Exception e) {
e.printStackTrace();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcher.java?rev=1454867&r1=1454866&r2=1454867&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcher.java
Sun Mar 10 15:43:55 2013
@@ -105,7 +105,7 @@ public class DuccEventHttpDispatcher {
try {
DuccEventHttpDispatcher dispatcher =
new
DuccEventHttpDispatcher("http://"+args[0]+":19988/or",1000*4);
- SubmitJobDuccEvent duccEvent = new SubmitJobDuccEvent();
+ SubmitJobDuccEvent duccEvent = new SubmitJobDuccEvent(null);
DuccEvent event = dispatcher.dispatchAndWaitForDuccReply(duccEvent);
if ( event instanceof SubmitJobReplyDuccEvent ) {
System.out.println("Client received SubmitJobReplyDuccEvent");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelJobDuccEvent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelJobDuccEvent.java?rev=1454867&r1=1454866&r2=1454867&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelJobDuccEvent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelJobDuccEvent.java
Sun Mar 10 15:43:55 2013
@@ -18,10 +18,13 @@
*/
package org.apache.uima.ducc.transport.event;
+import org.apache.uima.ducc.common.utils.DuccProperties;
+
@SuppressWarnings("serial")
public class CancelJobDuccEvent extends AbstractDuccJobEvent {
- public CancelJobDuccEvent() {
+ public CancelJobDuccEvent(DuccProperties props) {
super(EventType.CANCEL_JOB);
+ setProperties(props);
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelReservationDuccEvent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelReservationDuccEvent.java?rev=1454867&r1=1454866&r2=1454867&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelReservationDuccEvent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelReservationDuccEvent.java
Sun Mar 10 15:43:55 2013
@@ -18,10 +18,13 @@
*/
package org.apache.uima.ducc.transport.event;
+import org.apache.uima.ducc.common.utils.DuccProperties;
+
@SuppressWarnings("serial")
public class CancelReservationDuccEvent extends AbstractDuccReservationEvent {
- public CancelReservationDuccEvent() {
+ public CancelReservationDuccEvent(DuccProperties props) {
super(EventType.CANCEL_RESERVATION);
+ setProperties(props);
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelServiceDuccEvent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelServiceDuccEvent.java?rev=1454867&r1=1454866&r2=1454867&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelServiceDuccEvent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/CancelServiceDuccEvent.java
Sun Mar 10 15:43:55 2013
@@ -18,10 +18,13 @@
*/
package org.apache.uima.ducc.transport.event;
+import org.apache.uima.ducc.common.utils.DuccProperties;
+
@SuppressWarnings("serial")
public class CancelServiceDuccEvent extends AbstractDuccJobEvent {
- public CancelServiceDuccEvent() {
+ public CancelServiceDuccEvent(DuccProperties props) {
super(EventType.CANCEL_SERVICE);
+ setProperties(props);
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitJobDuccEvent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitJobDuccEvent.java?rev=1454867&r1=1454866&r2=1454867&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitJobDuccEvent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitJobDuccEvent.java
Sun Mar 10 15:43:55 2013
@@ -18,10 +18,13 @@
*/
package org.apache.uima.ducc.transport.event;
+import org.apache.uima.ducc.common.utils.DuccProperties;
+
@SuppressWarnings("serial")
public class SubmitJobDuccEvent extends AbstractDuccJobEvent {
- public SubmitJobDuccEvent() {
+ public SubmitJobDuccEvent(DuccProperties props) {
super(EventType.SUBMIT_JOB);
+ setProperties(props);
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitReservationDuccEvent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitReservationDuccEvent.java?rev=1454867&r1=1454866&r2=1454867&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitReservationDuccEvent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/SubmitReservationDuccEvent.java
Sun Mar 10 15:43:55 2013
@@ -18,10 +18,13 @@
*/
package org.apache.uima.ducc.transport.event;
+import org.apache.uima.ducc.common.utils.DuccProperties;
+
@SuppressWarnings("serial")
public class SubmitReservationDuccEvent extends AbstractDuccReservationEvent {
- public SubmitReservationDuccEvent() {
+ public SubmitReservationDuccEvent(DuccProperties props) {
super(EventType.SUBMIT_RESERVATION);
+ setProperties(props);
}
}
