restructuring

README.md

@@ -8,12 +8,19 @@ This is in active development. Collaborators are welcome. However, there is stil
 
 NoSQLBench is a large project. It has lots of advanced functionality built-in that you won't find in any other performance testing tool.
 
-The modules are named in a consistent way. The naming conventions are as follows:
+To make it easier to find the module you are looking for (for developers),
+the following strict naming conventions have been adopted:
+
+- All original packages of this project start with `io.nosqlbench`.
+- All original packages within each module are based directly on the above root package and the module name together. For example, the 'engine-api' module contains packages in `io.nosqlbench.engine.api`.
+
+The procedural generation support that has been imported from the VirtualDataSet project now lives in virtdata-* modules.
+The core runtime that used to be called EngineBlock now lives in engine-* modules.
+
+The binary packaging support for Linux (with AppImage) is contained in the nb module. It provides a binary `nb` which is the main command-line artifact from this project.
+
+The defaults that are used by all modules are contained in the mvn-defaults module.
 
-- All virtdata-... modules are the procedural generation system.
-- All virtdata-lib-... modules are function libraries for mapping coordinates to virtual data.
-- All nb-... modules are part of the nosqlbench runtime engine.
-- The main module that users interact with comes from the `nb` project. The binary is simply named `nb`, and the executable jar is `nb.jar`.
 
 ## System Compatibility
 

activitytype-diag/pom.xml

@@ -3,13 +3,13 @@
 
 
     <parent>
-        <artifactId>nb-defaults</artifactId>
+        <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
         <version>2.12.66-SNAPSHOT</version>
-        <relativePath>../nb-defaults</relativePath>
+        <relativePath>../mvn-defaults</relativePath>
     </parent>
 
-    <artifactId>at-diag</artifactId>
+    <artifactId>activitytype-diag</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>A nosqlbench ActivityType (AT) driver module;
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <artifactId>nb-api</artifactId>
+            <artifactId>engine-api</artifactId>
             <version>2.12.66-SNAPSHOT</version>
         </dependency>
 

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java

@@ -14,16 +14,16 @@
  *    limitations under the License.
  * /
  */
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
-import io.nosqlbench.activityapi.core.BaseAsyncAction;
-import io.nosqlbench.activityapi.core.ops.fluent.opfacets.CompletedOp;
-import io.nosqlbench.activityapi.core.ops.fluent.opfacets.StartedOp;
-import io.nosqlbench.activityapi.core.ops.fluent.opfacets.TrackedOp;
-import io.nosqlbench.activityapi.cyclelog.buffers.op_output.StrideOutputConsumer;
-import io.nosqlbench.activityapi.ratelimits.RateLimiter;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.nosqlbench.activityimpl.ParameterMap;
+import io.nosqlbench.engine.api.activityapi.core.BaseAsyncAction;
+import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.CompletedOp;
+import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp;
+import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
+import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.op_output.StrideOutputConsumer;
+import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityimpl.ParameterMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java

@@ -12,14 +12,14 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
 import com.codahale.metrics.Timer;
-import io.nosqlbench.activityapi.core.ActivityDefObserver;
-import io.nosqlbench.activityapi.core.MultiPhaseAction;
-import io.nosqlbench.activityapi.core.SyncAction;
-import io.nosqlbench.activityapi.ratelimits.RateLimiter;
-import io.nosqlbench.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
+import io.nosqlbench.engine.api.activityapi.core.MultiPhaseAction;
+import io.nosqlbench.engine.api.activityapi.core.SyncAction;
+import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java

@@ -12,10 +12,10 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 import org.slf4j.Logger;
 
 import static org.slf4j.LoggerFactory.getLogger;

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java

