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
commit 2493711487946a4d9750ba2ed1b2b4af52b22acf
Author: Marko A. Rodriguez <okramma...@gmail.com>
AuthorDate: Tue Mar 5 07:59:18 2019 -0700
reorganized tp4 based on languages and removed all the gremlin- naming.
---
.../apache/tinkerpop/machines/pipes/PipeTest.java | 25 ----------------------
{gremlin-core => java/core}/pom.xml | 6 +++---
.../apache/tinkerpop}/language/GremlinCore.java | 2 +-
.../org/apache/tinkerpop}/machine/Bytecode.java | 2 +-
.../org/apache/tinkerpop}/machine/Instruction.java | 2 +-
.../org/apache/tinkerpop}/machine/Traversal.java | 2 +-
.../org/apache/tinkerpop}/machine/Traverser.java | 2 +-
.../machine/coefficients/Coefficients.java | 2 +-
.../machine/coefficients/LongCoefficients.java | 2 +-
.../tinkerpop}/machine/functions/GFunction.java | 6 +++---
.../tinkerpop}/machine/functions/MapFunction.java | 6 +++---
.../machine/traversers/TraverserSet.java | 7 +++---
.../machine/util/FastNoSuchElementException.java | 2 +-
.../apache/tinkerpop}/machine/TraversalTest.java | 2 +-
.../gremlin-pipes => java/machine/pipes}/pom.xml | 8 +++----
.../org/apache/tinkerpop/machine}/pipes/Pipe.java | 4 ++--
.../org/apache/tinkerpop/machine}/pipes/Step.java | 8 +++----
{gremlin-machines => java/machine}/pom.xml | 8 +++----
{gremlin-machines => java}/pom.xml | 11 +++++-----
pom.xml | 9 ++++----
20 files changed, 46 insertions(+), 70 deletions(-)
diff --git
a/gremlin-machines/gremlin-pipes/src/test/java/org/apache/tinkerpop/machines/pipes/PipeTest.java
b/gremlin-machines/gremlin-pipes/src/test/java/org/apache/tinkerpop/machines/pipes/PipeTest.java
deleted file mode 100644
index 243e301..0000000
---
a/gremlin-machines/gremlin-pipes/src/test/java/org/apache/tinkerpop/machines/pipes/PipeTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-package org.apache.tinkerpop.machines.pipes;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class PipeTest {
-}
diff --git a/gremlin-core/pom.xml b/java/core/pom.xml
similarity index 92%
rename from gremlin-core/pom.xml
rename to java/core/pom.xml
index c921791..5e3a2d3 100644
--- a/gremlin-core/pom.xml
+++ b/java/core/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>tinkerpop</artifactId>
+ <artifactId>java</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop :: Gremlin Core</name>
- <artifactId>gremlin-core</artifactId>
+ <name>Apache TinkerPop (Java) :: Core</name>
+ <artifactId>core</artifactId>
<build>
<directory>${basedir}/target</directory>
<finalName>${project.artifactId}-${project.version}</finalName>
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/GremlinCore.java
b/java/core/src/main/java/org/apache/tinkerpop/language/GremlinCore.java
similarity index 95%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/GremlinCore.java
rename to java/core/src/main/java/org/apache/tinkerpop/language/GremlinCore.java
index f876aaa..59c4f69 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/GremlinCore.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/language/GremlinCore.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.language;
+package org.apache.tinkerpop.language;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Bytecode.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/Bytecode.java
similarity index 96%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Bytecode.java
rename to java/core/src/main/java/org/apache/tinkerpop/machine/Bytecode.java
index 5334fd0..2778366 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Bytecode.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/Bytecode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine;
+package org.apache.tinkerpop.machine;
import java.util.ArrayList;
import java.util.List;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Instruction.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/Instruction.java
similarity index 96%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Instruction.java
rename to java/core/src/main/java/org/apache/tinkerpop/machine/Instruction.java
index b46462e..02b88d2 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Instruction.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/Instruction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine;
+package org.apache.tinkerpop.machine;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Traversal.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/Traversal.java
similarity index 96%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Traversal.java
rename to java/core/src/main/java/org/apache/tinkerpop/machine/Traversal.java
index 72da3c2..964143f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Traversal.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/Traversal.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine;
+package org.apache.tinkerpop.machine;
import java.util.function.Function;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Traverser.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/Traverser.java
similarity index 97%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Traverser.java
rename to java/core/src/main/java/org/apache/tinkerpop/machine/Traverser.java
index d0c321f..e57860e 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/Traverser.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/Traverser.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine;
+package org.apache.tinkerpop.machine;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/coefficients/Coefficients.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/coefficients/Coefficients.java
similarity index 95%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/coefficients/Coefficients.java
rename to
java/core/src/main/java/org/apache/tinkerpop/machine/coefficients/Coefficients.java
index d6fcb15..e00694f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/coefficients/Coefficients.java
+++
b/java/core/src/main/java/org/apache/tinkerpop/machine/coefficients/Coefficients.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine.coefficients;
+package org.apache.tinkerpop.machine.coefficients;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/coefficients/LongCoefficients.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/coefficients/LongCoefficients.java
similarity index 96%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/coefficients/LongCoefficients.java
rename to
java/core/src/main/java/org/apache/tinkerpop/machine/coefficients/LongCoefficients.java
index d59c52c..f9d9914 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/coefficients/LongCoefficients.java
+++
b/java/core/src/main/java/org/apache/tinkerpop/machine/coefficients/LongCoefficients.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine.coefficients;
+package org.apache.tinkerpop.machine.coefficients;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/functions/GFunction.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/functions/GFunction.java
similarity index 87%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/functions/GFunction.java
rename to
java/core/src/main/java/org/apache/tinkerpop/machine/functions/GFunction.java
index 48a3b7c..5766425 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/functions/GFunction.java
+++
b/java/core/src/main/java/org/apache/tinkerpop/machine/functions/GFunction.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine.functions;
+package org.apache.tinkerpop.machine.functions;
-import org.apache.tinkerpop.gremlin.machine.Traverser;
-import java.util.Iterator;
+import org.apache.tinkerpop.machine.Traverser;
+
import java.util.function.Function;
/**
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/functions/MapFunction.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/functions/MapFunction.java
similarity index 89%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/functions/MapFunction.java
rename to
java/core/src/main/java/org/apache/tinkerpop/machine/functions/MapFunction.java
index 4491414..7634b64 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/functions/MapFunction.java
+++
b/java/core/src/main/java/org/apache/tinkerpop/machine/functions/MapFunction.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine.functions;
+package org.apache.tinkerpop.machine.functions;
-import org.apache.tinkerpop.gremlin.machine.Traverser;
-import org.apache.tinkerpop.gremlin.machine.coefficients.Coefficients;
+import org.apache.tinkerpop.machine.Traverser;
+import org.apache.tinkerpop.machine.coefficients.Coefficients;
import java.util.function.Function;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/traversers/TraverserSet.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/traversers/TraverserSet.java
similarity index 96%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/traversers/TraverserSet.java
rename to
java/core/src/main/java/org/apache/tinkerpop/machine/traversers/TraverserSet.java
index fdf4b28..5e072e5 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/traversers/TraverserSet.java
+++
b/java/core/src/main/java/org/apache/tinkerpop/machine/traversers/TraverserSet.java
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine.traversers;
+package org.apache.tinkerpop.machine.traversers;
-import org.apache.tinkerpop.gremlin.machine.Traverser;
-import org.apache.tinkerpop.gremlin.machine.util.FastNoSuchElementException;
+
+import org.apache.tinkerpop.machine.Traverser;
+import org.apache.tinkerpop.machine.util.FastNoSuchElementException;
import java.util.AbstractSet;
import java.util.Collections;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/util/FastNoSuchElementException.java
b/java/core/src/main/java/org/apache/tinkerpop/machine/util/FastNoSuchElementException.java
similarity index 96%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/util/FastNoSuchElementException.java
rename to
java/core/src/main/java/org/apache/tinkerpop/machine/util/FastNoSuchElementException.java
index 003c990..88bcaa4 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/machine/util/FastNoSuchElementException.java
+++
b/java/core/src/main/java/org/apache/tinkerpop/machine/util/FastNoSuchElementException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine.util;
+package org.apache.tinkerpop.machine.util;
import java.util.NoSuchElementException;
diff --git
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/machine/TraversalTest.java
b/java/core/src/test/java/org/apache/tinkerpop/machine/TraversalTest.java
similarity index 96%
rename from
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/machine/TraversalTest.java
rename to
java/core/src/test/java/org/apache/tinkerpop/machine/TraversalTest.java
index 30322a1..e682a05 100644
---
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/machine/TraversalTest.java
+++ b/java/core/src/test/java/org/apache/tinkerpop/machine/TraversalTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.machine;
+package org.apache.tinkerpop.machine;
import org.junit.jupiter.api.Test;
diff --git a/gremlin-machines/gremlin-pipes/pom.xml b/java/machine/pipes/pom.xml
similarity index 90%
rename from gremlin-machines/gremlin-pipes/pom.xml
rename to java/machine/pipes/pom.xml
index 91ea4f1..023b09a 100644
--- a/gremlin-machines/gremlin-pipes/pom.xml
+++ b/java/machine/pipes/pom.xml
@@ -17,16 +17,16 @@ 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>gremlin-machines</artifactId>
+ <artifactId>machine</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop :: Gremlin Machines :: Gremlin Pipes</name>
- <artifactId>gremlin-pipes</artifactId>
+ <name>Apache TinkerPop (Java) :: Machine :: Pipes</name>
+ <artifactId>pipes</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-core</artifactId>
+ <artifactId>core</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git
a/gremlin-machines/gremlin-pipes/src/main/java/org/apache/tinkerpop/machines/pipes/Pipe.java
b/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipe.java
similarity index 91%
rename from
gremlin-machines/gremlin-pipes/src/main/java/org/apache/tinkerpop/machines/pipes/Pipe.java
rename to
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipe.java
index 0bbc106..93e3a0d 100644
---
a/gremlin-machines/gremlin-pipes/src/main/java/org/apache/tinkerpop/machines/pipes/Pipe.java
+++
b/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Pipe.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machines.pipes;
+package org.apache.tinkerpop.machine.pipes;
import java.util.ArrayList;
import java.util.Iterator;
@@ -25,7 +25,7 @@ import java.util.List;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class Pipe<S, E> implements Iterator<E>, AutoCloseable {
+public class Pipe <S, E> implements Iterator<E>, AutoCloseable {
private final List<Step<?, ?>> steps = new ArrayList<>();
diff --git
a/gremlin-machines/gremlin-pipes/src/main/java/org/apache/tinkerpop/machines/pipes/Step.java
b/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java
similarity index 85%
rename from
gremlin-machines/gremlin-pipes/src/main/java/org/apache/tinkerpop/machines/pipes/Step.java
rename to
java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java
index 92e1b5d..fc05c8f 100644
---
a/gremlin-machines/gremlin-pipes/src/main/java/org/apache/tinkerpop/machines/pipes/Step.java
+++
b/java/machine/pipes/src/main/java/org/apache/tinkerpop/machine/pipes/Step.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.machines.pipes;
+package org.apache.tinkerpop.machine.pipes;
-import org.apache.tinkerpop.gremlin.machine.Traverser;
-import org.apache.tinkerpop.gremlin.machine.functions.GFunction;
-import org.apache.tinkerpop.gremlin.machine.traversers.TraverserSet;
+import org.apache.tinkerpop.machine.Traverser;
+import org.apache.tinkerpop.machine.functions.GFunction;
+import org.apache.tinkerpop.machine.traversers.TraverserSet;
import java.util.Iterator;
diff --git a/gremlin-machines/pom.xml b/java/machine/pom.xml
similarity index 86%
copy from gremlin-machines/pom.xml
copy to java/machine/pom.xml
index e5ebc68..8aef974 100644
--- a/gremlin-machines/pom.xml
+++ b/java/machine/pom.xml
@@ -18,13 +18,13 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<parent>
- <artifactId>tinkerpop</artifactId>
+ <artifactId>java</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop :: Gremlin Machines</name>
- <artifactId>gremlin-machines</artifactId>
+ <name>Apache TinkerPop (Java) :: Machine</name>
+ <artifactId>machine</artifactId>
<modules>
- <module>gremlin-pipes</module>
+ <module>pipes</module>
</modules>
</project>
\ No newline at end of file
diff --git a/gremlin-machines/pom.xml b/java/pom.xml
similarity index 89%
rename from gremlin-machines/pom.xml
rename to java/pom.xml
index e5ebc68..f8f31ab 100644
--- a/gremlin-machines/pom.xml
+++ b/java/pom.xml
@@ -17,14 +17,15 @@ 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>
<packaging>pom</packaging>
+ <modules>
+ <module>core</module>
+ <module>machine</module>
+ </modules>
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <name>Apache TinkerPop :: Gremlin Machines</name>
- <artifactId>gremlin-machines</artifactId>
- <modules>
- <module>gremlin-pipes</module>
- </modules>
+ <name>Apache TinkerPop :: Java</name>
+ <artifactId>java</artifactId>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 09d0c9a..59a3231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
- <description>A Distributed Virtual Machine and Language</description>
+ <description>A Virtual Machine and Language</description>
<url>http://tinkerpop.apache.org/</url>
<mailingLists>
<mailingList>
@@ -64,8 +64,7 @@ limitations under the License.
<maven>3.2.5</maven>
</prerequisites>
<modules>
- <module>gremlin-core</module>
- <module>gremlin-machines</module>
+ <module>java</module>
</modules>
<scm>
<connection>scm:git:g...@github.com:apache/tinkerpop.git</connection>
@@ -80,13 +79,13 @@ limitations under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.4.0</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.4.0</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
