project restructuring

This commit is contained in:
Jonathan Shook
2024-04-11 22:50:13 -05:00
parent 7810178f0c
commit 4358344029
2892 changed files with 1134 additions and 821 deletions

1
nb5/.gitignore vendored
View File

@@ -1 +0,0 @@
cache/**

View File

@@ -1,42 +0,0 @@
<!--
~ Copyright (c) 2022 nosqlbench
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>jar-with-dependencies</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
<containerDescriptorHandlers>
<containerDescriptorHandler>
<handlerName>metaInf-services</handlerName>
</containerDescriptorHandler>
</containerDescriptorHandlers>
</assembly>

View File

@@ -34,7 +34,7 @@ then
exit 2
fi
rsync -av appimage/skel/ "${APPDIR}/"
rsync -av nb-appimage/skel/ "${APPDIR}/"
cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
mkdir -p "${APPDIR}/usr/bin/jre"

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (c) 2022 nosqlbench
# Copyright (c) 2022-2024 nosqlbench
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ do
fi
done
echo "Unable to find any jar to link to ${JAR_NAME} name.."
exit 2

View File

@@ -34,92 +34,26 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javadoc.name>nosqlbench Command Line</javadoc.name>
<javadoc.name>nb5</javadoc.name>
</properties>
<dependencies>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nbr</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-adapters-included</artifactId>
<version>${revision}</version>
</dependency>
<!-- Everything below this line is in common between nb and nb5 -->
<!-- The nb5 modules should contain NO driver-* modules, and all adapter-* modules -->
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-diag</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-stdout</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-cqld4</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-dynamodb</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-http</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-tcp</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-pulsar</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-kafka</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-amqp</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-jdbc</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-mongodb</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-aws-opensearch</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapter-s4j</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
<build>
<resources>
<resource>
@@ -172,11 +106,12 @@
<NBJAR_VERSION>${project.version}</NBJAR_VERSION>
</environmentVariables>
<basedir>${project.basedir}</basedir>
<executable>${project.basedir}/nb-scripts/link-jar-name.sh</executable>
<executable>${project.basedir}/nb5-scripts/link-jar-name.sh</executable>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
@@ -204,7 +139,7 @@
</goals>
<configuration>
<basedir>${project.basedir}</basedir>
<executable>${project.basedir}/build-bin.sh</executable>
<executable>${project.basedir}/nb-appimage/build-bin.sh</executable>
</configuration>
</execution>
</executions>
@@ -213,13 +148,13 @@
</build>
</profile>
<profile>
<id>enforce</id>
<id>converge-nb5</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<executions>
<execution>
@@ -239,242 +174,6 @@
</plugins>
</build>
</profile>
<!-- <profile>-->
<!-- <id>build-adapter-cqld4</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>build-adapter-cqld4</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-cqld4</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-milvus</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-milvus</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-milvus</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-dynamodb</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-dynamodb</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-dynamodb</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-http</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-http</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-http</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-tcp</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-tcp</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-tcp</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-pulsar</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-pulsar</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-pulsar</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-kafka</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-kafka</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-kafka</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-amqp</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-amqp</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-amqp</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-jdbc</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-jdbc</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-jdbc</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-mongodb</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-mongodb</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-mongodb</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-aws-opensearch</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-aws-opensearch</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-aws-opensearch</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>build-adapter-s4j</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>adapter-s4j</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-s4j</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-dynamodb</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-http</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-tcp</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-pulsar</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-kafka</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-amqp</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-jdbc</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-mongodb</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-aws-opensearch</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.nosqlbench</groupId>-->
<!-- <artifactId>adapter-s4j</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
</profiles>
</project>