Author: degenaro
Date: Thu Feb 7 19:15:41 2013
New Revision: 1443670
URL: http://svn.apache.org/r1443670
Log:
UIMA-2646 DUCC CLI removal of obsolete flags
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobCancel.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceCancel.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobCancel.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobCancel.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobCancel.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobCancel.java
Thu Feb 7 19:15:41 2013
@@ -73,14 +73,6 @@ public class DuccJobCancel extends DuccU
.withArgName(DuccUiConstants.parm_reason)
.withDescription(makeDesc(DuccUiConstants.desc_reason,DuccUiConstants.exmp_reason)).hasArg()
.withLongOpt(DuccUiConstants.name_reason).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_broker)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_broker,DuccUiConstants.exmp_service_broker)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_broker).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_endpoint)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_endpoint,DuccUiConstants.exmp_service_endpoint)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_endpoint).create());
}
protected int help(Options options) {
@@ -154,50 +146,24 @@ public class DuccJobCancel extends DuccU
}
// trim
DuccUiUtilities.trimProperties(jobRequestProperties);
- /*
- * employ default broker/endpoint if not specified
- */
- String broker =
jobRequestProperties.getProperty(JobRequestProperties.key_service_broker);
- if(broker == null) {
- broker = DuccUiUtilities.buildBrokerUrl();
- }
- String endpoint =
jobRequestProperties.getProperty(JobRequestProperties.key_service_endpoint);
- if(endpoint == null) {
- endpoint =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_jms_provider)
- + ":"
- +
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint_type)
- + ":"
- +
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint)
- ;
- }
- /*
- * send to JM & get reply
- */
-// CamelContext context = new DefaultCamelContext();
-// ActiveMQComponent amqc =
ActiveMQComponent.activeMQComponent(broker);
-// String jmsProvider =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_jms_provider);
-// context.addComponent(jmsProvider, amqc);
-// context.start();
-// DuccEventDispatcher duccEventDispatcher;
-// duccEventDispatcher = new DuccEventDispatcher(context,endpoint);
- String port =
- DuccPropertiesResolver.
- getInstance().
-
getProperty(DuccPropertiesResolver.ducc_orchestrator_http_port);
- if ( port == null ) {
- throw new DuccRuntimeException("Unable to Submit a Job. Ducc
Orchestrator HTTP Port Not Defined. Add ducc.orchestrator.http.port
ducc.properties");
- }
- String orNode =
- DuccPropertiesResolver.
- getInstance().
- getProperty(DuccPropertiesResolver.ducc_orchestrator_node);
- if ( orNode == null ) {
- throw new DuccRuntimeException("Unable to Submit a Job. Ducc
Orchestrator Node Not Defined. Add ducc.orchestrator.node to ducc.properties");
- }
-
- String targetUrl = "http://"+orNode+":"+port+"/or";;
- DuccEventHttpDispatcher duccEventDispatcher = new
DuccEventHttpDispatcher(targetUrl);
+ String port =
+ DuccPropertiesResolver.
+ getInstance().
+
getProperty(DuccPropertiesResolver.ducc_orchestrator_http_port);
+ if ( port == null ) {
+ throw new DuccRuntimeException("Unable to Cancel a Job. Ducc
Orchestrator HTTP Port Not Defined. Add ducc.orchestrator.http.port
ducc.properties");
+ }
+ String orNode =
+ DuccPropertiesResolver.
+ getInstance().
+
getProperty(DuccPropertiesResolver.ducc_orchestrator_node);
+ if ( orNode == null ) {
+ throw new DuccRuntimeException("Unable to Cancel a Job. Ducc
Orchestrator Node Not Defined. Add ducc.orchestrator.node to ducc.properties");
+ }
+
+ String targetUrl = "http://"+orNode+":"+port+"/or";;
+ DuccEventHttpDispatcher duccEventDispatcher = new
DuccEventHttpDispatcher(targetUrl);
CancelJobDuccEvent cancelJobDuccEvent = new CancelJobDuccEvent();
cancelJobDuccEvent.setProperties(jobRequestProperties);
DuccEvent duccRequestEvent = cancelJobDuccEvent;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
Thu Feb 7 19:15:41 2013
@@ -141,14 +141,6 @@ private Thread main = null;
options.addOption(OptionBuilder
.withDescription(DuccUiConstants.desc_monitor_cancel_job_on_interrupt).hasArg(false)
.withLongOpt(DuccUiConstants.name_monitor_cancel_job_on_interrupt).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_broker)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_broker,DuccUiConstants.exmp_service_broker)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_broker).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_endpoint)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_endpoint,DuccUiConstants.exmp_service_endpoint)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_endpoint).create());
}
protected void help(Options options) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
Thu Feb 7 19:15:41 2013
@@ -235,14 +235,6 @@ public class DuccJobSubmit extends DuccU
.withDescription(DuccUiConstants.desc_timestamp).hasArg(false)
.withLongOpt(DuccUiConstants.name_timestamp).create());
options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_broker)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_broker,DuccUiConstants.exmp_service_broker)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_broker).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_endpoint)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_endpoint,DuccUiConstants.exmp_service_endpoint)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_endpoint).create());
- options.addOption(OptionBuilder
.withArgName(DuccUiConstants.parm_description)
.withDescription(makeDesc(DuccUiConstants.desc_description,DuccUiConstants.exmp_description)).hasArg()
.withLongOpt(DuccUiConstants.name_description).create());
@@ -827,28 +819,6 @@ public class DuccJobSubmit extends DuccU
if(process_failures_limit == null) {
jobRequestProperties.setProperty(JobRequestProperties.key_process_failures_limit,DuccUiConstants.dval_process_failures_limit);
}
- /*
- * employ default broker/endpoint if not specified
- */
- String broker =
jobRequestProperties.getProperty(JobRequestProperties.key_service_broker);
- if(broker == null) {
- broker = DuccUiUtilities.buildBrokerUrl();
- }
-
if(jobRequestProperties.containsKey(DuccUiConstants.name_debug)) {
- duccMessageProcessor.out("broker:"+" "+broker);
- }
- String endpoint =
jobRequestProperties.getProperty(JobRequestProperties.key_service_endpoint);
- if(endpoint == null) {
- endpoint =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_jms_provider)
- + ":"
- +
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint_type)
- + ":"
- +
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint)
- ;
- }
-
if(jobRequestProperties.containsKey(DuccUiConstants.name_debug)) {
- duccMessageProcessor.out("endpoint:"+" "+endpoint);
- }
if(jobRequestProperties.containsKey(DuccUiConstants.name_debug)) {
jobRequestProperties.dump();
}
@@ -891,12 +861,6 @@ public class DuccJobSubmit extends DuccU
* identify invoker
*/
jobRequestProperties.setProperty(JobRequestProperties.key_submitter_pid_at_host,
ManagementFactory.getRuntimeMXBean().getName());
- /*
- * resolve ${defaultBrokerURL} in service dependencies - must fail if
resolution needed but can't resolve
- */
- if ( ! resolve_service_dependencies(endpoint, jobRequestProperties) ) {
- return DuccUiConstants.ERROR;
- }
boolean missingValue = false;
Set<Object> keys = jobRequestProperties.keySet();
@@ -1000,7 +964,7 @@ public class DuccJobSubmit extends DuccU
if(jobRequestProperties.containsKey(DuccUiConstants.name_wait_for_completion)
|| ( console_listener != null) ) {
incrementWaitCounter();
- MonitorListener ml = new MonitorListener(this, jobId, broker,
jobRequestProperties);
+ MonitorListener ml = new MonitorListener(this, jobId,
jobRequestProperties);
Thread mlt = new Thread(ml); //MonitorListenerThread
mlt.start();
}
@@ -1223,14 +1187,12 @@ public class DuccJobSubmit extends DuccU
{
DuccJobSubmit djs = null;
String jobId = null;
- String broker = null;
JobRequestProperties jobRequestProperties = null;
- MonitorListener(DuccJobSubmit djs, String jobId, String broker,
JobRequestProperties props)
+ MonitorListener(DuccJobSubmit djs, String jobId, JobRequestProperties
props)
{
this.djs = djs;
this.jobId = jobId;
- this.broker = broker;
this.jobRequestProperties = props;
}
@@ -1241,8 +1203,6 @@ public class DuccJobSubmit extends DuccU
ArrayList<String> arrayList = new ArrayList<String>();
arrayList.add("--"+DuccUiConstants.name_job_id);
arrayList.add(jobId);
- arrayList.add("--"+DuccUiConstants.name_service_broker);
- arrayList.add(broker);
if(jobRequestProperties.containsKey(DuccUiConstants.name_debug)) {
arrayList.add("--"+DuccUiConstants.name_debug);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java
Thu Feb 7 19:15:41 2013
@@ -66,14 +66,6 @@ public class DuccReservationCancel exten
.withArgName(DuccUiConstants.parm_reservation_id)
.withDescription(makeDesc(DuccUiConstants.desc_reservation_id,DuccUiConstants.exmp_reservation_id)).hasArg()
.withLongOpt(DuccUiConstants.name_reservation_id).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_broker)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_broker,DuccUiConstants.exmp_service_broker)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_broker).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_endpoint)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_endpoint,DuccUiConstants.exmp_service_endpoint)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_endpoint).create());
}
protected int help(Options options) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
Thu Feb 7 19:15:41 2013
@@ -70,14 +70,6 @@ public class DuccReservationSubmit exten
.withDescription(DuccUiConstants.desc_help).hasArg(false)
.withLongOpt(DuccUiConstants.name_help).create());
options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_broker)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_broker,DuccUiConstants.exmp_service_broker)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_broker).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_endpoint)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_endpoint,DuccUiConstants.exmp_service_endpoint)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_endpoint).create());
- options.addOption(OptionBuilder
.withArgName(DuccUiConstants.parm_description)
.withDescription(makeDesc(DuccUiConstants.desc_description,DuccUiConstants.exmp_description)).hasArg()
.withLongOpt(DuccUiConstants.name_description).create());
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceCancel.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceCancel.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceCancel.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceCancel.java
Thu Feb 7 19:15:41 2013
@@ -66,14 +66,6 @@ public class DuccServiceCancel extends D
.withArgName(DuccUiConstants.parm_service_id)
.withDescription(makeDesc(DuccUiConstants.desc_service_id,DuccUiConstants.exmp_service_id)).hasArg()
.withLongOpt(DuccUiConstants.name_service_id).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_broker)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_broker,DuccUiConstants.exmp_service_broker)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_broker).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_endpoint)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_endpoint,DuccUiConstants.exmp_service_endpoint)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_endpoint).create());
}
protected int help(Options options) {
@@ -147,46 +139,20 @@ public class DuccServiceCancel extends D
}
// trim
DuccUiUtilities.trimProperties(serviceRequestProperties);
- /*
- * employ default broker/endpoint if not specified
- */
- String broker =
serviceRequestProperties.getProperty(JobRequestProperties.key_service_broker);
- if(broker == null) {
- broker = DuccUiUtilities.buildBrokerUrl();
- }
- String endpoint =
serviceRequestProperties.getProperty(JobRequestProperties.key_service_endpoint);
- if(endpoint == null) {
- endpoint =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_jms_provider)
- + ":"
- +
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint_type)
- + ":"
- +
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint)
- ;
- }
- /*
- * send to JM & get reply
- */
-// CamelContext context = new DefaultCamelContext();
-// ActiveMQComponent amqc =
ActiveMQComponent.activeMQComponent(broker);
-// String jmsProvider =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_jms_provider);
-// context.addComponent(jmsProvider, amqc);
-// context.start();
-// DuccEventDispatcher duccEventDispatcher;
-// duccEventDispatcher = new DuccEventDispatcher(context,endpoint);
-
+
String port =
DuccPropertiesResolver.
getInstance().
getProperty(DuccPropertiesResolver.ducc_orchestrator_http_port);
if ( port == null ) {
- throw new DuccRuntimeException("Unable to Submit a Job. Ducc
Orchestrator HTTP Port Not Defined. Add ducc.orchestrator.http.port
ducc.properties");
+ throw new DuccRuntimeException("Unable to Submit a Service. Ducc
Orchestrator HTTP Port Not Defined. Add ducc.orchestrator.http.port
ducc.properties");
}
String orNode =
DuccPropertiesResolver.
getInstance().
getProperty(DuccPropertiesResolver.ducc_orchestrator_node);
if ( orNode == null ) {
- throw new DuccRuntimeException("Unable to Submit a Job. Ducc
Orchestrator Node Not Defined. Add ducc.orchestrator.node to ducc.properties");
+ throw new DuccRuntimeException("Unable to Submit a Service. Ducc
Orchestrator Node Not Defined. Add ducc.orchestrator.node to ducc.properties");
}
String targetUrl = "http://"+orNode+":"+port+"/or";;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
Thu Feb 7 19:15:41 2013
@@ -86,14 +86,6 @@ public class DuccServiceSubmit extends D
.withDescription(DuccUiConstants.desc_debug).hasArg(false)
.withLongOpt(DuccUiConstants.name_debug).create());
options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_broker)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_broker,DuccUiConstants.exmp_service_broker)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_broker).create());
- options.addOption(OptionBuilder
-
.withArgName(DuccUiConstants.parm_service_endpoint)
-
.withDescription(makeDesc(DuccUiConstants.desc_service_endpoint,DuccUiConstants.exmp_service_endpoint)).hasArg()
-
.withLongOpt(DuccUiConstants.name_service_endpoint).create());
- options.addOption(OptionBuilder
.withArgName(DuccUiConstants.parm_description)
.withDescription(makeDesc(DuccUiConstants.desc_description,DuccUiConstants.exmp_description)).hasArg()
.withLongOpt(DuccUiConstants.name_description).create());
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
Thu Feb 7 19:15:41 2013
@@ -19,7 +19,6 @@
package org.apache.uima.ducc.cli;
import org.apache.uima.ducc.common.jd.plugin.IJdProcessExceptionHandler;
-import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.transport.event.cli.JobRequestProperties;
import org.apache.uima.ducc.transport.event.cli.JobSpecificationProperties;
import
org.apache.uima.ducc.transport.event.cli.ReservationSpecificationProperties;
@@ -90,24 +89,6 @@ public class DuccUiConstants {
public static final String exmp_driver_attach_console = "";
public static final String dval_driver_attach_console = null;
// End remote debug and console support
-
- public static final String name_service_broker =
JobRequestProperties.key_service_broker;
- public static final String parm_service_broker = "address";
- public static final String desc_service_broker = "Service broker.";
- public static final String labl_service_broker = "Service Broker";
- public static final String exmp_service_broker =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_broker_url);
- public static final String dval_service_broker = null;
-
- public static final String name_service_endpoint =
JobRequestProperties.key_service_endpoint;
- public static final String parm_service_endpoint = "address";
- public static final String desc_service_endpoint = "Service endpoint.";
- public static final String labl_service_endpoint = "Service Endpoint";
- public static final String exmp_service_endpoint =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_jms_provider)
-
+ ":"
-
+
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint_type)
-
+ ":"
-
+
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_request_endpoint);
- public static final String dval_service_endpoint = null;
/*
* cancel
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
Thu Feb 7 19:15:41 2013
@@ -36,10 +36,10 @@ import org.apache.uima.aae.client.UimaAs
import org.apache.uima.adapter.jms.client.BaseUIMAAsynchronousEngine_impl;
import org.apache.uima.ducc.common.jd.files.WorkItemStateManager;
import org.apache.uima.ducc.common.jd.plugin.IJdProcessExceptionHandler;
-import org.apache.uima.ducc.common.jd.plugin.JdProcessExceptionHandler;
-import org.apache.uima.ducc.common.jd.plugin.JdProcessExceptionHandlerLoader;
import
org.apache.uima.ducc.common.jd.plugin.IJdProcessExceptionHandler.Directive;
import
org.apache.uima.ducc.common.jd.plugin.IJdProcessExceptionHandler.JdProperties;
+import org.apache.uima.ducc.common.jd.plugin.JdProcessExceptionHandler;
+import org.apache.uima.ducc.common.jd.plugin.JdProcessExceptionHandlerLoader;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.TimeStamp;
@@ -57,16 +57,15 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.DuccPerWorkItemStatistics;
import org.apache.uima.ducc.transport.event.common.DuccProcessMap;
import
org.apache.uima.ducc.transport.event.common.DuccUimaDeploymentDescriptor;
-import org.apache.uima.ducc.transport.event.common.DuccWorkPopDriver;
+import
org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccProcessMap;
+import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
import
org.apache.uima.ducc.transport.event.common.IDuccUimaDeployableConfiguration;
import
org.apache.uima.ducc.transport.event.common.IDuccUimaDeploymentDescriptor;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IRationale;
import org.apache.uima.ducc.transport.event.common.Rationale;
-import
org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
-import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
import org.apache.uima.ducc.transport.event.jd.DriverStatusReport;
import org.apache.uima.ducc.transport.event.jd.DuccProcessWorkItemsMap;
import org.apache.uima.ducc.transport.event.jd.PerformanceMetricsSummaryItem;
@@ -340,12 +339,7 @@ public class JobDriver extends Thread im
String location = "uimaAsClientInitialize";
duccOut.info(location, jobid, "jd.step:"+location);
try {
- DuccWorkPopDriver popDriver = getJob().getDriver();
Map<String,Object> appCtx = new
HashMap<String,Object>();
- serverUri = popDriver.getServerUri();
- duccOut.info(location, jobid,
JobRequestProperties.key_job_broker+":"+serverUri);
- endPoint = popDriver.getEndPoint();
- duccOut.info(location, jobid,
JobRequestProperties.key_job_endpoint+":"+endPoint);
try {
metaTimeout =
Integer.parseInt(getJob().getDriver().getMetaTimeout());
duccOut.info(location, jobid,
JobRequestProperties.key_process_get_meta_time_max+":"+metaTimeout);
@@ -500,8 +494,8 @@ public class JobDriver extends Thread im
String sep = " / ";
duccOut.info(location, jobid,
"PerformanceMetricsSummaryMapSize:"+map.size());
duccOut.info(location, jobid,
"uniqueName"+sep+"name"+sep+"numProcessed"+sep+"analysisTime"+sep+"Avg"+sep+"Min"+sep+"Max");
- Set<Entry<String, PerformanceMetricsSummaryItem>> set =
map.entrySet();
- for (Entry<String, PerformanceMetricsSummaryItem> entry : set) {
+ Set<Entry<String, PerformanceMetricsSummaryItem>> tset =
map.entrySet();
+ for (Entry<String, PerformanceMetricsSummaryItem> entry : tset)
{
String uniqueName = entry.getKey();
PerformanceMetricsSummaryItem value = entry.getValue();
String name = value.getName();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
Thu Feb 7 19:15:41 2013
@@ -325,16 +325,8 @@ public class JobFactory {
DuccType duccType = job.getDuccType();
switch(duccType) {
case Job:
- String job_broker =
jobRequestProperties.getProperty(JobRequestProperties.key_job_broker);
- if(job_broker == null) {
- job_broker = common.brokerUrl;
- }
- job.setJobBroker(job_broker);
- String job_queue =
jobRequestProperties.getProperty(JobRequestProperties.key_job_endpoint);
- if(job_queue == null) {
- job_queue =
common.jdQueuePrefix+job.getDuccId();
- }
- job.setJobQueue(job_queue);
+ job.setJobBroker(common.brokerUrl);
+ job.setJobQueue(common.jdQueuePrefix+job.getDuccId());
String crxml =
jobRequestProperties.getProperty(JobSpecificationProperties.key_driver_descriptor_CR);
String crcfg =
jobRequestProperties.getProperty(JobSpecificationProperties.key_driver_descriptor_CR_overrides);
String meta_time =
jobRequestProperties.getProperty(JobRequestProperties.key_process_get_meta_time_max);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
Thu Feb 7 19:15:41 2013
@@ -40,19 +40,6 @@ public class JobRequestProperties extend
public static String key_request_type_modify = "request_type_modify";
/*
- * The broker and endpoint servicing submit, modify and cancel
- */
- public static String key_service_broker = "service_broker";
- public static String key_service_endpoint = "service_endpoint";
-
- /*
- * The broker and endpoint servicing the user specified (at submission)
- * job CR and corresponding UIMA-AS services
- */
- public static String key_job_broker = "job_broker";
- public static String key_job_endpoint = "job_endpoint";
-
- /*
* id: required for cancel/modify requests; error for submit request
*/
public static String key_id = "id";
@@ -60,10 +47,6 @@ public class JobRequestProperties extend
public static List<String> keys_requiring_values = Arrays.asList(
JobRequestProperties.key_signature,
- JobRequestProperties.key_job_broker,
- JobRequestProperties.key_job_endpoint,
- JobRequestProperties.key_service_broker,
- JobRequestProperties.key_service_endpoint,
JobRequestProperties.key_description,
JobRequestProperties.key_scheduling_class,
JobRequestProperties.key_submitter_pid_at_host,
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
Thu Feb 7 19:15:41 2013
@@ -82,10 +82,6 @@ public class JobSpecificationProperties
public static String[] keys = {
JobRequestProperties.key_signature,
- JobRequestProperties.key_job_broker,
- JobRequestProperties.key_job_endpoint,
- JobRequestProperties.key_service_broker,
- JobRequestProperties.key_service_endpoint,
JobRequestProperties.key_description,
JobRequestProperties.key_scheduling_class,
JobRequestProperties.key_submitter_pid_at_host,
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java?rev=1443670&r1=1443669&r2=1443670&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java
Thu Feb 7 19:15:41 2013
@@ -60,10 +60,6 @@ public class ReservationRequestPropertie
public static List<String> keys_requiring_values = Arrays.asList(
JobRequestProperties.key_signature,
- JobRequestProperties.key_job_broker,
- JobRequestProperties.key_job_endpoint,
- JobRequestProperties.key_service_broker,
- JobRequestProperties.key_service_endpoint,
JobRequestProperties.key_description,
JobRequestProperties.key_scheduling_class,
JobRequestProperties.key_submitter_pid_at_host,
