This is an automated email from the ASF dual-hosted git repository.
okram pushed a commit to branch tp4
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push:
new 9e2351b moved tinkergraph to its own module. we now have
machine/processor/pipes ... machine/structure/tinkergraph. Don't know if we
need such module nesting, but can always flatten it out later.
9e2351b is described below
commit 9e2351b0ecab9189dff36bfdae1d897f9c7c3a6f
Author: Marko A. Rodriguez <okramma...@gmail.com>
AuthorDate: Mon Mar 18 14:00:54 2019 -0600
moved tinkergraph to its own module. we now have machine/processor/pipes
... machine/structure/tinkergraph. Don't know if we need such module nesting,
but can always flatten it out later.
---
java/machine/pom.xml | 4 ++--
java/machine/processor/.DS_Store | Bin 0 -> 6148 bytes
java/machine/processor/beam/.DS_Store | Bin 0 -> 6148 bytes
java/machine/{ => processor}/beam/pom.xml | 8 +++++++-
.../org/apache/tinkerpop/machine/beam/AbstractFn.java | 0
.../java/org/apache/tinkerpop/machine/beam/Beam.java | 0
.../org/apache/tinkerpop/machine/beam/BeamProcessor.java | 0
.../java/org/apache/tinkerpop/machine/beam/BranchFn.java | 0
.../java/org/apache/tinkerpop/machine/beam/FilterFn.java | 0
.../org/apache/tinkerpop/machine/beam/FlatMapFn.java | 0
.../main/java/org/apache/tinkerpop/machine/beam/Fn.java | 0
.../org/apache/tinkerpop/machine/beam/InitialFn.java | 0
.../java/org/apache/tinkerpop/machine/beam/MapFn.java | 0
.../java/org/apache/tinkerpop/machine/beam/OutputFn.java | 0
.../java/org/apache/tinkerpop/machine/beam/ReduceFn.java | 0
.../apache/tinkerpop/machine/beam/RepeatDeadEndFn.java | 0
.../org/apache/tinkerpop/machine/beam/RepeatEndFn.java | 0
.../org/apache/tinkerpop/machine/beam/RepeatStartFn.java | 0
.../machine/beam/serialization/CoefficientCoder.java | 0
.../machine/beam/serialization/ReducerCoder.java | 0
.../machine/beam/serialization/TraverserCoder.java | 0
.../tinkerpop/machine/beam/sideeffect/BasicReducer.java | 0
.../tinkerpop/machine/beam/strategy/BeamStrategy.java | 0
.../tinkerpop/machine/beam/util/PrimitiveVisitor.java | 0
.../apache/tinkerpop/machine/beam/util/TopologyUtil.java | 0
.../java/org/apache/tinkerpop/machine/beam/BeamTest.java | 0
.../machine/beam/functions/TraversalSourceLibrary.java | 0
java/machine/processor/pipes/.DS_Store | Bin 0 -> 6148 bytes
java/machine/{ => processor}/pipes/pom.xml | 8 +++++++-
.../org/apache/tinkerpop/machine/pipes/AbstractStep.java | 0
.../org/apache/tinkerpop/machine/pipes/BarrierStep.java | 0
.../org/apache/tinkerpop/machine/pipes/BranchStep.java | 0
.../org/apache/tinkerpop/machine/pipes/EmptyStep.java | 0
.../org/apache/tinkerpop/machine/pipes/FilterStep.java | 0
.../org/apache/tinkerpop/machine/pipes/FlatMapStep.java | 0
.../org/apache/tinkerpop/machine/pipes/InitialStep.java | 0
.../java/org/apache/tinkerpop/machine/pipes/MapStep.java | 0
.../java/org/apache/tinkerpop/machine/pipes/Pipes.java | 0
.../apache/tinkerpop/machine/pipes/PipesProcessor.java | 0
.../org/apache/tinkerpop/machine/pipes/ReduceStep.java | 0
.../org/apache/tinkerpop/machine/pipes/RepeatStep.java | 0
.../org/apache/tinkerpop/machine/pipes/SourceStep.java | 0
.../java/org/apache/tinkerpop/machine/pipes/Step.java | 0
.../tinkerpop/machine/pipes/strategy/PipesStrategy.java | 0
.../org/apache/tinkerpop/machine/pipes/util/Barrier.java | 0
.../tinkerpop/machine/pipes/util/InMemoryBarrier.java | 0
.../tinkerpop/machine/pipes/util/InMemoryReducer.java | 0
.../org/apache/tinkerpop/machine/pipes/util/Reducer.java | 0
.../org/apache/tinkerpop/machine/pipes/PipesTest.java | 0
.../machine/pipes/function/TraversalSourceLibrary.java | 0
java/machine/{ => processor}/pom.xml | 6 +++---
java/machine/structure/.DS_Store | Bin 0 -> 6148 bytes
java/machine/{ => structure}/pom.xml | 9 ++++-----
java/machine/structure/tinkergraph/.DS_Store | Bin 0 -> 6148 bytes
java/machine/{pipes => structure/tinkergraph}/pom.xml | 6 +++---
.../machine/structure/tinkergraph/TinkerGraph.java | 0
.../structure/tinkergraph/TinkerGraphStructure.java | 0
.../tinkergraph/bytecode/TinkerGraphCompiler.java | 0
.../machine/structure/tinkergraph/data/TinkerVertex.java | 0
.../tinkergraph/function/initial/VerticesFlatMap.java | 0
.../structure/tinkergraph/strategy/VerticesStrategy.java | 0
61 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/java/machine/pom.xml b/java/machine/pom.xml
index 18c4a95..e190872 100644
--- a/java/machine/pom.xml
+++ b/java/machine/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
<name>Apache TinkerPop (Java) :: Machine</name>
<artifactId>machine</artifactId>
<modules>
- <module>pipes</module>
- <module>beam</module>
+ <module>processor</module>
+ <module>structure</module>
</modules>
</project>
\ No newline at end of file
diff --git a/java/machine/processor/.DS_Store b/java/machine/processor/.DS_Store
new file mode 100644
index 0000000..b769da3
Binary files /dev/null and b/java/machine/processor/.DS_Store differ
diff --git a/java/machine/processor/beam/.DS_Store
b/java/machine/processor/beam/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/java/machine/processor/beam/.DS_Store differ
diff --git a/java/machine/beam/pom.xml b/java/machine/processor/beam/pom.xml
similarity index 94%
rename from java/machine/beam/pom.xml
rename to java/machine/processor/beam/pom.xml
index 2eb4b7c..8249a50 100644
--- a/java/machine/beam/pom.xml
+++ b/java/machine/processor/beam/pom.xml
@@ -17,7 +17,7 @@ limitations under the License.
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>
<parent>
- <artifactId>machine</artifactId>
+ <artifactId>processor</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
@@ -95,6 +95,12 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${basedir}/target</directory>
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/AbstractFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/AbstractFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/AbstractFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/AbstractFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BeamProcessor.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BeamProcessor.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BeamProcessor.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BeamProcessor.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/FilterFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FilterFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/FilterFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FilterFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/FlatMapFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FlatMapFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/FlatMapFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/FlatMapFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Fn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Fn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Fn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/Fn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/InitialFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/InitialFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/InitialFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/InitialFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/MapFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/MapFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/MapFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/MapFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/OutputFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/OutputFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/OutputFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/OutputFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/ReduceFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/ReduceFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/ReduceFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/ReduceFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatDeadEndFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatDeadEndFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatDeadEndFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatDeadEndFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatEndFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatEndFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatEndFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatEndFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatStartFn.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatStartFn.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatStartFn.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatStartFn.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/CoefficientCoder.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/CoefficientCoder.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/CoefficientCoder.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/CoefficientCoder.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/ReducerCoder.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/ReducerCoder.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/ReducerCoder.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/ReducerCoder.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/TraverserCoder.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/TraverserCoder.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/TraverserCoder.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/serialization/TraverserCoder.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/sideeffect/BasicReducer.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/sideeffect/BasicReducer.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/sideeffect/BasicReducer.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/sideeffect/BasicReducer.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/strategy/BeamStrategy.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/strategy/BeamStrategy.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/strategy/BeamStrategy.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/strategy/BeamStrategy.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/PrimitiveVisitor.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/PrimitiveVisitor.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/PrimitiveVisitor.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/PrimitiveVisitor.java
diff --git
a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java
b/java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java
similarity index 100%
rename from
java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java
rename to
java/machine/processor/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java
diff --git
a/java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java
b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java
similarity index 100%
rename from
java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java
rename to
java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java
diff --git
a/java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java
b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java
similarity index 100%
rename from
java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java
rename to
java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/beam/functions/TraversalSourceLibrary.java
diff --git a/java/machine/processor/pipes/.DS_Store
b/java/machine/processor/pipes/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/java/machine/processor/pipes/.DS_Store differ
diff --git a/java/machine/pipes/pom.xml b/java/machine/processor/pipes/pom.xml
similarity index 89%
copy from java/machine/pipes/pom.xml
copy to java/machine/processor/pipes/pom.xml
index 4da3635..d9b2f29 100644
--- a/java/machine/pipes/pom.xml
+++ b/java/machine/processor/pipes/pom.xml
@@ -17,7 +17,7 @@ limitations under the License.
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>
<parent>
- <artifactId>machine</artifactId>
+ <artifactId>processor</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
@@ -36,6 +36,12 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${basedir}/target</directory>
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/AbstractStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/AbstractStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/AbstractStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/AbstractStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BarrierStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BarrierStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BarrierStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BarrierStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BranchStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BranchStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BranchStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/BranchStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/EmptyStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/EmptyStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/EmptyStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/EmptyStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FilterStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FilterStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FilterStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FilterStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FlatMapStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FlatMapStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FlatMapStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/FlatMapStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/InitialStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/InitialStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/InitialStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/InitialStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/MapStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/MapStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/MapStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/MapStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipes.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipes.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipes.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipes.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/PipesProcessor.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/PipesProcessor.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/PipesProcessor.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/PipesProcessor.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/ReduceStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/ReduceStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/ReduceStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/ReduceStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/RepeatStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/RepeatStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/RepeatStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/RepeatStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/SourceStep.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/SourceStep.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/SourceStep.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/SourceStep.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/strategy/PipesStrategy.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/strategy/PipesStrategy.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/strategy/PipesStrategy.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/strategy/PipesStrategy.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Barrier.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Barrier.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Barrier.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Barrier.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryBarrier.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryBarrier.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryBarrier.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryBarrier.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryReducer.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryReducer.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryReducer.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/InMemoryReducer.java
diff --git
a/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Reducer.java
b/java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Reducer.java
similarity index 100%
rename from
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Reducer.java
rename to
java/machine/processor/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/util/Reducer.java
diff --git
a/java/machine/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/PipesTest.java
b/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/PipesTest.java
similarity index 100%
rename from
java/machine/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/PipesTest.java
rename to
java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/PipesTest.java
diff --git
a/java/machine/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/function/TraversalSourceLibrary.java
b/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/function/TraversalSourceLibrary.java
similarity index 100%
rename from
java/machine/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/function/TraversalSourceLibrary.java
rename to
java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/pipes/function/TraversalSourceLibrary.java
diff --git a/java/machine/pom.xml b/java/machine/processor/pom.xml
similarity index 89%
copy from java/machine/pom.xml
copy to java/machine/processor/pom.xml
index 18c4a95..38312e1 100644
--- a/java/machine/pom.xml
+++ b/java/machine/processor/pom.xml
@@ -19,11 +19,11 @@ limitations under the License.
<packaging>pom</packaging>
<parent>
<groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkerpop</artifactId>
+ <artifactId>machine</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop (Java) :: Machine</name>
- <artifactId>machine</artifactId>
+ <name>Apache TinkerPop (Java) :: Machine :: Processor</name>
+ <artifactId>processor</artifactId>
<modules>
<module>pipes</module>
<module>beam</module>
diff --git a/java/machine/structure/.DS_Store b/java/machine/structure/.DS_Store
new file mode 100644
index 0000000..d5b57da
Binary files /dev/null and b/java/machine/structure/.DS_Store differ
diff --git a/java/machine/pom.xml b/java/machine/structure/pom.xml
similarity index 85%
copy from java/machine/pom.xml
copy to java/machine/structure/pom.xml
index 18c4a95..4075a0a 100644
--- a/java/machine/pom.xml
+++ b/java/machine/structure/pom.xml
@@ -19,13 +19,12 @@ limitations under the License.
<packaging>pom</packaging>
<parent>
<groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkerpop</artifactId>
+ <artifactId>machine</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop (Java) :: Machine</name>
- <artifactId>machine</artifactId>
+ <name>Apache TinkerPop (Java) :: Machine :: Structure</name>
+ <artifactId>structure</artifactId>
<modules>
- <module>pipes</module>
- <module>beam</module>
+ <module>tinkergraph</module>
</modules>
</project>
\ No newline at end of file
diff --git a/java/machine/structure/tinkergraph/.DS_Store
b/java/machine/structure/tinkergraph/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/java/machine/structure/tinkergraph/.DS_Store differ
diff --git a/java/machine/pipes/pom.xml
b/java/machine/structure/tinkergraph/pom.xml
similarity index 93%
rename from java/machine/pipes/pom.xml
rename to java/machine/structure/tinkergraph/pom.xml
index 4da3635..47ecaa9 100644
--- a/java/machine/pipes/pom.xml
+++ b/java/machine/structure/tinkergraph/pom.xml
@@ -17,12 +17,12 @@ limitations under the License.
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>
<parent>
- <artifactId>machine</artifactId>
+ <artifactId>structure</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop (Java) :: Machine :: Pipes</name>
- <artifactId>pipes</artifactId>
+ <name>Apache TinkerPop (Java) :: Machine :: TinkerGraph</name>
+ <artifactId>tinkergraph</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
diff --git
a/java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraph.java
b/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraph.java
similarity index 100%
rename from
java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraph.java
rename to
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraph.java
diff --git
a/java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraphStructure.java
b/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraphStructure.java
similarity index 100%
rename from
java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraphStructure.java
rename to
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/TinkerGraphStructure.java
diff --git
a/java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/bytecode/TinkerGraphCompiler.java
b/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/bytecode/TinkerGraphCompiler.java
similarity index 100%
rename from
java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/bytecode/TinkerGraphCompiler.java
rename to
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/bytecode/TinkerGraphCompiler.java
diff --git
a/java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/data/TinkerVertex.java
b/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/data/TinkerVertex.java
similarity index 100%
rename from
java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/data/TinkerVertex.java
rename to
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/data/TinkerVertex.java
diff --git
a/java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/function/initial/VerticesFlatMap.java
b/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/function/initial/VerticesFlatMap.java
similarity index 100%
rename from
java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/function/initial/VerticesFlatMap.java
rename to
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/function/initial/VerticesFlatMap.java
diff --git
a/java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/strategy/VerticesStrategy.java
b/java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/strategy/VerticesStrategy.java
similarity index 100%
rename from
java/core/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/strategy/VerticesStrategy.java
rename to
java/machine/structure/tinkergraph/src/main/java/org/apache/tinkerpop/machine/structure/tinkergraph/strategy/VerticesStrategy.java
