From d7415ded6d6fcd3720296bfd18e769169216550d Mon Sep 17 00:00:00 2001 From: Tglman Date: Wed, 7 Feb 2024 12:26:25 +0100 Subject: [PATCH 1/2] fix: re-enabled generation of demo database in distribution --- distribution/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 863e5c9aac1..8a78a8cafcb 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -106,7 +106,6 @@ - - org.apache.maven.plugins maven-assembly-plugin From c8468521c61a67ebc2224e3ce1aa060476d1a82a Mon Sep 17 00:00:00 2001 From: Tglman Date: Wed, 7 Feb 2024 12:56:25 +0100 Subject: [PATCH 2/2] chore: removed distribution not supported anymore --- distribution-tp2/.mvn/jvm.config | 1 - distribution-tp2/pom.xml | 270 ------------------ distribution-tp2/script/console.bat | 51 ---- distribution-tp2/script/console.sh | 47 --- distribution-tp2/script/gremlin.bat | 83 ------ distribution-tp2/script/stresstester.bat | 43 --- distribution-tp2/script/stresstester.sh | 33 --- .../src/main/assembly/archive.xml | 58 ---- pom.xml | 1 - 9 files changed, 587 deletions(-) delete mode 100755 distribution-tp2/.mvn/jvm.config delete mode 100755 distribution-tp2/pom.xml delete mode 100755 distribution-tp2/script/console.bat delete mode 100755 distribution-tp2/script/console.sh delete mode 100644 distribution-tp2/script/gremlin.bat delete mode 100755 distribution-tp2/script/stresstester.bat delete mode 100755 distribution-tp2/script/stresstester.sh delete mode 100755 distribution-tp2/src/main/assembly/archive.xml diff --git a/distribution-tp2/.mvn/jvm.config b/distribution-tp2/.mvn/jvm.config deleted file mode 100755 index 9b109f3737b..00000000000 --- a/distribution-tp2/.mvn/jvm.config +++ /dev/null @@ -1 +0,0 @@ --Xmx1024m \ No newline at end of file diff --git a/distribution-tp2/pom.xml b/distribution-tp2/pom.xml deleted file mode 100755 index 7e2a2b4072f..00000000000 --- a/distribution-tp2/pom.xml +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - 4.0.0 - - - com.orientechnologies - orientdb-parent - 4.0.0-SNAPSHOT - ../ - - - orientdb-community-tp2 - - OrientDB Community Distribution Tinker Pop 2 - - - ${project.version} - ${implementation.build}; ${maven.build.timestamp} - UTF-8 - - - - - com.orientechnologies - orientdb-test-commons - ${project.version} - test - - - - - com.orientechnologies - orientdb-client - ${project.version} - - - - com.orientechnologies - orientdb-core - ${project.version} - - - - com.orientechnologies - orientdb-server - ${project.version} - - - - com.orientechnologies - orientdb-object - ${project.version} - - - - com.orientechnologies - orientdb-tools - ${project.version} - - - com.orientechnologies - orientdb-distributed - ${project.version} - - - com.orientechnologies - orientdb-etl - ${project.version} - - - com.orientechnologies - orientdb-lucene - ${project.version} - - - com.orientechnologies - orientdb-jdbc - ${project.version} - - - com.orientechnologies - orientdb-studio - ${project.version} - zip - - - - com.orientechnologies - orientdb-graphdb - ${project.version} - - - - - com.tinkerpop.rexster - rexster-core - ${blueprints.version} - - - com.tinkerpop.gremlin - gremlin-java - ${blueprints.version} - - - com.tinkerpop.gremlin - gremlin-groovy - ${blueprints.version} - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.6.1 - - - unzip-community - generate-sources - - unpack - - - ${project.build.directory} - true - - - com.orientechnologies - orientdb-community - ${project.parent.version} - true - zip - - - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - distribution-package - package - - single - - - false - - ${basedir}/src/main/assembly/archive.xml - - - - - false - posix - - - - - - - - - - java8 - - 1.8 - - - UTF-8 - -Xmx${heapSize} -Xms${heapSize} -XX:MaxDirectMemorySize=512g - -Dstorage.diskCache.bufferSize=4096 - -Dmemory.directMemory.preallocate=false - - - - - java11 - - [11,) - - - UTF-8 - -Xmx${heapSize} -Xms${heapSize} -XX:MaxDirectMemorySize=512g - -Dstorage.diskCache.bufferSize=4096 - --add-opens jdk.unsupported/sun.misc=ALL-UNNAMED --add-opens java.base/sun.security.x509=ALL-UNNAMED - -Dmemory.directMemory.preallocate=false - - - - - - qa - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - maven-antrun-plugin - 3.1 - - - start-orient - pre-integration-test - - run - - - - - - - - - - - - stop-orient - post-integration-test - - run - - - - - - - - - - - - - - - - - - - diff --git a/distribution-tp2/script/console.bat b/distribution-tp2/script/console.bat deleted file mode 100755 index 2e3881c0e69..00000000000 --- a/distribution-tp2/script/console.bat +++ /dev/null @@ -1,51 +0,0 @@ -@echo off -rem -rem Copyright (c) Orient Technologies LTD (http://www.orientechnologies.com) -rem -rem Guess ORIENTDB_HOME if not defined -set CURRENT_DIR=%cd% - -if exist "%JAVA_HOME%\bin\java.exe" goto setJavaHome -set JAVA="java" -goto okJava - -:setJavaHome -set JAVA="%JAVA_HOME%\bin\java" - -:okJava -if not "%ORIENTDB_HOME%" == "" goto gotHome -set ORIENTDB_HOME=%CURRENT_DIR% -if exist "%ORIENTDB_HOME%\bin\console.bat" goto okHome -cd .. -set ORIENTDB_HOME=%cd% -cd %CURRENT_DIR% - -:gotHome -if exist "%ORIENTDB_HOME%\bin\console.bat" goto okHome -echo The ORIENTDB_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -goto end - -:okHome -rem Get remaining unshifted command line arguments and save them in the -set CMD_LINE_ARGS= - -:setArgs -if ""%1""=="""" goto doneSetArgs -set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 -shift -goto setArgs - -:doneSetArgs - -set KEYSTORE=%ORIENTDB_HOME%\config\cert\orientdb-console.ks -set KEYSTORE_PASS=password -set TRUSTSTORE=%ORIENTDB_HOME%\config\cert\orientdb-console.ts -set TRUSTSTORE_PASS=password -set SSL_OPTS="-Dclient.ssl.enabled=false -Djavax.net.ssl.keyStore=%KEYSTORE% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASS% -Djavax.net.ssl.trustStore=%TRUSTSTORE% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASS%" - - -set ORIENTDB_SETTINGS=-Xmx512m -Djava.util.logging.config.file="%ORIENTDB_HOME%\config\orientdb-client-log.properties" -Djava.awt.headless=true -call %JAVA% -client %SSL_OPTS% %ORIENTDB_SETTINGS% -Dfile.encoding=utf-8 -Dorientdb.build.number="@BUILD@" -cp "%ORIENTDB_HOME%\lib\*;%ORIENTDB_HOME%\plugins\*" com.orientechnologies.orient.graph.console.OGremlinConsole %CMD_LINE_ARGS% - -:end diff --git a/distribution-tp2/script/console.sh b/distribution-tp2/script/console.sh deleted file mode 100755 index d951bf38b05..00000000000 --- a/distribution-tp2/script/console.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Copyright (c) Orient Technologies LTD (http://www.orientechnologies.com) -# - -# resolve links - $0 may be a softlink -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# Only set ORIENTDB_HOME if not already set -[ -f "$ORIENTDB_HOME"/lib/orientdb-tools-@VERSION@.jar ] || ORIENTDB_HOME=`cd "$PRGDIR/.." ; pwd` -export ORIENTDB_HOME - - -# Set JavaHome if it exists -if [ -f "${JAVA_HOME}/bin/java" ]; then - JAVA=${JAVA_HOME}/bin/java -else - JAVA=java -fi -export JAVA - -ORIENTDB_SETTINGS="-Djava.util.logging.config.file=\"$ORIENTDB_HOME/config/orientdb-client-log.properties\" -Djava.awt.headless=true" -#JAVA_OPTS=-Xmx1024m -KEYSTORE="$ORIENTDB_HOME/config/cert/orientdb-console.ks" -KEYSTORE_PASS=password -TRUSTSTORE="$ORIENTDB_HOME/config/cert/orientdb-console.ts" -TRUSTSTORE_PASS=password -SSL_OPTS="-Xmx512m -Dclient.ssl.enabled=false " - -exec "$JAVA" -client $JAVA_OPTS $ORIENTDB_SETTINGS $SSL_OPTS \ - -Dfile.encoding=utf-8 -Dorientdb.build.number="@BUILD@" \ - -cp "$ORIENTDB_HOME/lib/orientdb-tools-@VERSION@.jar:$ORIENTDB_HOME/lib/*:$ORIENTDB_HOME/plugins/*" \ - "-Djavax.net.ssl.keyStore=$KEYSTORE" "-Djavax.net.ssl.keyStorePassword=$KEYSTORE_PASS" "-Djavax.net.ssl.trustStore=$TRUSTSTORE" "-Djavax.net.ssl.trustStorePassword=$TRUSTSTORE_PASS" \ - com.orientechnologies.orient.graph.console.OGremlinConsole $* diff --git a/distribution-tp2/script/gremlin.bat b/distribution-tp2/script/gremlin.bat deleted file mode 100644 index 5e089c11e10..00000000000 --- a/distribution-tp2/script/gremlin.bat +++ /dev/null @@ -1,83 +0,0 @@ -:: Windows launcher script for Gremlin - -@echo off - -set LIBDIR=..\lib -set PLUGINDIR=..\plugins - - -set CP= -for %%i in (%LIBDIR%\*.jar) do call :concatsep %%i - -set JAVA_OPTIONS=-Xms32M -Xmx512M - -:: Launch the application - -if "%1" == "" goto console - -if "%1" == "-e" goto script - -if "%1" == "-v" goto version - - - -:console - -java %JAVA_OPTIONS% %JAVA_ARGS% -cp %CP%;%PLUGINDIR%\* com.tinkerpop.gremlin.groovy.console.Console - -goto :eof - - - -:script - - -set strg= - - -FOR %%X IN (%*) DO ( - -CALL :concat %%X %1 %2 - -) - - - - -java %JAVA_OPTIONS% %ORIENTDB_SETTINGS% %JAVA_ARGS% -cp %CP% com.tinkerpop.gremlin.groovy.jsr223.ScriptExecutor %strg% - -goto :eof - - - -:version - -java %JAVA_OPTIONS% %ORIENTDB_SETTINGS% %JAVA_ARGS% -cp %CP% com.tinkerpop.gremlin.Version - -goto :eof - - - -:concat - -if %1 == %2 goto skip - -SET strg=%strg% %1 - - - -:concatsep - -if "%CP%" == "" ( - -set CP=%LIBDIR%\%1 - -)else ( - -set CP=%CP%;%LIBDIR%\%1 - -) - - - -:skip diff --git a/distribution-tp2/script/stresstester.bat b/distribution-tp2/script/stresstester.bat deleted file mode 100755 index 2c5f5f78022..00000000000 --- a/distribution-tp2/script/stresstester.bat +++ /dev/null @@ -1,43 +0,0 @@ -@echo off -rem -rem Copyright (c) Orient Technologies LTD (http://www.orientechnologies.com) -rem -rem Guess ORIENTDB_HOME if not defined -set CURRENT_DIR=%cd% - -if exist "%JAVA_HOME%\bin\java.exe" goto setJavaHome -set JAVA="java" -goto okJava - -:setJavaHome -set JAVA="%JAVA_HOME%\bin\java" - -:okJava -if not "%ORIENTDB_HOME%" == "" goto gotHome -set ORIENTDB_HOME=%CURRENT_DIR% -if exist "%ORIENTDB_HOME%\bin\stresstester.bat" goto okHome -cd .. -set ORIENTDB_HOME=%cd% -cd %CURRENT_DIR% - -:gotHome -if exist "%ORIENTDB_HOME%\bin\stresstester.bat" goto okHome -echo The ORIENTDB_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -goto end - -:okHome -rem Get remaining unshifted command line arguments and save them in the -set CMD_LINE_ARGS= - -:setArgs -if ""%1""=="""" goto doneSetArgs -set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 -shift -goto setArgs - -:doneSetArgs - -call %JAVA% -client -cp "%ORIENTDB_HOME%\lib\*;%ORIENTDB_HOME%\plugins\*" com.orientechnologies.orient.stresstest.OStressTester %CMD_LINE_ARGS% - -:end diff --git a/distribution-tp2/script/stresstester.sh b/distribution-tp2/script/stresstester.sh deleted file mode 100755 index 163a7b73159..00000000000 --- a/distribution-tp2/script/stresstester.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -# resolve links - $0 may be a softlink -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# Only set ORIENTDB_HOME if not already set -[ -f "$ORIENTDB_HOME"/lib/orientdb-tools-@VERSION@.jar ] || ORIENTDB_HOME=`cd "$PRGDIR/.." ; pwd` -export ORIENTDB_HOME - - -# Set JavaHome if it exists -if [ -f "${JAVA_HOME}/bin/java" ]; then - JAVA=${JAVA_HOME}/bin/java -else - JAVA=java -fi -export JAVA - -exec "$JAVA" -cp "$ORIENTDB_HOME/lib/*" \ - com.orientechnologies.orient.stresstest.OStressTester $* diff --git a/distribution-tp2/src/main/assembly/archive.xml b/distribution-tp2/src/main/assembly/archive.xml deleted file mode 100755 index 494e45636ad..00000000000 --- a/distribution-tp2/src/main/assembly/archive.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - distribution - - - dir - tar.gz - zip - - - - - - - - ${basedir}/script - bin - - *.bat - - 644 - true - - - ${basedir}/script - bin - - *.sh - - 755 - true - - - - - ${project.build.directory}/orientdb-community-${project.version} - - - - - - - lib - - *:jar:* - - - - - - diff --git a/pom.xml b/pom.xml index a16bfa8776c..2bb53c598b2 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,6 @@ jdbc etl distribution - distribution-tp2