You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/11/21 14:11:17 UTC

svn commit: r1640914 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd: JobDriverComponent.java JobDriverConfiguration.java

Author: degenaro
Date: Fri Nov 21 13:11:17 2014
New Revision: 1640914

URL: http://svn.apache.org/r1640914
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.

JP port in JD's pub.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverConfiguration.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java?rev=1640914&r1=1640913&r2=1640914&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java Fri Nov 21 13:11:17 2014
@@ -44,6 +44,7 @@ implements IJobDriverComponent {
 	
 	private static DuccLogger logger = DuccLoggerComponents.getJdOut(JobDriverComponent.class.getName());
 	private static DuccId jobid = null;
+	private static int port = 0;
 	
 	private JobDriverConfiguration configuration;
 	
@@ -95,6 +96,10 @@ implements IJobDriverComponent {
 		return configuration;
 	}
 	
+	public void setPort(int value) {
+		port = value;
+	}
+	
 	@Override
 	public DuccLogger getLogger() {
 		return logger;
@@ -110,6 +115,7 @@ implements IJobDriverComponent {
 			IMessageHandler mh = JobDriver.getInstance().getMessageHandler();
 			IOperatingInfo oi = mh.handleGetOperatingInfo();
 			IDriverStatusReport driverStatusReport = new JobDriverReport(oi);
+			driverStatusReport.setPort(port);
 			state.setState(driverStatusReport);
 			logger.debug(location, jobid, "reqNo: "+getStateReqNo.incrementAndGet());
 		}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverConfiguration.java?rev=1640914&r1=1640913&r2=1640914&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverConfiguration.java Fri Nov 21 13:11:17 2014
@@ -50,6 +50,7 @@ import org.springframework.context.annot
 		
 		private static DuccLogger logger = DuccLoggerComponents.getJdOut(JobDriverConfiguration.class.getName());
 		private static DuccId jobid = null;
+		private static int port = 0;
 		
 		//	use Spring magic to autowire (instantiate and bind) CommonConfiguration to a local variable
 		@Autowired CommonConfiguration common;
@@ -186,7 +187,8 @@ import org.springframework.context.annot
 			//	Inject Camel Router that will delegate messages to JobDriver delegate listener
 			jdc.getContext().addRoutes(this.routeBuilderForIncomingRequests(common.orchestratorAbbreviatedStateUpdateEndpoint, delegateListener));
 			
-			int port = Utils.findFreePort();
+			port = Utils.findFreePort();
+			jdc.setPort(port);
 			String jdUniqueId = "jdApp";
 			jdc.getContext().addRoutes(this.routeBuilderForJpIncomingRequests(jdc, port, jdUniqueId));
 			logger.info(location, jobid, "port: "+port+" "+"endpoint: "+common.jdStateUpdateEndpoint+" "+"rate: "+common.jdStatePublishRate);