Author: challngr Date: Fri Jul 19 20:12:55 2013 New Revision: 1504992 URL: http://svn.apache.org/r1504992 Log: UIMA-3011 Don't set ping classpath for internal pingers.
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java?rev=1504992&r1=1504991&r2=1504992&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java Fri Jul 19 20:12:55 2013 @@ -115,7 +115,7 @@ class PingDriver internal_ping = false; this.meta_ping_timeout = job_props.getStringProperty("service_ping_timeout"); this.do_log = job_props.getBooleanProperty("service_ping_dolog", true); - this.classpath = job_props.getStringProperty("service_ping_classpath"); + this.classpath = job_props.getStringProperty("service_ping_classpath", System.getProperty("java.class.path")); this.working_directory = job_props.getStringProperty("working_directory"); this.log_directory = job_props.getStringProperty("log_directory"); } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1504992&r1=1504991&r2=1504992&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Fri Jul 19 20:12:55 2013 @@ -257,18 +257,12 @@ public class ServiceSet parseIndependentServices(); - if ( ! job_props.containsKey("service_ping_classpath")) { - job_props.put("service_ping_classpath", System.getProperty("java.class.path")); - } if ( ! job_props.containsKey("service_ping_dolog")) { job_props.put("service_ping_dolog", "false"); } if ( !job_props.containsKey("service_ping_timeout") ) { job_props.put("service_ping_timeout", ""+ServiceManagerComponent.meta_ping_timeout); } - if ( ! job_props.containsKey("service_ping_dolog") ) { - job_props.put("service_ping_dolog", "true"); // unless we fill in the default pinger - } meta_props.put("service-class", ""+service_class.decode()); meta_props.put("service-type", ""+service_type.decode());