Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Jenkins has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 2: Integration Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/549/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Jenkins has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/549/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Till Westmann has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1142 to look at the new patch set (#2). Change subject: Start/Stop Sample Scripts for Windows .. Start/Stop Sample Scripts for Windows - Fix windows binaries (ncservice, cc, nc, helper) - Add windows start/stop sample cluster scripts Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 --- M .gitignore M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-client-helper/src/main/assembly/assembly.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml A asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat A asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat 7 files changed, 174 insertions(+), 11 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/42/1142/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Michael Blow has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1142/1/asterixdb/asterix-client-helper/pom.xml File asterixdb/asterix-client-helper/pom.xml: Line 51: cbashelper > That's a strange name. copy n' paste problems. Done. -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Till Westmann has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1142/1/asterixdb/asterix-client-helper/pom.xml File asterixdb/asterix-client-helper/pom.xml: Line 51: cbashelper That's a strange name. -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Jenkins has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/543/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Jenkins has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/543/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Jenkins has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 1: Integration-Tests-1 Integration Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/540/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Jenkins has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/540/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1142 Change subject: Start/Stop Sample Scripts for Windows .. Start/Stop Sample Scripts for Windows - Fix windows binaries (ncservice, cc, nc, helper) - Add windows start/stop sample cluster scripts Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 --- M .gitignore M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-client-helper/src/main/assembly/assembly.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml A asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat A asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat 7 files changed, 174 insertions(+), 11 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/42/1142/1 diff --git a/.gitignore b/.gitignore index 11d149b..ba4e894 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ invIndex* primaryBTree* -bin target .classpath .settings @@ -13,8 +12,6 @@ build asterixdb/asterix-opt asterixdb/asterix-app/src/test/resources/externallib -asterixdb/asterix-app/rttest -asterixdb/asterix-app/mdtest asterixdb/asterix-app/opttest asterixdb/asterix-app/parserts asterixdb/asterix-app/library @@ -51,4 +48,4 @@ .DS_Store *.swp .m2* -ß \ No newline at end of file +ß diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml index 7068cf6..e6d5684 100644 --- a/asterixdb/asterix-client-helper/pom.xml +++ b/asterixdb/asterix-client-helper/pom.xml @@ -29,7 +29,7 @@ org.codehaus.mojo appassembler-maven-plugin -1.3 +1.10 ${project.build.directory}/appassembler @@ -46,7 +46,15 @@ org.apache.asterix.clienthelper.AsterixHelper - + + + cbashelper + org.apache.asterix.clienthelper.AsterixHelper + +booter-windows + + + @@ -84,5 +92,10 @@ javax.servlet javax.servlet-api + + org.codehaus.mojo.appassembler + appassembler-booter + 1.10 + diff --git a/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml b/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml index 2e4e133..122ee38 100644 --- a/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml +++ b/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml @@ -34,5 +34,17 @@ bin 0755 + + target/generated-resources/appassembler/booter-windows/etc + etc + +*.xml + + + + target/generated-resources/appassembler/booter-windows/bin + bin + 0755 + diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 269c219..0897145 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -44,7 +44,7 @@ org.codehaus.mojo appassembler-maven-plugin -1.3 +1.10 ${project.build.directory}/appassembler @@ -235,7 +235,7 @@ org.codehaus.mojo.appassembler appassembler-booter - 1.3.1 + 1.10 org.apache.asterix diff --git a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml index 0c82f41..19f0034 100644 --- a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml +++ b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml @@ -69,10 +69,9 @@ target/generated-resources/appassembler/booter-windows/etc - bin + etc -asterixcc.xml -asterixnc.xml +*.xml diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat b/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat new file mode 100644 index 000..4d10261 --- /dev/null +++ b/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat @@ -0,0 +1,83 @@ +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software