You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/01/10 17:29:01 UTC
[1/6] git commit: ACCUMULO-2165 temporary fix
Updated Branches:
refs/heads/master ba931ff5d -> 0b4211d5a
ACCUMULO-2165 temporary fix
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4a832da
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4a832da
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4a832da
Branch: refs/heads/master
Commit: b4a832da7515bde113856313d1d4fcd497f4ee0b
Parents: e256960
Author: John Vines <vi...@apache.org>
Authored: Thu Jan 9 16:25:39 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Thu Jan 9 16:39:01 2014 -0500
----------------------------------------------------------------------
.../accumulo/maven/plugin/AbstractAccumuloMojo.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4a832da/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
index cc34511..2b0db7f 100644
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
+++ b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
@@ -37,11 +37,22 @@ public abstract class AbstractAccumuloMojo extends AbstractMojo {
if (miniClasspath == null && project != null) {
classpathItems.add(project.getBuild().getOutputDirectory());
classpathItems.add(project.getBuild().getTestOutputDirectory());
- for (Artifact artifact : project.getArtifacts())
+ for (Artifact artifact : project.getArtifacts()) {
classpathItems.add(artifact.getFile().toURI().toURL().toString());
+ }
} else if (miniClasspath != null && !miniClasspath.isEmpty()) {
classpathItems.addAll(Arrays.asList(miniClasspath.split(File.pathSeparator)));
}
+
+ // Hack to prevent sisu-guava, a maven 3.0.4 dependency, from effecting normal accumulo behavior.
+ String sisuGuava = null;
+ for (String items : classpathItems)
+ if (items.contains("sisu-guava"))
+ sisuGuava = items;
+
+ if (sisuGuava != null)
+ classpathItems.remove(sisuGuava);
+
macConfig.setClasspathItems(classpathItems.toArray(new String[classpathItems.size()]));
}
}
[3/6] git commit: ACCUMULO-2160 back-port serious findbugs/pmd issues
to 1.5/1.4
Posted by ec...@apache.org.
ACCUMULO-2160 back-port serious findbugs/pmd issues to 1.5/1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2af25155
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2af25155
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2af25155
Branch: refs/heads/master
Commit: 2af251552e93b41875cf9d97aa927a448d7d7b00
Parents: e135e03
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 10 09:16:01 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 10 09:16:01 2014 -0500
----------------------------------------------------------------------
server/base/src/main/java/org/apache/accumulo/server/Accumulo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2af25155/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index c546590..83f54b0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -157,7 +157,7 @@ public class Accumulo {
System.setProperty("org.apache.accumulo.core.host.log.port", Integer.toString(logPort));
// Use a specific log config, if it exists
- String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR"));
+ String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR"), application);
if (!new File(logConfig).exists()) {
// otherwise, use the generic config
logConfig = String.format("%s/generic_logger.xml", System.getenv("ACCUMULO_CONF_DIR"));
[4/6] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24e62a08
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24e62a08
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24e62a08
Branch: refs/heads/master
Commit: 24e62a088df03d40cab6bd01b063e17e096e97d5
Parents: 2af2515 b4a832d
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 10 10:14:57 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 10 10:14:57 2014 -0500
----------------------------------------------------------------------
.../maven/plugin/AbstractAccumuloMojo.java | 13 +++++++++-
.../minicluster/MiniAccumuloCluster.java | 4 +---
.../minicluster/MiniAccumuloConfig.java | 20 ++--------------
.../minicluster/MiniAccumuloClusterGCTest.java | 25 --------------------
.../minicluster/MiniAccumuloClusterTest.java | 4 ++--
pom.xml | 2 +-
6 files changed, 18 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
[5/6] git commit: ACCUMULO-2168 log entry in zk is the last element
of the file name
Posted by ec...@apache.org.
ACCUMULO-2168 log entry in zk is the last element of the file name
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9372608b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9372608b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9372608b
Branch: refs/heads/master
Commit: 9372608b16f97a5dcb6e8096fe5cbf4623fe8ff8
Parents: 24e62a0
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 10 11:24:53 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 10 11:24:53 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/server/util/MetadataTableUtil.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9372608b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index f61955a..26444e0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -607,8 +607,10 @@ public class MetadataTableUtil {
while (true) {
try {
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
- if (zoo.isLockHeld(zooLock.getLockID()))
- zoo.recursiveDelete(root + "/" + entry.filename, NodeMissingPolicy.SKIP);
+ if (zoo.isLockHeld(zooLock.getLockID())) {
+ String parts[] = entry.filename.split("/");
+ zoo.recursiveDelete(root + "/" + parts[parts.length - 1], NodeMissingPolicy.SKIP);
+ }
break;
} catch (Exception e) {
log.error(e, e);
[2/6] git commit: ACCUMULO-2125 upping guava
Posted by ec...@apache.org.
ACCUMULO-2125 upping guava
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e256960c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e256960c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e256960c
Branch: refs/heads/master
Commit: e256960c02b66fcbbb2bd3f74abe2bafb254d507
Parents: 77b4507
Author: John Vines <vi...@apache.org>
Authored: Thu Jan 9 15:52:04 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Thu Jan 9 16:39:01 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e256960c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 75be8d3..f620e8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>14.0.1</version>
+ <version>15.0</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b4211d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b4211d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b4211d5
Branch: refs/heads/master
Commit: 0b4211d5aa965543a03b709b55ab4cb3de50d9c3
Parents: ba931ff 9372608
Author: Eric Newton <er...@gmail.com>
Authored: Fri Jan 10 11:25:19 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Jan 10 11:25:19 2014 -0500
----------------------------------------------------------------------
.../accumulo/maven/plugin/AbstractAccumuloMojo.java | 13 ++++++++++++-
pom.xml | 2 +-
.../apache/accumulo/server/util/MetadataTableUtil.java | 6 ++++--
3 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b4211d5/pom.xml
----------------------------------------------------------------------