@@ -12,19 +12,19 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Histogram;
-import io.nosqlbench.activityapi.core.Activity;
-import io.nosqlbench.activityapi.core.ActivityDefObserver;
-import io.nosqlbench.activityapi.ratelimits.RateLimiter;
-import io.nosqlbench.activityapi.ratelimits.RateLimiters;
-import io.nosqlbench.activityapi.ratelimits.RateSpec;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.nosqlbench.activityimpl.SimpleActivity;
-import io.nosqlbench.metrics.ActivityMetrics;
-import io.virtdata.core.VirtData;
+import io.nosqlbench.engine.api.activityapi.core.Activity;
+import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
+import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter;
+import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters;
+import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
+import io.nosqlbench.engine.api.metrics.ActivityMetrics;
+import io.nosqlbench.virtdata.api.VirtData;
 
 import java.util.function.LongToIntFunction;
 import java.util.function.LongUnaryOperator;

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java

@@ -13,12 +13,12 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityapi.core.ActivityType;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.virtdata.annotations.Service;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.ActivityType;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.virtdata.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagDummyError.java

@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
 public class DiagDummyError extends RuntimeException {
     public DiagDummyError(String s) {

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagOpData.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
 import java.util.ArrayList;
 import java.util.List;

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagResult.java

@@ -0,0 +1,4 @@
+package io.nosqlbench.activitytype.diag;
+
+public class DiagResult {
+}

activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java

@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -0,0 +1,2 @@
+io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
+io.nosqlbench.virtdata.processors.ServiceProcessor

activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java

@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityapi.core.SyncAction;
-import io.nosqlbench.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.SyncAction;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.testng.annotations.Test;
 
 /*

activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java

@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.diag;
+package io.nosqlbench.activitytype.diag;
 
 import org.junit.Test;
 

activitytype-http/pom.xml

@@ -3,13 +3,13 @@
 
 
     <parent>
-        <artifactId>nb-defaults</artifactId>
+        <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
         <version>2.12.66-SNAPSHOT</version>
-        <relativePath>../nb-defaults</relativePath>
+        <relativePath>../mvn-defaults</relativePath>
     </parent>
 
-    <artifactId>at-http</artifactId>
+    <artifactId>activitytype-http</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>
@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <artifactId>nb-api</artifactId>
+            <artifactId>engine-api</artifactId>
             <version>2.12.66-SNAPSHOT</version>
         </dependency>
 

activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java

@@ -1,10 +1,10 @@
-package io.nosqlbench.activitytypes.http;
+package io.nosqlbench.activitytype.http;
 
 import com.codahale.metrics.Timer;
-import io.nosqlbench.activityapi.core.SyncAction;
-import io.nosqlbench.activityapi.planning.OpSequence;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.virtdata.templates.StringBindings;
+import io.nosqlbench.engine.api.activityapi.core.SyncAction;
+import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.virtdata.api.templates.StringBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActionDispenser.java

@@ -1,7 +1,7 @@
-package io.nosqlbench.activitytypes.http;
+package io.nosqlbench.activitytype.http;
 
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
 
 public class HttpActionDispenser implements ActionDispenser {
     private HttpActivity httpActivity;

activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java

@@ -1,23 +1,23 @@
-package io.nosqlbench.activitytypes.http;
+package io.nosqlbench.activitytype.http;
 
-import activityconfig.ParsedStmt;
-import activityconfig.StatementsLoader;
-import activityconfig.yaml.StmtDef;
-import activityconfig.yaml.StmtsDocList;
+import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
+import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
+import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
+import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
-import io.nosqlbench.activityapi.core.Activity;
-import io.nosqlbench.activityapi.core.ActivityDefObserver;
-import io.nosqlbench.activityapi.planning.OpSequence;
-import io.nosqlbench.activityapi.planning.SequencePlanner;
-import io.nosqlbench.activityapi.planning.SequencerType;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.nosqlbench.activityimpl.SimpleActivity;
-import io.nosqlbench.metrics.ActivityMetrics;
-import io.virtdata.core.BindingsTemplate;
-import io.virtdata.templates.StringBindings;
-import io.virtdata.templates.StringBindingsTemplate;
+import io.nosqlbench.engine.api.activityapi.core.Activity;
+import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
+import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
+import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner;
+import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
+import io.nosqlbench.engine.api.metrics.ActivityMetrics;
+import io.nosqlbench.virtdata.api.BindingsTemplate;
+import io.nosqlbench.virtdata.api.templates.StringBindings;
+import io.nosqlbench.virtdata.api.templates.StringBindingsTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java

@@ -1,9 +1,9 @@
-package io.nosqlbench.activitytypes.http;
+package io.nosqlbench.activitytype.http;
 
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityapi.core.ActivityType;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.virtdata.annotations.Service;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.ActivityType;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.virtdata.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java

@@ -1,8 +1,8 @@
-package io.nosqlbench.activitytypes.http;
+package io.nosqlbench.activitytype.http;
 
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

activitytype-stdout/pom.xml

@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>at-stdout</artifactId>
+    <artifactId>activitytype-stdout</artifactId>
     <packaging>jar</packaging>
 
     <parent>
-        <artifactId>nb-defaults</artifactId>
+        <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
         <version>2.12.66-SNAPSHOT</version>
-        <relativePath>../nb-defaults</relativePath>
+        <relativePath>../mvn-defaults</relativePath>
     </parent>
 
     <name>${project.artifactId}</name>
@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <artifactId>nb-api</artifactId>
+            <artifactId>engine-api</artifactId>
             <version>2.12.66-SNAPSHOT</version>
         </dependency>
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java

@@ -1,12 +1,12 @@
-package io.nosqlbench.activitytypes.stdout;
+package io.nosqlbench.activitytype.stdout;
 
 import com.codahale.metrics.Timer;
-import io.nosqlbench.activityapi.core.BaseAsyncAction;
-import io.nosqlbench.activityapi.core.ops.fluent.opfacets.StartedOp;
-import io.nosqlbench.activityapi.core.ops.fluent.opfacets.TrackedOp;
-import io.nosqlbench.activityapi.planning.OpSequence;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.virtdata.templates.StringBindings;
+import io.nosqlbench.engine.api.activityapi.core.BaseAsyncAction;
+import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp;
+import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp;
+import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.virtdata.api.templates.StringBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java

@@ -15,12 +15,12 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.stdout;
+package io.nosqlbench.activitytype.stdout;
 
 import com.codahale.metrics.Timer;
-import io.nosqlbench.activityapi.core.SyncAction;
-import io.nosqlbench.activityapi.planning.OpSequence;
-import io.virtdata.templates.StringBindings;
+import io.nosqlbench.engine.api.activityapi.core.SyncAction;
+import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
+import io.nosqlbench.virtdata.api.templates.StringBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java

@@ -15,27 +15,27 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.stdout;
+package io.nosqlbench.activitytype.stdout;
 
-import activityconfig.ParsedStmt;
-import activityconfig.StatementsLoader;
-import activityconfig.yaml.StmtDef;
-import activityconfig.yaml.StmtsDocList;
+import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
+import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
+import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
+import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
-import io.nosqlbench.activityapi.core.ActivityDefObserver;
-import io.nosqlbench.activityapi.planning.OpSequence;
-import io.nosqlbench.activityapi.planning.SequencePlanner;
-import io.nosqlbench.activityapi.planning.SequencerType;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.nosqlbench.activityimpl.ParameterMap;
-import io.nosqlbench.activityimpl.SimpleActivity;
-import io.nosqlbench.metrics.ActivityMetrics;
-import io.nosqlbench.metrics.ExceptionMeterMetrics;
-import io.nosqlbench.util.StrInterpolater;
-import io.virtdata.core.BindingsTemplate;
-import io.virtdata.templates.StringBindings;
-import io.virtdata.templates.StringBindingsTemplate;
+import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
+import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
+import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner;
+import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityimpl.ParameterMap;
+import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
+import io.nosqlbench.engine.api.metrics.ActivityMetrics;
+import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics;
+import io.nosqlbench.engine.api.util.StrInterpolater;
+import io.nosqlbench.virtdata.api.BindingsTemplate;
+import io.nosqlbench.virtdata.api.templates.StringBindings;
+import io.nosqlbench.virtdata.api.templates.StringBindingsTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java

@@ -1,10 +1,10 @@
-package io.nosqlbench.activitytypes.stdout;
+package io.nosqlbench.activitytype.stdout;
 
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityapi.core.ActivityType;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.virtdata.annotations.Service;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.ActivityType;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.virtdata.annotations.Service;
 
 import java.util.Optional;
 

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java

@@ -0,0 +1,8 @@
+package io.nosqlbench.activitytype.stdout;
+
+import io.nosqlbench.virtdata.api.templates.StringBindings;
+
+public class StdoutOpContext {
+    StringBindings stringBindings;
+    String statement;
+}

activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/TemplateFormat.java

@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.stdout;
+package io.nosqlbench.activitytype.stdout;
 
 import java.util.ArrayList;
 import java.util.List;

activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java

@@ -15,7 +15,7 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.stdout;
+package io.nosqlbench.activitytype.stdout;
 
 import org.testng.annotations.Test;
 

activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java

@@ -15,11 +15,11 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.stdout;
+package io.nosqlbench.activitytype.stdout;
 
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

activitytype-tcp/pom.xml

@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>at-tcp</artifactId>
+    <artifactId>activitytype-tcp</artifactId>
     <packaging>jar</packaging>
 
     <parent>
-        <artifactId>nb-defaults</artifactId>
+        <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
         <version>2.12.66-SNAPSHOT</version>
-        <relativePath>../nb-defaults</relativePath>
+        <relativePath>../mvn-defaults</relativePath>
     </parent>
 
     <name>${project.artifactId}</name>
@@ -22,13 +22,13 @@
     <dependencies>
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <artifactId>nb-api</artifactId>
+            <artifactId>engine-api</artifactId>
             <version>2.12.66-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.nosqlbench</groupId>
-            <artifactId>at-stdout</artifactId>
+            <artifactId>activitytype-stdout</artifactId>
             <version>2.12.66-SNAPSHOT</version>
         </dependency>
 

activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java

@@ -15,11 +15,11 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.tcpclient;
+package io.nosqlbench.activitytype.tcpclient;
 
-import io.nosqlbench.activitytypes.stdout.StdoutActivity;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.nosqlbench.util.SSLKsFactory;
+import io.nosqlbench.activitytype.stdout.StdoutActivity;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.util.SSLKsFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java

@@ -15,15 +15,15 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.tcpclient;
+package io.nosqlbench.activitytype.tcpclient;
 
-import io.nosqlbench.activitytypes.stdout.StdoutAction;
-import io.nosqlbench.activitytypes.stdout.StdoutActivity;
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityapi.core.ActivityType;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.virtdata.annotations.Service;
+import io.nosqlbench.activitytype.stdout.StdoutAction;
+import io.nosqlbench.activitytype.stdout.StdoutActivity;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.ActivityType;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.virtdata.annotations.Service;
 
 @Service(ActivityType.class)
 public class TCPClientActivityType implements ActivityType<TCPClientActivity> {

activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java

@@ -15,11 +15,11 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.tcpserver;
+package io.nosqlbench.activitytype.tcpserver;
 
-import io.nosqlbench.activitytypes.stdout.StdoutActivity;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.nosqlbench.util.SSLKsFactory;
+import io.nosqlbench.activitytype.stdout.StdoutActivity;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.engine.api.util.SSLKsFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java

@@ -15,15 +15,15 @@
  * /
  */
 
-package io.nosqlbench.activitytypes.tcpserver;
+package io.nosqlbench.activitytype.tcpserver;
 
-import io.nosqlbench.activitytypes.stdout.StdoutAction;
-import io.nosqlbench.activitytypes.stdout.StdoutActivity;
-import io.nosqlbench.activityapi.core.Action;
-import io.nosqlbench.activityapi.core.ActionDispenser;
-import io.nosqlbench.activityapi.core.ActivityType;
-import io.nosqlbench.activityimpl.ActivityDef;
-import io.virtdata.annotations.Service;
+import io.nosqlbench.activitytype.stdout.StdoutAction;
+import io.nosqlbench.activitytype.stdout.StdoutActivity;
+import io.nosqlbench.engine.api.activityapi.core.Action;
+import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
+import io.nosqlbench.engine.api.activityapi.core.ActivityType;
+import io.nosqlbench.engine.api.activityimpl.ActivityDef;
+import io.nosqlbench.virtdata.annotations.Service;
 
 @Service(ActivityType.class)
 public class TCPServerActivityType implements ActivityType<TCPServerActivity> {

at-diag/src/main/java/io/nosqlbench/activitytypes/diag/DiagResult.java

@@ -1,4 +0,0 @@
-package io.nosqlbench.activitytypes.diag;
-
-public class DiagResult {
-}

at-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +0,0 @@
-io.virtdata.processors.FunctionDocInfoProcessor
-io.virtdata.processors.ServiceProcessor

at-stdout/src/main/java/io/nosqlbench/activitytypes/stdout/StdoutOpContext.java

@@ -1,8 +0,0 @@
-package io.nosqlbench.activitytypes.stdout;
-
-import io.virtdata.templates.StringBindings;
-
-public class StdoutOpContext {
-    StringBindings stringBindings;
-    String statement;
-}

docs/package_layout.md

@@ -0,0 +1,8 @@
+
+- io.nosqlbench.engine.<module name>
+- io.nosqlbench.extensions.<extension name>
+- io.nosqlbench.activitytypes.<activity type name>
+
+- io.nosqlbench.virtdata.<module-name>
+- io.nosqlbench.virtdata.library.<library name>
+- io.nosqlbench.docs. ...

docsys/pom.xml

@@ -7,10 +7,10 @@
     <url>http://docs.virtdata.io/</url>
 
     <parent>
-        <artifactId>virtdata-defaults</artifactId>
+        <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
-        <version>2.12.16-SNAPSHOT</version>
-        <relativePath>../virtdata-defaults</relativePath>
+        <version>2.12.66-SNAPSHOT</version>
+        <relativePath>../mvn-defaults</relativePath>
     </parent>
 
 
@@ -131,18 +131,18 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-processors</artifactId>
-            <version>2.12.16-SNAPSHOT</version>
+            <version>2.12.66-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-annotations</artifactId>
-            <version>2.12.16-SNAPSHOT</version>
+            <version>2.12.66-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-api</artifactId>
-            <version>2.12.16-SNAPSHOT</version>
+            <version>2.12.66-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -165,7 +165,7 @@
                 <configuration>
                     <transformers combine.children="append">
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>io.virtdata.docsys.core.DocServerApp</mainClass>
+                            <mainClass>io.nosqlbench.docsys.core.DocServerApp</mainClass>
                         </transformer>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                     </transformers>

docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java

@@ -1,8 +1,8 @@
-package io.virtdata.docsys;
+package io.nosqlbench.docsys;
 
-import io.virtdata.docsys.api.Docs;
-import io.virtdata.docsys.api.DocsBinder;
-import io.virtdata.docsys.api.DocsysStaticManifest;
+import io.nosqlbench.docsys.api.Docs;
+import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docsys.api.DocsysStaticManifest;
 
 //@Service(DocsysStaticManifest.class)
 public class DocsysDefaultAppPath implements DocsysStaticManifest {

docsys/src/main/java/io/nosqlbench/docsys/api/Docs.java

@@ -1,6 +1,6 @@
-package io.virtdata.docsys.api;
+package io.nosqlbench.docsys.api;
 
-import io.virtdata.util.VirtDataResources;
+import io.nosqlbench.virtdata.api.VirtDataResources;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

docsys/src/main/java/io/nosqlbench/docsys/api/DocsBinder.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.api;
+package io.nosqlbench.docsys.api;
 
 import java.nio.file.Path;
 import java.util.List;

docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpace.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.api;
+package io.nosqlbench.docsys.api;
 
 import java.nio.file.Path;
 import java.util.List;

docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpaceImpl.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.api;
+package io.nosqlbench.docsys.api;
 
 import java.nio.file.Path;
 import java.util.*;

docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java

@@ -1,6 +1,6 @@
-package io.virtdata.docsys.api;
+package io.nosqlbench.docsys.api;
 
-import io.virtdata.docsys.core.DocsysDynamicService;
+import io.nosqlbench.docsys.core.DocsysDynamicService;
 
 /**
  * At runtime, any instances of this service will be used to find

docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.api;
+package io.nosqlbench.docsys.api;
 
 /**
  * At runtime, any instances of this service will be used to find

docsys/src/main/java/io/nosqlbench/docsys/api/WebServiceObject.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.api;
+package io.nosqlbench.docsys.api;
 
 /**
  * Any class which is annotated with <pre>{@code @Service(WebServiceObject.class)}</pre>

docsys/src/main/java/io/nosqlbench/docsys/core/DocServer.java

@@ -1,9 +1,9 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
-import io.virtdata.docsys.DocsysDefaultAppPath;
-import io.virtdata.docsys.api.Docs;
-import io.virtdata.docsys.api.WebServiceObject;
-import io.virtdata.docsys.handlers.FavIconHandler;
+import io.nosqlbench.docsys.DocsysDefaultAppPath;
+import io.nosqlbench.docsys.api.Docs;
+import io.nosqlbench.docsys.api.WebServiceObject;
+import io.nosqlbench.docsys.handlers.FavIconHandler;
 import org.eclipse.jetty.rewrite.handler.RewriteHandler;
 import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.server.handler.DefaultHandler;

docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java

@@ -1,7 +1,7 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
-import io.virtdata.annotations.Service;
-import io.virtdata.docsys.api.WebServiceObject;
+import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.docsys.api.WebServiceObject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

docsys/src/main/java/io/nosqlbench/docsys/core/DocsysDynamicService.java

@@ -1,10 +1,10 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
-import io.virtdata.annotations.Service;
-import io.virtdata.docsys.api.DocsNameSpace;
-import io.virtdata.docsys.api.Docs;
-import io.virtdata.docsys.api.DocsBinder;
-import io.virtdata.docsys.api.WebServiceObject;
+import io.nosqlbench.virtdata.annotations.Service;
+import io.nosqlbench.docsys.api.DocsNameSpace;
+import io.nosqlbench.docsys.api.Docs;
+import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docsys.api.WebServiceObject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java

@@ -1,6 +1,6 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
-import io.virtdata.docsys.api.*;
+import io.nosqlbench.docsys.api.*;
 
 import java.util.ServiceLoader;
 

docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

docsys/src/main/java/io/nosqlbench/docsys/core/TestServlet1.java

@@ -1,6 +1,6 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
-import io.virtdata.docsys.api.WebServiceObject;
+import io.nosqlbench.docsys.api.WebServiceObject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

docsys/src/main/java/io/nosqlbench/docsys/core/WebObjectLoader.java

@@ -1,6 +1,6 @@
-package io.virtdata.docsys.core;
+package io.nosqlbench.docsys.core;
 
-import io.virtdata.docsys.api.WebServiceObject;
+import io.nosqlbench.docsys.api.WebServiceObject;
 
 import java.util.ArrayList;
 import java.util.List;

docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.handlers;
+package io.nosqlbench.docsys.handlers;
 
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Request;

docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java

@@ -1,4 +1,4 @@
-package io.virtdata.docsys.handlers;
+package io.nosqlbench.docsys.handlers;
 
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;

docsys/src/main/node/docsys/README.md

@@ -1,6 +1,6 @@
 # eb-docs
 
-> guidebook for engineblock
+> guidebook for nosqlbench
 
 ## Build Setup
 

docsys/src/main/node/docsys/package.json

@@ -1,7 +1,7 @@
 {
   "name": "guidebook",
   "version": "1.0.0",
-  "description": "Docs App for EB Ecosystem",
+  "description": "Docs App for NoSQLBench",
   "author": "Sebastian Estevez & Jonathan Shook",
   "private": true,
   "scripts": {

docsys/src/main/node/docsys/package.json_old

@@ -1,7 +1,7 @@
 {
   "name": "eb-docs",
   "version": "1.0.0",
-  "description": "docs for engineblock",
+  "description": "docs for nosqlbench",
   "author": "Sebastián Estévez",
   "private": true,
   "scripts": {

docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -0,0 +1,2 @@
+io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
+io.nosqlbench.virtdata.processors.ServiceProcessor