Author: burn
Date: Thu Jan 23 21:53:44 2020
New Revision: 1873077
URL: http://svn.apache.org/viewvc?rev=1873077&view=rev
Log:
UIMA-6178 Fixed JAVA_HOME for Mac; tighten ssh-operational test; use https for
maven central
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc_post_install
uima/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/uima-ducc/trunk/src/main/scripts/ducc_base.py
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
uima/uima-ducc/trunk/uima-ducc-parent/pom.xml
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_post_install
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_post_install?rev=1873077&r1=1873076&r2=1873077&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_post_install (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_post_install Thu Jan 23 21:53:44
2020
@@ -295,7 +295,7 @@ class PostInstall():
def set_java_home(self):
jvm = self.path_to_java
if ( platform.system() == 'Darwin' ):
- self.jvm_home = "/Library/Java/Home"
+ self.jvm_home =
subprocess.check_output("/usr/libexec/java_home").strip()
else:
ndx = jvm.rindex('/')
ndx = jvm.rindex('/', 0, ndx)
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_util.py
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1873077&r1=1873076&r2=1873077&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_util.py Thu Jan 23 21:53:44 2020
@@ -589,13 +589,16 @@ class DuccUtil(DuccBase):
ssh_cmd = 'ssh -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=10'+' '+node+"
"+cmd
resp = self.popen(ssh_cmd)
lines = resp.readlines()
+ # Response should be just the full nodename so check that the short
name matches
+ # Note that error msgs may also contain the node name
for line in lines:
- if(node in line):
+ if (line.startswith(node) and len(line.split())==1):
return True
if(verbosity):
print 'ssh not operational - unexpected results from:', ssh_cmd
for line in lines:
print '>>>>>',line
+ print '?? Has the entry in .ssh/id_rsa.pub been appended to
.ssh/authorized_keys ??'
return False
# like popen, only it spawns via ssh
Modified: uima/uima-ducc/trunk/src/main/scripts/ducc_base.py
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/scripts/ducc_base.py?rev=1873077&r1=1873076&r2=1873077&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/scripts/ducc_base.py (original)
+++ uima/uima-ducc/trunk/src/main/scripts/ducc_base.py Thu Jan 23 21:53:44 2020
@@ -75,7 +75,7 @@ class DuccBase:
return 'JAVA_HOME' # avoid npe during first-time setup
if ( self.system == 'Darwin' ):
- self.jvm_home = "/Library/Java/Home"
+ self.jvm_home =
subprocess.check_output("/usr/libexec/java_home").strip()
else:
ndx = self.jvm.rindex('/')
ndx = self.jvm.rindex('/', 0, ndx)
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1873077&r1=1873076&r2=1873077&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
Thu Jan 23 21:53:44 2020
@@ -594,7 +594,7 @@ public class NodeAgent extends AbstractD
} catch (Exception e) {
logger.info("nodeAgent", null,
- "------- Agent failed while checking for existence of
ducc_ling", e);
+ "------- Agent failed while checking for existence of CGroups",
e.getMessage());
} finally {
if (br != null) {
try {
Modified: uima/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1873077&r1=1873076&r2=1873077&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/uima-ducc/trunk/uima-ducc-parent/pom.xml Thu Jan 23 21:53:44 2020
@@ -62,7 +62,7 @@
<id>eclipsePlugins</id>
<name>Eclipse components</name>
<layout>default</layout>
- <url>http://repo1.maven.org/eclipse</url>
+ <url>https://repo1.maven.org/eclipse</url>
<releases>
<updatePolicy>never</updatePolicy>
@@ -79,7 +79,7 @@
<id>central</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
+ <url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
