From commits-return-21823-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Tue May 8 20:50:58 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 515F6180674 for ; Tue, 8 May 2018 20:50:57 +0200 (CEST) Received: (qmail 96413 invoked by uid 500); 8 May 2018 18:50:56 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 96404 invoked by uid 99); 8 May 2018 18:50:56 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2018 18:50:56 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CECD480A90; Tue, 8 May 2018 18:50:55 +0000 (UTC) Date: Tue, 08 May 2018 18:50:55 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated: Remove the fate module by combining it into core (#466) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152580545573.476.15742944048093884624@gitbox.apache.org> From: ctubbsii@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: be7475e35a43346b5678039980315126a08c0b28 X-Git-Newrev: 3b78788f8d99959ba02a701474fee92578ec0425 X-Git-Rev: 3b78788f8d99959ba02a701474fee92578ec0425 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new 3b78788 Remove the fate module by combining it into core (#466) 3b78788 is described below commit 3b78788f8d99959ba02a701474fee92578ec0425 Author: Christopher Tubbs AuthorDate: Tue May 8 14:50:53 2018 -0400 Remove the fate module by combining it into core (#466) --- assemble/bin/accumulo-util | 5 +- assemble/pom.xml | 5 -- client/mapreduce/pom.xml | 4 -- core/pom.xml | 4 -- core/src/main/findbugs/exclude-filter.xml | 5 +- .../apache/accumulo/fate/AcceptableException.java | 0 .../java/org/apache/accumulo/fate/AdminUtil.java | 0 .../java/org/apache/accumulo/fate/AgeOffStore.java | 0 .../main/java/org/apache/accumulo/fate/Fate.java | 0 .../org/apache/accumulo/fate/ReadOnlyRepo.java | 0 .../org/apache/accumulo/fate/ReadOnlyStore.java | 0 .../org/apache/accumulo/fate/ReadOnlyTStore.java | 0 .../main/java/org/apache/accumulo/fate/Repo.java | 0 .../accumulo/fate/StackOverflowException.java | 0 .../main/java/org/apache/accumulo/fate/TStore.java | 0 .../java/org/apache/accumulo/fate/ZooStore.java | 0 .../org/apache/accumulo/fate/util/AddressUtil.java | 0 .../apache/accumulo/fate/util/LoggingRunnable.java | 0 .../java/org/apache/accumulo/fate/util/Retry.java | 0 .../apache/accumulo/fate/util/UtilWaitThread.java | 0 .../fate/zookeeper/DistributedReadWriteLock.java | 0 .../apache/accumulo/fate/zookeeper/IZooReader.java | 0 .../accumulo/fate/zookeeper/IZooReaderWriter.java | 0 .../fate/zookeeper/TransactionWatcher.java | 0 .../apache/accumulo/fate/zookeeper/ZooCache.java | 0 .../accumulo/fate/zookeeper/ZooCacheFactory.java | 0 .../apache/accumulo/fate/zookeeper/ZooLock.java | 0 .../accumulo/fate/zookeeper/ZooQueueLock.java | 0 .../apache/accumulo/fate/zookeeper/ZooReader.java | 0 .../accumulo/fate/zookeeper/ZooReaderWriter.java | 0 .../accumulo/fate/zookeeper/ZooReservation.java | 0 .../apache/accumulo/fate/zookeeper/ZooSession.java | 0 .../apache/accumulo/fate/zookeeper/ZooUtil.java | 0 .../org/apache/accumulo/fate/AgeOffStoreTest.java | 0 .../apache/accumulo/fate/ReadOnlyStoreTest.java | 0 .../java/org/apache/accumulo/fate/SimpleStore.java | 0 .../apache/accumulo/fate/util/AddressUtilTest.java | 0 .../org/apache/accumulo/fate/util/RetryTest.java | 0 .../zookeeper/DistributedReadWriteLockTest.java | 0 .../fate/zookeeper/TransactionWatcherTest.java | 0 .../fate/zookeeper/ZooCacheFactoryTest.java | 0 .../accumulo/fate/zookeeper/ZooCacheTest.java | 0 .../zookeeper/ZooKeeperConnectionInfoTest.java | 0 .../fate/zookeeper/ZooReaderWriterTest.java | 0 .../accumulo/fate/zookeeper/ZooSessionTest.java | 0 fate/.gitignore | 28 ---------- fate/pom.xml | 61 ---------------------- fate/src/main/findbugs/exclude-filter.xml | 23 -------- fate/src/test/resources/log4j.properties | 24 --------- minicluster/pom.xml | 4 -- pom.xml | 6 --- server/base/pom.xml | 4 -- server/gc/pom.xml | 4 -- server/master/pom.xml | 4 -- server/monitor/pom.xml | 4 -- server/tracer/pom.xml | 4 -- server/tserver/pom.xml | 4 -- shell/pom.xml | 4 -- test/pom.xml | 4 -- 59 files changed, 6 insertions(+), 195 deletions(-) diff --git a/assemble/bin/accumulo-util b/assemble/bin/accumulo-util index 71aea89..fe62ad3 100755 --- a/assemble/bin/accumulo-util +++ b/assemble/bin/accumulo-util @@ -218,7 +218,6 @@ function hadoop_jar() { ZOOKEEPER_LIB=$(eval "$ZOOKEEPER_CMD") CORE_LIB="${lib}/accumulo-core.jar" - FATE_LIB="${lib}/accumulo-fate.jar" THRIFT_LIB="${lib}/libthrift.jar" JCOMMANDER_LIB="${lib}/jcommander.jar" COMMONS_VFS_LIB="${lib}/commons-vfs2.jar" @@ -244,8 +243,8 @@ function hadoop_jar() { fi done - LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB,$HTRACE_LIB" - H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB:$HTRACE_LIB" + LIB_JARS="$THRIFT_LIB,$CORE_LIB,$ZOOKEEPER_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB,$HTRACE_LIB" + H_JARS="$THRIFT_LIB:$CORE_LIB:$ZOOKEEPER_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB:$HTRACE_LIB" for jar in $USERJARS; do LIB_JARS="$LIB_JARS,$jar" diff --git a/assemble/pom.xml b/assemble/pom.xml index 0aba9cb..31f9a99 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -122,11 +122,6 @@ org.apache.accumulo - accumulo-fate - true - - - org.apache.accumulo accumulo-gc true diff --git a/client/mapreduce/pom.xml b/client/mapreduce/pom.xml index 2ecce2d..acfe3f5 100644 --- a/client/mapreduce/pom.xml +++ b/client/mapreduce/pom.xml @@ -44,10 +44,6 @@ accumulo-core - org.apache.accumulo - accumulo-fate - - org.slf4j slf4j-api diff --git a/core/pom.xml b/core/pom.xml index 87dcd28..53e32ce 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -81,10 +81,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-start diff --git a/core/src/main/findbugs/exclude-filter.xml b/core/src/main/findbugs/exclude-filter.xml index 56d3659..a3db72f 100644 --- a/core/src/main/findbugs/exclude-filter.xml +++ b/core/src/main/findbugs/exclude-filter.xml @@ -94,7 +94,10 @@ - + + + + diff --git a/fate/src/main/java/org/apache/accumulo/fate/AcceptableException.java b/core/src/main/java/org/apache/accumulo/fate/AcceptableException.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/AcceptableException.java rename to core/src/main/java/org/apache/accumulo/fate/AcceptableException.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/core/src/main/java/org/apache/accumulo/fate/AdminUtil.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java rename to core/src/main/java/org/apache/accumulo/fate/AdminUtil.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java rename to core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java b/core/src/main/java/org/apache/accumulo/fate/Fate.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/Fate.java rename to core/src/main/java/org/apache/accumulo/fate/Fate.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java rename to core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java rename to core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java rename to core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/Repo.java b/core/src/main/java/org/apache/accumulo/fate/Repo.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/Repo.java rename to core/src/main/java/org/apache/accumulo/fate/Repo.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java b/core/src/main/java/org/apache/accumulo/fate/StackOverflowException.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java rename to core/src/main/java/org/apache/accumulo/fate/StackOverflowException.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/core/src/main/java/org/apache/accumulo/fate/TStore.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/TStore.java rename to core/src/main/java/org/apache/accumulo/fate/TStore.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/core/src/main/java/org/apache/accumulo/fate/ZooStore.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/ZooStore.java rename to core/src/main/java/org/apache/accumulo/fate/ZooStore.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java b/core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java rename to core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java b/core/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java rename to core/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/Retry.java b/core/src/main/java/org/apache/accumulo/fate/util/Retry.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/util/Retry.java rename to core/src/main/java/org/apache/accumulo/fate/util/Retry.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java b/core/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java rename to core/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java similarity index 100% rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java rename to core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java b/core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java rename to core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java b/core/src/test/java/org/apache/accumulo/fate/SimpleStore.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java rename to core/src/test/java/org/apache/accumulo/fate/SimpleStore.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java b/core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java rename to core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/util/RetryTest.java b/core/src/test/java/org/apache/accumulo/fate/util/RetryTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/util/RetryTest.java rename to core/src/test/java/org/apache/accumulo/fate/util/RetryTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java similarity index 100% rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java diff --git a/fate/.gitignore b/fate/.gitignore deleted file mode 100644 index e77a822..0000000 --- a/fate/.gitignore +++ /dev/null @@ -1,28 +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. - -# Maven ignores -/target/ - -# IDE ignores -/.settings/ -/.project -/.classpath -/.pydevproject -/.idea -/*.iml -/nbproject/ -/nbactions.xml -/nb-configuration.xml diff --git a/fate/pom.xml b/fate/pom.xml deleted file mode 100644 index 2c8bb6f..0000000 --- a/fate/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - org.apache.accumulo - accumulo-project - 2.0.0-SNAPSHOT - - accumulo-fate - Apache Accumulo Fate - A FAult-Tolerant Executor library used by Apache Accumulo. - - - com.google.guava - guava - - - commons-lang - commons-lang - - - org.apache.zookeeper - zookeeper - - - org.slf4j - slf4j-api - - - junit - junit - test - - - org.easymock - easymock - test - - - org.slf4j - slf4j-log4j12 - test - - - diff --git a/fate/src/main/findbugs/exclude-filter.xml b/fate/src/main/findbugs/exclude-filter.xml deleted file mode 100644 index 249da12..0000000 --- a/fate/src/main/findbugs/exclude-filter.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/fate/src/test/resources/log4j.properties b/fate/src/test/resources/log4j.properties deleted file mode 100644 index 651049d..0000000 --- a/fate/src/test/resources/log4j.properties +++ /dev/null @@ -1,24 +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. - -log4j.rootLogger=INFO, CA -log4j.appender.CA=org.apache.log4j.ConsoleAppender -log4j.appender.CA.layout=org.apache.log4j.PatternLayout -log4j.appender.CA.layout.ConversionPattern=[%t] %-5p %c %x - %m%n - -log4j.logger.org.apache.zookeeper=ERROR,CA -log4j.logger.org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock=WARN -log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR - diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 5fa8e31..df7a972 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -57,10 +57,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-gc diff --git a/pom.xml b/pom.xml index 733602e..6f0c6ba 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,6 @@ assemble client/mapreduce core - fate iterator-test-harness maven-plugin minicluster @@ -322,11 +321,6 @@ org.apache.accumulo - accumulo-fate - ${project.version} - - - org.apache.accumulo accumulo-gc ${project.version} diff --git a/server/base/pom.xml b/server/base/pom.xml index 7e4c5c0..d2e31d3 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -78,10 +78,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-start diff --git a/server/gc/pom.xml b/server/gc/pom.xml index ff0367f..e5de5a3 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -50,10 +50,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-server-base diff --git a/server/master/pom.xml b/server/master/pom.xml index d686b5b..ab84144 100644 --- a/server/master/pom.xml +++ b/server/master/pom.xml @@ -54,10 +54,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-server-base diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index 61a2d34..4c889d0 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -66,10 +66,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-server-base diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml index 6ccb113..d7ca49d 100644 --- a/server/tracer/pom.xml +++ b/server/tracer/pom.xml @@ -50,10 +50,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-server-base diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml index 4fce901..aee011c 100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@ -70,10 +70,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-server-base diff --git a/shell/pom.xml b/shell/pom.xml index 1cb11e6..75f63cd 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -73,10 +73,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-server-base diff --git a/test/pom.xml b/test/pom.xml index 82f2c09..02ded2a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -88,10 +88,6 @@ org.apache.accumulo - accumulo-fate - - - org.apache.accumulo accumulo-gc -- To stop receiving notification emails like this one, please contact ctubbsii@apache.org.