You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/08/17 21:31:54 UTC
[1/3] incubator-tinkerpop git commit: Don't re-copy files for
gremlin-server.sh -i
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 45023be9d -> fa95c4173
Don't re-copy files for gremlin-server.sh -i
Re-copying files that already exist seems to be a problem for Gremlin Server on windows. Check of existence first and if present, don't copy. TINKERPOP3-804
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/46688dd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/46688dd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/46688dd8
Branch: refs/heads/master
Commit: 46688dd8076189fa3d43a4bdc6f80e6ab543392e
Parents: 197036c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 17 10:32:33 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 17 10:32:33 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/46688dd8/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
index 07102fe..2e8877d 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
@@ -96,9 +96,12 @@ class DependencyGrabber {
private static Closure copyTo(final Path path) {
return { Path p ->
+ // check for existence prior to copying as windows systems seem to have problems with REPLACE_EXISTING
def copying = path.resolve(p.fileName)
- Files.copy(p, copying, StandardCopyOption.REPLACE_EXISTING)
- println "Copying - $copying"
+ if (!copying.toFile().exists()) {
+ Files.copy(p, copying, StandardCopyOption.REPLACE_EXISTING)
+ println "Copying - $copying"
+ }
}
}
[3/3] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fa95c417
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fa95c417
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fa95c417
Branch: refs/heads/master
Commit: fa95c4173546f921c962bc58f0231eda46096676
Parents: 45023be 2e8d052
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 17 15:31:42 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 17 15:31:42 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/Transaction.java | 44 +-------------------
.../structure/util/AbstractTransaction.java | 1 -
.../groovy/util/DependencyGrabber.groovy | 7 +++-
3 files changed, 6 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-tinkerpop git commit: Remove deprecation from
Transaction.close() related methods/enums.
Posted by sp...@apache.org.
Remove deprecation from Transaction.close() related methods/enums.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2e8d052c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2e8d052c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2e8d052c
Branch: refs/heads/master
Commit: 2e8d052c9aebf2def04ae169b27dc808ef11a22b
Parents: 46688dd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 17 15:30:56 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 17 15:30:56 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/Transaction.java | 44 +-------------------
.../structure/util/AbstractTransaction.java | 1 -
2 files changed, 1 insertion(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e8d052c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
index b3eb69e..56b22e0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
@@ -44,7 +44,7 @@ import java.util.function.Function;
* @author Stephen Mallette (http://stephen.genoprime.com)
* @author TinkerPop Community (http://tinkerpop.com)
*/
-public interface Transaction extends Closeable {
+public interface Transaction extends AutoCloseable {
/**
* Opens a transaction.
@@ -89,19 +89,8 @@ public interface Transaction extends Closeable {
/**
* Closes the transaction where the default close behavior defined by {{@link #onClose(Consumer)}} will be
* executed.
- *
- * @deprecated As of release 3.0.1 and will not be replaced.
- * The intention is to no longer have {@code Transaction} implement {@code Closeable} as the
- * semantics of closing in this context don't make sense. {@code Transaction}
- * is not a "transaction object" - it exists to hide methods from {@link Graph} that manage a
- * transaction. Closing it doesn't make much sense. It is also doesn't work quite in the intended
- * way as it was expected that calls to {@link Graph#close()} would in turn call this method,
- * however doing so will not properly close all transactions as most graphs operate in a
- * {@code ThreadLocal} context and so a call to this method would typically just close the
- * transaction of the current thread.
*/
@Override
- @Deprecated
public void close();
/**
@@ -113,12 +102,7 @@ public interface Transaction extends Closeable {
/**
* Describes what happens to a transaction on a call to {@link Graph#close()}. This value can be set using
* standard behavior defined in {@link CLOSE_BEHAVIOR} or a mapper {@link Consumer} function.
- *
- * @deprecated As of release 3.0.1 and will not be replaced.
- * Given the deprecation of {@link #close()}, the need to supply a method to set the close
- * behavior is unecessary.
*/
- @Deprecated
public Transaction onClose(final Consumer<Transaction> consumer);
/**
@@ -167,12 +151,6 @@ public interface Transaction extends Closeable {
return new UnsupportedOperationException("Graph does not support threaded transactions");
}
- /**
- * @deprecated As of release 3.0.1 and will not be replaced.
- * Given the deprecation of {@link #close()}, the need to supply a method to set the close
- * behavior is unecessary.
- */
- @Deprecated
public static IllegalArgumentException onCloseBehaviorCannotBeNull() {
return new IllegalArgumentException("Transaction behavior for onClose cannot be null");
}
@@ -185,21 +163,11 @@ public interface Transaction extends Closeable {
/**
* Behaviors to supply to the {@link #onClose(Consumer)}. The semantics of these behaviors must be examined in
* the context of the implementation. In most cases, these behaviors will be applied as {{@link ThreadLocal}}.
- *
- * @deprecated As of release 3.0.1 and will not be replaced.
- * Given the deprecation of {@link #close()}, the need to supply a method to set the close
- * behavior is unecessary.
*/
- @Deprecated
public enum CLOSE_BEHAVIOR implements Consumer<Transaction> {
/**
* Commit the transaction when {@link #close()} is called.
- *
- * @deprecated As of release 3.0.1 and will not be replaced.
- * Given the deprecation of {@link #close()}, the need to supply a method to set the close
- * behavior is unecessary.
*/
- @Deprecated
COMMIT {
@Override
public void accept(final Transaction transaction) {
@@ -209,12 +177,7 @@ public interface Transaction extends Closeable {
/**
* Rollback the transaction when {@link #close()} is called.
- *
- * @deprecated As of release 3.0.1 and will not be replaced.
- * Given the deprecation of {@link #close()}, the need to supply a method to set the close
- * behavior is unecessary.
*/
- @Deprecated
ROLLBACK {
@Override
public void accept(final Transaction transaction) {
@@ -224,12 +187,7 @@ public interface Transaction extends Closeable {
/**
* Throw an exception if the current transaction is open when {@link #close()} is called.
- *
- * @deprecated As of release 3.0.1 and will not be replaced.
- * Given the deprecation of {@link #close()}, the need to supply a method to set the close
- * behavior is unecessary.
*/
- @Deprecated
MANUAL {
@Override
public void accept(final Transaction transaction) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e8d052c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
index 3b3fd6d..4d15a45 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
@@ -130,7 +130,6 @@ public abstract class AbstractTransaction implements Transaction {
* {@inheritDoc}
*/
@Override
- @Deprecated
public void close() {
closeConsumer.accept(this);
}