Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1966/ 
: UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1966/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

BAD Compatibility Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/604/ : FAILURE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Ian Maxon (Code Review)
Ian Maxon has submitted this change and it was merged.

Change subject: Various fixes for Windows NCService
..


Various fixes for Windows NCService

- Fix RESOURCE_PATH
- Use windows platform in appassembler instead of booter-windows for 
client-helper
- Fix a few redirection bugs in sample start/stop batch files

Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1518
Reviewed-by: Yingyi Bu 
Reviewed-by: Michael Blow 
Integration-Tests: Ian Maxon 
Tested-by: Ian Maxon 
---
M asterixdb/asterix-client-helper/pom.xml
M 
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
5 files changed, 7 insertions(+), 41 deletions(-)

Approvals:
  Michael Blow: Looks good to me, approved
  Yingyi Bu: Looks good to me, approved
  Ian Maxon: Verified; Verified



diff --git a/asterixdb/asterix-client-helper/pom.xml 
b/asterixdb/asterix-client-helper/pom.xml
index 9a7bb64..726e8fa 100644
--- a/asterixdb/asterix-client-helper/pom.xml
+++ b/asterixdb/asterix-client-helper/pom.xml
@@ -41,26 +41,17 @@
 
   
 unix
+windows
   
   asterixhelper
   
org.apache.asterix.clienthelper.AsterixHelper
 
   
-  
-
-  asterixhelper
-  
org.apache.asterix.clienthelper.AsterixHelper
-  
-booter-windows
-  
-
-  
 
 
   
 
   assemble
-  generate-daemons
 
   
 
diff --git 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index dd7c8e4..83ff3a2 100644
--- 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++ 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -31,7 +31,7 @@
 // 3000  3999: feed errors
 // 4000  4999: lifecycle management errors
 public class ErrorCode {
-private static final String RESOURCE_PATH = "asx_errormsg" + 
File.separator + "en.properties";
+private static final String RESOURCE_PATH = "asx_errormsg/en.properties";
 public static final String ASTERIX = "ASX";
 
 // Extension errors
diff --git 
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat 
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
index 580e1e0..74ca87e 100644
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
@@ -52,20 +52,6 @@
 goto opts
 :postopts
 
-if NOT DEFINED JAVA_HOME (
-  echo ERROR: JAVA_HOME not defined
-  goto :ERROR
-)
-REM ensure JAVA_HOME has no spaces nor quotes, since appassembler can't handle 
them
-set JAVA_HOME=%JAVA_HOME:"=%
-for %%I in ("%JAVA_HOME%") do (
-  set JAVA_HOME=%%~sI
-)
-
-set JAVACMD=%JAVA_HOME%\bin\java
-
-REM TODO(mblow): check java version, spaces in CWD
-
 set DIRNAME=%~dp0
 
 pushd %DIRNAME%\..
@@ -92,7 +78,7 @@
 
 wmic process where ^
   "name='java.exe' and CommandLine like 
'%%org.codehaus.mojo.appassembler.booter.AppassemblerBooter%%' and (CommandLine 
like '%%app.name=\"%%[cn]c\"%%' or CommandLine like 
'%%app.name=\"%%ncservice\"%%')" ^
-  GET processid > %tempfile% 2>/dev/null
+  GET processid > %tempfile% 2> nul
 
 set severity=ERROR
 if "%force%" == "1" set severity=WARNING
diff --git 
a/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat 
b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
index 7ac9483..6b02174 100644
--- a/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
@@ -58,17 +58,6 @@
 goto opts
 :postopts
 
-if NOT DEFINED JAVA_HOME (
-  echo ERROR: JAVA_HOME not defined
-  goto :ERROR
-)
-
-REM ensure JAVA_HOME has no spaces nor quotes, since appassembler can't handle 
them
-set JAVA_HOME=%JAVA_HOME:"=%
-for %%I in ("%JAVA_HOME%") do (
-  set JAVA_HOME=%%~sI
-)
-
 set DIRNAME=%~dp0
 
 pushd %DIRNAME%\..
@@ -92,12 +81,12 @@
 if "%tries%" == "60" goto :timed_out
 wmic process where ^
   "name='java.exe' and CommandLine like 
'%%org.codehaus.mojo.appassembler.booter.AppassemblerBooter%%' and (CommandLine 
like '%%app.name=\"%%[cn]c\"%%' or CommandLine like 

Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Ian Maxon (Code Review)
Ian Maxon has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4: Integration-Tests+1 Verified+1

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1961/ 
: UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Michael Blow (Code Review)
Michael Blow has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1961/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Timed Out

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1956/ 
: ABORTED

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1956/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Ian Maxon (Code Review)
Ian Maxon has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1518/4/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
File asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat:

PS4, Line 55: 
: 
: 
: 
: 
: 
: 
: 
: 
: 
: 
: 
: 
: 
> Why this deletion?  Did you test appassembler with spaces in JAVA_HOME?
Because JAVA_HOME isn't set by default from what I've seen. I'm just letting it 
use whatever "java" points to. The default path has a space for sure 
(C:\Program Files\...)


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: Yes


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-22 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Timed Out

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1955/ 
: ABORTED

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-21 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4: Integration-Tests-1

Integration Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1953/ 
: UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-21 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4: BAD-1

BAD Compatibility Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/595/ : FAILURE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-21 Thread Yingyi Bu (Code Review)
Yingyi Bu has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-21 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1953/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-21 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-21 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Various fixes for Windows NCService
..


Patch Set 4:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4372/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No


Change in asterixdb[master]: Various fixes for Windows NCService

2017-02-21 Thread Ian Maxon (Code Review)
Hello Yingyi Bu, Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1518

to look at the new patch set (#4).

Change subject: Various fixes for Windows NCService
..

Various fixes for Windows NCService

- Fix RESOURCE_PATH
- Use windows platform in appassembler instead of booter-windows for 
client-helper
- Fix a few redirection bugs in sample start/stop batch files

Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
---
M asterixdb/asterix-client-helper/pom.xml
M 
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
5 files changed, 7 insertions(+), 41 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/18/1518/4
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1518
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If7af80292bddd5191d83bac18f0a518621d7db71
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Yingyi Bu