Author: degenaro
Date: Thu Apr 14 18:59:05 2016
New Revision: 1739168
URL: http://svn.apache.org/viewvc?rev=1739168&view=rev
Log:
UIMA-4884 DUCC standardization of environment variables
employ enums
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Thu Apr 14
18:59:05 2016
@@ -916,7 +916,7 @@ class DuccUtil(DuccBase):
if ( self.localhost == self.ducc_properties.get("ducc.head")):
self.is_ducc_head = True
- os.environ['NodeName'] = self.localhost # to match java code's
implicit propery so script and java match
+ os.environ['DUCC_NODENAME'] = self.localhost # to match java code's
implicit propery so script and java match
self.pid_file = self.DUCC_HOME + '/state/ducc.pids'
self.set_classpath()
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
Thu Apr 14 18:59:05 2016
@@ -44,6 +44,7 @@ import org.apache.uima.ducc.agent.proces
import org.apache.uima.ducc.agent.processors.NodeInventoryProcessor;
import org.apache.uima.ducc.agent.processors.NodeMetricsProcessor;
import org.apache.uima.ducc.agent.processors.ProcessMetricsProcessor;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.config.DuccBlastGuardPredicate;
@@ -74,9 +75,9 @@ public class AgentConfiguration {
// fetch the name of an endpoint where the JM expects incoming requests
// @Value("#{ systemProperties['IP'] }")
- public String ip = System.getenv("IP");
+ public String ip =
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value());
- public String nodeName = System.getenv("NodeName");
+ public String nodeName =
System.getenv(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value());
private CamelContext camelContext;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java
Thu Apr 14 18:59:05 2016
@@ -20,6 +20,7 @@ package org.apache.uima.ducc.agent.deplo
import java.util.List;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.ducc.transport.agent.IUimaPipelineAEComponent;
@@ -98,9 +99,9 @@ public class ServiceAdapter implements S
state.setSocketEndpoint(endpoint);
}
// send the process update to the remote
- dispatcher.dispatch(duccEvent, System.getenv("IP"));
+ dispatcher.dispatch(duccEvent,
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()));
String jmx = state.getProcessJmxUrl() == null ? "N/A" :
state.getProcessJmxUrl();
- logger.info("notifyAgentWithStatus",null,"... UIMA AS
Service Deployed - PID:"+pid+". Service State: "+state+". JMX Url:"+jmx+"
Dispatched State Update Event to Agent with IP:"+System.getenv("IP"));
+ logger.info("notifyAgentWithStatus",null,"... UIMA AS
Service Deployed - PID:"+pid+". Service State: "+state+". JMX Url:"+jmx+"
Dispatched State Update Event to Agent with
IP:"+System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()));
} catch( Exception e) {
e.printStackTrace();
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
Thu Apr 14 18:59:05 2016
@@ -30,6 +30,7 @@ import org.apache.uima.ducc.agent.NodeAg
import org.apache.uima.ducc.agent.deploy.ManagedService;
import org.apache.uima.ducc.agent.deploy.ServiceAdapter;
import org.apache.uima.ducc.agent.deploy.ServiceStateNotificationAdapter;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.ducc.transport.DuccExchange;
@@ -107,7 +108,7 @@ public class UimaAsServiceConfiguration
return new ProcessEventListener(service);
}
private ServiceStateNotificationAdapter
serviceAdapter(DuccEventDispatcher eventDispatcher, String stateUpdateEndpoint)
{
- return new ServiceAdapter(eventDispatcher,
System.getenv("ProcessDuccId"), stateUpdateEndpoint);
+ return new ServiceAdapter(eventDispatcher,
System.getenv(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value()),
stateUpdateEndpoint);
}
@Bean
public ManagedService managedService() throws Exception {
@@ -117,7 +118,7 @@ public class UimaAsServiceConfiguration
// when running multiple agents on the same node. The
agent is
// responsible for providing the IP in this process
environment.
String thisNodeIP =
- (System.getenv("IP") == null) ?
InetAddress.getLocalHost().getHostAddress() : System.getenv("IP");
+
(System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()) == null) ?
InetAddress.getLocalHost().getHostAddress() :
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value());
camelContext = common.camelContext();
int serviceSocketPort = 0;
String agentSocketParams="";
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java
Thu Apr 14 18:59:05 2016
@@ -25,6 +25,7 @@ import java.util.concurrent.Callable;
import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
import org.apache.uima.ducc.agent.NodeAgent;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.ducc.transport.cmdline.ICommandLine;
@@ -125,13 +126,13 @@ public abstract class CommandExecutor im
// Enrich environment for the new process. Via
these settings
// the UIMA AS
// service wrapper can notify the agent of its
state.
- env.put("IP", ip);
- env.put("NodeName", host);
+
env.put(IDuccUser.EnvironmentVariable.DUCC_IP.value(), ip);
+
env.put(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value(), host);
// Add process unique ducc id to correlate
process state updates
- env.put("ProcessDuccId", ((ManagedProcess)
managedProcess)
+
env.put(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value(),
((ManagedProcess) managedProcess)
.getDuccId().getUnique());
// Add "friendly" process name for coordination
with JD and OR
- env.put("ProcessDuccIdFriendly",
((ManagedProcess) managedProcess)
+
env.put(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS.value(),
((ManagedProcess) managedProcess)
.getDuccId().getFriendly()+"");
if (((ManagedProcess)
managedProcess).getDuccProcess()
.getProcessType()
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
Thu Apr 14 18:59:05 2016
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeoutExcep
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.uima.ducc.agent.NodeAgent;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.TimeStamp;
@@ -806,10 +807,10 @@ public class DuccCommandExecutor extends
}
// add JobId and the log prefix to the env so
additional
// similarly-named log files can be created
- processEnv.put("JobId", String
+
processEnv.put(IDuccUser.EnvironmentVariable.DUCC_ID_JOB.value(), String
.valueOf(((ManagedProcess)
super.managedProcess)
.getWorkDuccId().getFriendly()));
- processEnv.put("DUCC_PROCESS_LOG_PREFIX",
processLogDir
+
processEnv.put(IDuccUser.EnvironmentVariable.DUCC_LOG_PREFIX.value(),
processLogDir
+ processLogFile);
}
return cmd;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
Thu Apr 14 18:59:05 2016
@@ -25,6 +25,7 @@ import java.util.concurrent.Future;
import org.apache.uima.ducc.agent.NodeAgent;
import org.apache.uima.ducc.agent.event.ProcessLifecycleObserver;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.ducc.common.utils.id.DuccIdFactory;
@@ -110,7 +111,7 @@ public class Launcher {
public static void main(String[] args) {
try {
int howMany = Integer.parseInt(args[0]); // how many agent
processes to launch
- String ip = System.getProperty("IP");
+ String ip =
System.getProperty(IDuccUser.EnvironmentVariable.DUCC_IP.value());
String nodeName = InetAddress.getLocalHost().getHostName();
Launcher launcher = new Launcher();
JavaCommandLine cmdLine = new JavaCommandLine("java");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
Thu Apr 14 18:59:05 2016
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.TcpStreamHandler;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.QuotedOptions;
@@ -46,7 +47,7 @@ public class DuccUiUtilities {
String runmode =
DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_runmode);
if(runmode != null) {
if(runmode.equals("Test")) {
- String envUser = System.getenv("USER");
+ String envUser =
System.getenv(IDuccUser.EnvironmentVariable.USER.value());
if(envUser != null) {
user = envUser;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
Thu Apr 14 18:59:05 2016
@@ -27,6 +27,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
+import java.util.Map.Entry;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -49,6 +50,7 @@ import org.apache.uima.ducc.common.main.
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccProperties;
import org.apache.uima.ducc.common.utils.Utils;
+import org.apache.uima.ducc.common.utils.id.DuccId;
/**
* Abstract class which every Ducc component should extend from. Provides
support for loading
@@ -306,9 +308,36 @@ public abstract class AbstractDuccCompon
start(service, null);
}
+ private void dumpArgs(String[] args) {
+ String location = "dumpArgs";
+ DuccId jobid = null;
+ if(args != null) {
+ for(String arg : args) {
+ logger.info(location, jobid, arg);
+ }
+ }
+ }
+
+ private void dumpProps() {
+ String location = "dumpProps";
+ DuccId jobid = null;
+ Properties properties = System.getProperties();
+ if(properties != null) {
+ for(Entry<Object, Object> entry :
properties.entrySet()) {
+ String key = (String) entry.getKey();
+ String value = (String) entry.getValue();
+ logger.info(location, jobid, key+"="+value);
+ }
+ }
+ }
+
public void start(DuccService service, String[] args) throws Exception {
String endpoint = null;
this.service = service;
+
+ dumpArgs(args);
+ dumpProps();
+
if (System.getProperty("ducc.deploy.components") != null
&&
!System.getProperty("ducc.deploy.components").equals("uima-as")
&&
!System.getProperty("ducc.deploy.components").equals("job-process")
@@ -457,6 +486,11 @@ public abstract class AbstractDuccCompon
* @throws Exception
*/
public String startJmxAgent() throws Exception {
+ String location = "startJmxAgent";
+ DuccId jobid = null;
+ String key = "com.sun.management.jmxremote.authenticate";
+ String value = System.getProperty(key);
+ logger.info(location, jobid, key+"="+value);
int rmiRegistryPort = 2099; // start with a default port setting
if (System.getProperty("ducc.jmx.port") != null) {
try {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
Thu Apr 14 18:59:05 2016
@@ -43,6 +43,7 @@ import org.apache.commons.cli.OptionBuil
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.admin.event.DuccAdminEvent;
import org.apache.uima.ducc.common.admin.event.DuccAdminEventKill;
import org.apache.uima.ducc.common.admin.event.DuccAdminEventStopMetrics;
@@ -276,7 +277,7 @@ public class DuccAdmin extends AbstractD
new DataInputStream(in)));
String strLine;
- String sshUser = System.getenv("USER");
+ String sshUser =
System.getenv(IDuccUser.EnvironmentVariable.USER.value());
String userHome = System.getProperty("user.home");
String sshIdentityLocation = userHome + FileSeparator +
".ssh"
+ FileSeparator + "id_dsa";
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
Thu Apr 14 18:59:05 2016
@@ -29,6 +29,7 @@ import org.apache.camel.main.Main;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.component.AbstractDuccComponent;
import org.apache.uima.ducc.common.component.IJobProcessor;
@@ -275,14 +276,14 @@ public class DuccService extends Abstrac
System.exit(-1);
}
- if ( System.getenv("IP") == null ) {
+ if ( System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value())
== null ) {
NodeIdentity ni = new NodeIdentity();
- System.setProperty("IP", ni.getIp());
- System.setProperty("NodeName", ni.getName());
+
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_IP.value(), ni.getIp());
+
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value(),
ni.getName());
} else {
- System.setProperty("IP", System.getenv("IP"));
- System.setProperty("NodeName",
System.getenv("NodeName"));
+
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_IP.value(),
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()));
+
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value(),
System.getenv(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value()));
}
duccService = new DuccService();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
Thu Apr 14 18:59:05 2016
@@ -79,7 +79,7 @@ public class FixedSleepCR extends Collec
long seed = System.currentTimeMillis();
r = new Random(seed);
- jobid = System.getenv("JobId");
+ jobid = System.getenv("DUCC_JOBID");
logdir = jobid + ".output";
logger.log(Level.INFO, " ****** BB Working directory: " +
System.getProperty("user.dir"));
logger.log(Level.INFO, " ****** BB jobid: " + logdir);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java
Thu Apr 14 18:59:05 2016
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Map;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
@@ -73,7 +74,7 @@ public class DuccAsUser {
Map<String, String> env = pb.environment();
- env.put("JobId", identity);
+ env.put(IDuccUser.EnvironmentVariable.DUCC_ID_JOB.value(),
identity);
try {
pb = pb.redirectError(devNull);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
Thu Apr 14 18:59:05 2016
@@ -27,6 +27,7 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Map;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.persistence.services.IStateServices;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccProperties;
@@ -59,7 +60,7 @@ class ServiceInstance
boolean stopped; // careful .. this means it
was stopped by a stop order from somewhere,
// NOT that it's
terminating
- String ducc_home = System.getProperty("DUCC_HOME");
+ String ducc_home =
System.getProperty(IDuccUser.EnvironmentVariable.DUCC_HOME.value());
String api_classpath = ducc_home + "/lib/uima-ducc-cli.jar" + ":" +
System.getProperty("java.class.path");
ServiceInstance(ServiceSet sset)
@@ -223,8 +224,8 @@ class ServiceInstance
StdioListener ser_listener = null;
Map<String, String> env = pb.environment();
- env.put("DUCC_HOME", System.getProperty("DUCC_HOME"));
- env.put("DUCC_SERVICE_INSTANCE", Integer.toString(instance_id)); //
UIMA-4258
+ env.put(IDuccUser.EnvironmentVariable.DUCC_HOME.value(),
System.getProperty(IDuccUser.EnvironmentVariable.DUCC_HOME.value()));
+ env.put(IDuccUser.EnvironmentVariable.DUCC_ID_SERVICE.value(),
Integer.toString(instance_id)); // UIMA-4258
try {
Process p = pb.start();
@@ -355,7 +356,7 @@ class ServiceInstance
ProcessBuilder pb = new ProcessBuilder(args);
Map<String, String> env = pb.environment();
- env.put("DUCC_HOME", System.getProperty("DUCC_HOME"));
+ env.put(IDuccUser.EnvironmentVariable.DUCC_HOME.value(),
System.getProperty(IDuccUser.EnvironmentVariable.DUCC_HOME.value()));
pb.redirectOutput(new File("/dev/null"));
pb.redirectError(new File("/dev/null"));
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java
Thu Apr 14 18:59:05 2016
@@ -20,6 +20,7 @@ package org.apache.uima.ducc.transport.c
import java.util.List;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.Utils;
import
org.apache.uima.ducc.container.jp.iface.IJobProcessManagerCallbackListener;
@@ -107,12 +108,12 @@ implements IAgentSession, IJobProcessMan
state.setSocketEndpoint(endpoint);
}
// send the process update to the remote
- dispatcher.dispatch(duccEvent, System.getenv("IP"));
+ dispatcher.dispatch(duccEvent,
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()));
String jmx = state.getProcessJmxUrl() == null ? "N/A" :
state.getProcessJmxUrl();
// only log on transition from Initializing to Running
if ( state.getState().equals(ProcessState.Running) &&
log ) {
log = false;
- logger.info("notifyAgentWithStatus",null,"...
Job Process State Changed - PID:"+pid+". Process State:
"+state.getState().toString()+". JMX Url:"+jmx+" Dispatched State Update Event
to Agent with IP:"+System.getenv("IP"));
+ logger.info("notifyAgentWithStatus",null,"...
Job Process State Changed - PID:"+pid+". Process State:
"+state.getState().toString()+". JMX Url:"+jmx+" Dispatched State Update Event
to Agent with
IP:"+System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()));
}
} catch( Exception e) {
e.printStackTrace();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
Thu Apr 14 18:59:05 2016
@@ -40,6 +40,7 @@ import org.apache.http.protocol.RequestC
import org.apache.http.protocol.RequestContent;
import org.apache.http.protocol.RequestTargetHost;
import org.apache.http.protocol.RequestUserAgent;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.XStreamUtils;
@@ -152,20 +153,20 @@ public class DuccHttpClient {
}
private String getIP() {
String ip =nodeIdentity.getIp();
- if ( System.getenv("IP") != null) {
- ip = System.getenv("IP");
+ if (
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()) != null) {
+ ip =
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value());
}
return ip;
}
private String getNodeName() {
String nn =nodeIdentity.getName();
- if ( System.getenv("NodeName") != null) {
- nn = System.getenv("NodeName");
+ if (
System.getenv(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value()) != null) {
+ nn =
System.getenv(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value());
}
return nn;
}
private String getProcessName() {
- String pn = System.getenv("ProcessDuccIdFriendly");
+ String pn =
System.getenv(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS.value());
return pn;
}
private void addCommonHeaders( IMetaCasTransaction transaction ) {
@@ -184,7 +185,7 @@ public class DuccHttpClient {
private void addCommonHeaders( PostMethod method ) {
synchronized( DuccHttpClient.class) {
- method.setRequestHeader("IP", getIP());
+
method.setRequestHeader(IDuccUser.EnvironmentVariable.DUCC_IP.value(), getIP());
method.setRequestHeader("Hostname", getNodeName());
method.setRequestHeader("ThreadID",
String.valueOf(Thread.currentThread().getId()));
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
Thu Apr 14 18:59:05 2016
@@ -23,8 +23,8 @@ import java.net.InetAddress;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.common.utils.Utils;
@@ -169,8 +169,8 @@ public class JobProcessConfiguration {
// will be the actual node IP. In testing, the IP can
be virtual
// when running multiple agents on the same node. The
agent is
// responsible for providing the IP in this process
environment.
- String thisNodeIP = (System.getenv("IP") == null) ?
InetAddress
- .getLocalHost().getHostAddress() :
System.getenv("IP");
+ String thisNodeIP =
(System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()) == null) ?
InetAddress
+ .getLocalHost().getHostAddress() :
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value());
camelContext = common.camelContext();
// currently supported jobType values:
@@ -241,7 +241,7 @@ public class JobProcessConfiguration {
// Create Agent proxy which will be used to notify Agent
// of state changes.
agent = new AgentSession(eventDispatcher,
- System.getenv("ProcessDuccId"),
+
System.getenv(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value()),
common.managedServiceEndpoint);
System.out
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
Thu Apr 14 18:59:05 2016
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.common.utils.Utils;
@@ -169,8 +170,8 @@ public class ServiceConfiguration {
// will be the actual node IP. In testing, the IP can
be virtual
// when running multiple agents on the same node. The
agent is
// responsible for providing the IP in this process
environment.
- String thisNodeIP = (System.getenv("IP") == null) ?
InetAddress
- .getLocalHost().getHostAddress() :
System.getenv("IP");
+ String thisNodeIP =
(System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()) == null) ?
InetAddress
+ .getLocalHost().getHostAddress() :
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value());
camelContext = common.camelContext();
// custom processor class can be provided in the
command line.
@@ -222,7 +223,7 @@ public class ServiceConfiguration {
// Create Agent proxy which will be used to notify Agent
// of state changes.
agent = new AgentSession(eventDispatcher,
- System.getenv("ProcessDuccId"),
+
System.getenv(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value()),
common.managedServiceEndpoint);
System.out
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
Thu Apr 14 18:59:05 2016
@@ -50,6 +50,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.XmiSerializationSharedData;
import org.apache.uima.collection.EntityProcessStatus;
+import org.apache.uima.ducc.IUser;
import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
import org.xml.sax.Attributes;
@@ -91,8 +92,8 @@ public class UimaASProcessContainer ext
public int doInitialize(Properties props, String[] args) throws
Exception {
duccHome = System.getProperty("DUCC_HOME");
String pid = getPID("Queue");
- if ( System.getenv("NodeName") != null) {
- endpointName = System.getenv("NodeName")+pid;
+ if (
System.getenv(IUser.EnvironmentVariable.DUCC_NODENAME.value()) != null) {
+ endpointName =
System.getenv(IUser.EnvironmentVariable.DUCC_NODENAME.value())+pid;
} else {
endpointName =
InetAddress.getLocalHost().getCanonicalHostName()+pid;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java?rev=1739168&r1=1739167&r2=1739168&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java
Thu Apr 14 18:59:05 2016
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Map;
+import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
@@ -78,12 +79,12 @@ public class DuccAsUser {
Map<String, String> env = pb.environment();
- env.put("JobId", "webserver");
+ env.put(IDuccUser.EnvironmentVariable.DUCC_ID_JOB.value(),
"webserver");
String runmode =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_runmode);
if(runmode != null) {
if(runmode.equals("Test")) {
- env.put("USER", user);
+
env.put(IDuccUser.EnvironmentVariable.USER.value(), user);
}
}
@@ -149,12 +150,12 @@ public class DuccAsUser {
Map<String, String> env = pb.environment();
- env.put("JobId", "webserver");
+ env.put(IDuccUser.EnvironmentVariable.DUCC_ID_JOB.value(),
"webserver");
String runmode =
DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_runmode);
if(runmode != null) {
if(runmode.equals("Test")) {
- env.put("USER", user);
+
env.put(IDuccUser.EnvironmentVariable.USER.value(), user);
}
}
