From 38088659c9ca72411f34106bd2e4e652870dde66 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 23 Dec 2022 21:24:59 -0600 Subject: [PATCH] remove previous "nb" module, which will be replaced by the nb5 module soon --- nb/.gitignore | 1 - nb/appimage/skel/nb.desktop | 12 -- nb/appimage/skel/nb.png | Bin 1317 -> 0 bytes nb/appimage/skel/usr/bin/nb | 35 ----- nb/assembly.xml | 26 ---- nb/build-bin.sh | 81 ----------- nb/gendocs.sh | 65 --------- nb/nb-scripts/link-jar-name.sh | 34 ----- nb/pom.xml | 243 --------------------------------- 9 files changed, 497 deletions(-) delete mode 100644 nb/.gitignore delete mode 100644 nb/appimage/skel/nb.desktop delete mode 100644 nb/appimage/skel/nb.png delete mode 100755 nb/appimage/skel/usr/bin/nb delete mode 100644 nb/assembly.xml delete mode 100755 nb/build-bin.sh delete mode 100755 nb/gendocs.sh delete mode 100755 nb/nb-scripts/link-jar-name.sh delete mode 100644 nb/pom.xml diff --git a/nb/.gitignore b/nb/.gitignore deleted file mode 100644 index 663efc108..000000000 --- a/nb/.gitignore +++ /dev/null @@ -1 +0,0 @@ -cache/** diff --git a/nb/appimage/skel/nb.desktop b/nb/appimage/skel/nb.desktop deleted file mode 100644 index a99914dbb..000000000 --- a/nb/appimage/skel/nb.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=nosqlbench -Exec=nb %F -Icon=nb -Type=Application -Categories=Development;Network;Utility;Science; -Comment=nosqlbench -MimeType=text/yaml;application/yaml; -Name[nb]=nb -Terminal=false -StartupNotify=true -NoDisplay=false diff --git a/nb/appimage/skel/nb.png b/nb/appimage/skel/nb.png deleted file mode 100644 index 71938db3e124c83b5fa7c9fa57d6d56b0f020b86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1317 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zFkJy*MxoZ;gFr#a64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq<{u3@^oyj?=#S zk7j992#CZ4gv10q?&|SA1Q`IU#4hF@L1?)%>bGbC56s|tR9 zKXiTE{&nn=R6OD6suk}I4jIAS3cjX-yBTWNu%QB81qBEGwwoTvLQm}{b z&FU3BTg~33HzfY`-m&BjOP%5z+cL)cjPDuir);@@OY*z%fen33*S1g3`_0)nT}QJ!m68_#4Dt4ggp8mtC_$4QzUl`ON`WR1y@6c!z+t#Yl<^ZumGbS zR_qCK781J!Y;}(4IRw7CH{<51Q{P|R)niyEQ5gT8K|eJjU;cx{29rnsLKaj@{FVEE z@|1ThbLl%y8=)DecDze*{B3Rccvrp9uF1#aV)Yr_h5b&Zr^VC@S(F{A{pbA6?6^&V z`iDmyzeD)93+=yMe!<8;WAO@>e1ZKkmC>8a;mUCZwq*>=qT z@OIvf_cv~wz8rh}+1WYk|IhodGDGk0rBbe+_BvK}kE?^*S&z}=Sj49niNtlPg? z?sVVR1Dg-DR>p;VZJ6M9w4Uz{`<%Fs|7PdOe&Dfm3J7Ib^W)VMF2|dX8Lu&HXEuM3 zxzFo$!*Y(?ru)CwMx-(LvE5@eo3f){?WWIF}{i3=K~*2FX1W7-xT zDsc3oK7;N9t3$`TvQ{{jGkPEBm1sJ4sz^G6LrN#xzCkf#g^jGE_W|D@JpbHI-WJ~B zQ8A@U>d?9eMU|C(egzY8X~Gp60r@k1MQ%VH-35miqfWj4N#Q89R*`upn(? zhGL5von@{Mo;zw!{W)dBdQSe?cFK=`MSE<2Ucgq-ayVUiZ}XeW&q}iy`Gw^U#O~04 z@%O-^-EKGDWj(lRcRTNu5%Zkwhd$mgeDZBtBfGIo{(`vN2IiKZ_3_=Y6S!)bW4vc* zF6GdDp!i_h8hr^hhQIp^ZC-8f+K`&K%?W{?z$uo#>YGx@V`_AKqd(&shKQ z|4B8mhVZrdop2L^3ajJb&A%El4_y$cU=kz3I=!yF-ax!&R_O!KB;7vpX^z{B8|b*)z4*}Q$iB}Dm6O> diff --git a/nb/appimage/skel/usr/bin/nb b/nb/appimage/skel/usr/bin/nb deleted file mode 100755 index 20736d4b2..000000000 --- a/nb/appimage/skel/usr/bin/nb +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -#set -x -DIR="$(dirname "$(readlink -f "$0")")" -if [ "$1" = "--wrapper-help" ] -then - echo "OPTIONS:" - echo " # run the bundled JRE with -version" - echo " --java-version" - echo " # run the app with JDWP debugging support, with suspend=n" - echo " --DN" - echo " # run the app with JDWP debugging support, with suspend=y" - echo " --DY" - echo " # set additional JRE options ..." - echo " JAVA_OPTS=... $0 ..." - exit 0 -fi - -if [ "$1" = "--java-version" ] -then - shift - $DIR/jre/bin/java -version - exit -fi - -if [ "$1" = "-DN" ] -then - shift - exec $DIR/jre/bin/java -Dnashorn.args="--no-deprecation-warning" ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar $DIR/nb.jar "$@" -elif [ "$1" = "-DY" ] -then - shift - exec $DIR/jre/bin/java -Dnashorn.args="--no-deprecation-warning" ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005 -jar $DIR/nb.jar "$@" -else - exec $DIR/jre/bin/java -Dnashorn.args="--no-deprecation-warning" ${JAVA_OPTS} -jar $DIR/nb.jar "$@" -fi diff --git a/nb/assembly.xml b/nb/assembly.xml deleted file mode 100644 index 021daeab0..000000000 --- a/nb/assembly.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - jar-with-dependencies - - jar - - false - - - - / - true - true - runtime - - - - - - metaInf-services - - - - diff --git a/nb/build-bin.sh b/nb/build-bin.sh deleted file mode 100755 index 11ce5f715..000000000 --- a/nb/build-bin.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -x - -APPDIR=target/NB.AppDir -mkdir -p ${APPDIR} - - -BUILD_OPENJ9="false" -if [ "$1" = "--with-openj9" ] -then - BUILD_OPENJ9="true" - printf "using openj9 for build\n" - shift; -fi - -if [ ! -f target/nb.jar ] -then - printf "target/nb.jar does not exist" - exit 2 -fi - -#if [ -x "target/nb" ] -#then -# printf "Removing stale target/nb...\n" -# rm target/nb -#fi - -rsync -av appimage/skel/ "${APPDIR}/" -cp target/nb.jar "${APPDIR}/usr/bin/nb.jar" -JAVA_VERSION="17" - -mkdir -p "${APPDIR}/usr/bin/jre" - - -if [ "$JAVA_VERSION" == "17" ] -then - if [ ! -d "cache/jdk17" ] ; then - printf "getting jdk17 once into cache/jdk17\n"; - mkdir -p cache - (cd cache && ( - wget -c https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz - tar -xf OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz - mv jdk-17.0.1+12 jdk17 - rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz - )) - fi - rsync -av cache/jdk17/ "${APPDIR}/usr/bin/jre/" -else - printf "Unknown java version indicated in $0" - exit 2 -fi - -if [ ! -f "${APPDIR}/AppRun" ] - then - ( cd ${APPDIR} && ( - printf "Linking AppRun...\n"; - ln -s usr/bin/nb AppRun - )) -fi - -printf "getting appimage tool and building image...\n"; - -( cd target && ( - if [ ! -x "appimagetool-x86_64.AppImage" ] - then - wget -c https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage - chmod +x appimagetool-x86_64.AppImage - fi - - ARCH=x86_64 ./appimagetool-x86_64.AppImage NB.AppDir nb - # && chmod +x nb - ) -) - -if [ -x "target/nb" ] -then - printf "nosqlbench AppImage binary was built at target/nb\n"; -fi - diff --git a/nb/gendocs.sh b/nb/gendocs.sh deleted file mode 100755 index f67204317..000000000 --- a/nb/gendocs.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# update nuxt -set -x -set -e - -GUIDEBOOK="target/guidebook" - -if [ ! -f "target/nb.jar" ] -then - printf "You should not run this unless you have target/nb.jar\n" - exit 6 -fi - -if [ ! -d "target/guidebook" ] -then - -# pushd ../docsys/src/main/node/docsys || exit 1 -# if ! ./update.sh "$@" -# then -# printf "Unable to update the guidebook static app\n" -# exit 2; -# fi -# popd - cp -R ../docsys/src/main/resources/docsys-guidebook/ ${GUIDEBOOK}/ -else - printf "${GUIDEBOOK} exists, not building again until mvn clean\n" -fi - -JAVA=java -if [ -n "$JAVA_HOME" ] -then JAVA=${JAVA_HOME}/bin/java -fi - -if [ ! -x "$JAVA" ] -then - printf "Java was not found in the path and JAVA_HOME is not set\n" - exit 5 -fi - -$JAVA -jar target/nb.jar docserver generate ${GUIDEBOOK}/ - -$JAVA -jar target/nb.jar virtdata gendocs basedir ${GUIDEBOOK}/services/docs/bindings - -driversdir="${GUIDEBOOK}/services/docs/drivers" -mkdir -p $driversdir - -drivers=$($JAVA -jar target/nb.jar --list-drivers) -for driver in $drivers -do - echo "driver: $driver" - targetmd="${driversdir}/${driver}.md" - echo "targetmd: $targetmd" - printf -- "---\ntitle: driver - $driver\nweight: 50\n---\n" > $targetmd - printf -- "drivers/${driver}.md\n" >> ${GUIDEBOOK}/services/docs/markdown.csv - $JAVA -jar target/nb.jar help $driver >> $targetmd -done -( - cd ${GUIDEBOOK}/services/docs; - find * -type f -name '*.md' | sort > markdown.csv -) - -#JAVA_HOME=${JAVA_HOME:-JAVA_HOME must be specified if java isn not in the path} -# -## static site for gh pages -#java -jar nb/target/nb.jar docserver generate ${GUIDEBOOK}/ diff --git a/nb/nb-scripts/link-jar-name.sh b/nb/nb-scripts/link-jar-name.sh deleted file mode 100755 index bcb8fe7e0..000000000 --- a/nb/nb-scripts/link-jar-name.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -set -e -set -x - -NBJAR_VERSION=${NBJAR_VERSION:?NBJAR_VERSION must be specified} -echo "NBJAR_VERSION: ${NBJAR_VERSION}" - - - -cd target -if [ -e "nb.jar" ] -then - echo "nb.jar link exists, skipping" - exit 0 -fi - -for qualifier in jar-with-dependencies -do - JARNAME="nb-${NBJAR_VERSION}-${qualifier}.jar" - if [ -e "$JARNAME" ] - then - echo "linking $JARNAME to nb.jar" - ln -s $JARNAME nb.jar - echo "linked $JARNAME to nb.jar, exiting" - exit 0 - else - echo "$JARNAME does not exist, skipping" - fi -done - - -echo "Unable to find any jar to link to nb.jar name.." -exit 2 - diff --git a/nb/pom.xml b/nb/pom.xml deleted file mode 100644 index 43e93653e..000000000 --- a/nb/pom.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - 4.0.0 - - - - mvn-defaults - io.nosqlbench - 4.17.22-SNAPSHOT - ../mvn-defaults - - - nb - jar - ${project.artifactId} - CLI for nosqlbench. - - - UTF-8 - nosqlbench Command Line - - - - - - io.nosqlbench - nbr - 4.17.22-SNAPSHOT - - - - io.nosqlbench - adapter-stdout - 4.17.22-SNAPSHOT - - - - io.nosqlbench - adapter-diag - 4.17.22-SNAPSHOT - - - - io.nosqlbench - adapter-dynamodb - 4.17.22-SNAPSHOT - - - - io.nosqlbench - adapter-cqld4 - 4.17.22-SNAPSHOT - - - - io.nosqlbench - adapter-pulsar - 4.17.22-SNAPSHOT - - - - - - - - - - - - - - io.nosqlbench - driver-jmx - 4.17.22-SNAPSHOT - - - - io.nosqlbench - driver-pulsar - 4.17.22-SNAPSHOT - - - - io.nosqlbench - driver-cockroachdb - 4.17.22-SNAPSHOT - - - - - - - - - src/main/resources - true - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - assembly.xml - - - - io.nosqlbench.engine.cli.NBCLI - - - true - - - - - - assemble-nb - package - - single - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - link-nb-jar-name - package - - exec - - - - ${project.version} - - ${project.basedir} - ${project.basedir}/nb-scripts/link-jar-name.sh - - - - - - - - - - with-mongodb - - true - - - - io.nosqlbench - driver-mongodb - 4.17.22-SNAPSHOT - - - - - build-nb-appimage - - - unix - linux - amd64 - - - - - - org.codehaus.mojo - exec-maven-plugin - - - build-nb-appimage - package - - exec - - - ${project.basedir} - ${project.basedir}/build-bin.sh - - - - - - - - - enforce - - false - - - - - - - - enforce - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - - - - - - - - - - - - -