Author: degenaro
Date: Fri Mar 22 16:30:05 2013
New Revision: 1459890
URL: http://svn.apache.org/r1459890
Log:
UIMA-2732 DUCC support for monitoring of Managed Reservations, consistent
properties file naming
Modified:
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/DuccManagedReservationSubmit.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-web/src/main/java/org/apache/uima/ducc/ws/server/DuccFile.java
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=1459890&r1=1459889&r2=1459890&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
Fri Mar 22 16:30:05 2013
@@ -379,7 +379,7 @@ public class DuccJobSubmit
boolean rc = extractReply(submitJobReplyDuccEvent);
if ( rc ) {
- saveSpec("job-specification.properties", jobRequestProperties);
+ saveSpec(DuccUiConstants.job_specification_properties,
jobRequestProperties);
startMonitors(false, DuccContext.Job); // starts
conditionally, based on job spec and console listener present
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java?rev=1459890&r1=1459889&r2=1459890&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
Fri Mar 22 16:30:05 2013
@@ -160,7 +160,7 @@ public class DuccManagedReservationSubmi
if ( friendlyId < 0 ) {
retval = false;
} else {
- saveSpec("process.properties", serviceRequestProperties);
+ saveSpec(DuccUiConstants.managed_reservation_properties,
serviceRequestProperties);
startMonitors(true, DuccContext.ManagedReservation);
// starts conditionally, based on job spec and console listener present
}
}
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=1459890&r1=1459889&r2=1459890&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
Fri Mar 22 16:30:05 2013
@@ -217,7 +217,7 @@ public class DuccServiceSubmit
boolean rc = extractReply(reply);
if ( rc ) {
- saveSpec("service-specification.properties", requestProperties);
+ saveSpec(DuccUiConstants.service_specification_properties,
requestProperties);
}
return rc;
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=1459890&r1=1459889&r2=1459890&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
Fri Mar 22 16:30:05 2013
@@ -33,6 +33,10 @@ public class DuccUiConstants {
public static final String user = System.getProperty("user.name");
+ public static final String job_specification_properties =
"job-specification.properties";
+ public static final String service_specification_properties =
"service-specification.properties";
+ public static final String managed_reservation_properties =
"managed-reservation.properties";
+
/*
* common
*/
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccFile.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccFile.java?rev=1459890&r1=1459889&r2=1459890&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccFile.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccFile.java
Fri Mar 22 16:30:05 2013
@@ -24,20 +24,30 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
+import org.apache.uima.ducc.cli.DuccUiConstants;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
public class DuccFile {
public static Properties getJobProperties(IDuccWorkJob job) throws
IOException {
String directory =
job.getUserLogsDir()+job.getDuccId().getFriendly()+File.separator;
- String name = "job-specification.properties";
+ String name = DuccUiConstants.job_specification_properties;
Properties properties = DuccFile.getProperties(directory, name);
return properties;
}
public static Properties getManagedReservationProperties(IDuccWorkJob
job) throws IOException {
String directory =
job.getUserLogsDir()+job.getDuccId().getFriendly()+File.separator;
- String name = "service-specification.properties";
+ // <hack>
+ try {
+ String hack_name = "process.properties";
+ Properties hack_properties =
DuccFile.getProperties(directory, hack_name);
+ return hack_properties;
+ }
+ catch(Exception e) {
+ }
+ // </hack>
+ String name = DuccUiConstants.managed_reservation_properties;
Properties properties = DuccFile.getProperties(directory, name);
return properties;
}
