Repository: accumulo Updated Branches: refs/heads/1.5 37ed176f7 -> 3bcc3c9ed refs/heads/1.6 92551204e -> 2e5064e36 refs/heads/master 9c019c1cb -> c2f59467a
ACCUMULO-3446 Fix compilation. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3bcc3c9e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3bcc3c9e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3bcc3c9e Branch: refs/heads/1.5 Commit: 3bcc3c9ed78fa2444cc95911895e743d38ffc706 Parents: 37ed176 Author: Josh Elser <els...@apache.org> Authored: Tue Dec 23 14:44:58 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Dec 23 14:44:58 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +- server/src/main/java/org/apache/accumulo/server/master/Master.java | 2 +- .../java/org/apache/accumulo/server/master/state/SetGoalState.java | 2 +- .../src/main/java/org/apache/accumulo/server/monitor/Monitor.java | 2 +- .../java/org/apache/accumulo/server/security/SecurityUtil.java | 2 +- .../java/org/apache/accumulo/server/tabletserver/TabletServer.java | 2 +- .../main/java/org/apache/accumulo/server/trace/TraceServer.java | 2 +- .../src/main/java/org/apache/accumulo/server/util/Initialize.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java b/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java index 4c740bb..8ddae92 100644 --- a/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java +++ b/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java @@ -67,7 +67,6 @@ import org.apache.accumulo.core.gc.thrift.GCStatus; import org.apache.accumulo.core.gc.thrift.GcCycleStats; import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.CredentialHelper; -import org.apache.accumulo.core.security.SecurityUtil; import org.apache.accumulo.core.security.thrift.TCredentials; import org.apache.accumulo.core.util.AddressUtil; import org.apache.accumulo.core.util.CachedConfiguration; @@ -84,6 +83,7 @@ import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.server.master.state.tables.TableManager; import org.apache.accumulo.server.security.SecurityConstants; +import org.apache.accumulo.server.security.SecurityUtil; import org.apache.accumulo.server.trace.TraceFileSystem; import org.apache.accumulo.server.util.Halt; import org.apache.accumulo.server.util.OfflineMetadataScanner; http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java index 7d5fca5..6f1b11f 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -83,7 +83,6 @@ import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletLoadState; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.master.thrift.TabletSplit; -import org.apache.accumulo.core.security.SecurityUtil; import org.apache.accumulo.core.security.thrift.TCredentials; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.util.ByteBufferUtil; @@ -145,6 +144,7 @@ import org.apache.accumulo.server.monitor.Monitor; import org.apache.accumulo.server.security.AuditedSecurityOperation; import org.apache.accumulo.server.security.SecurityConstants; import org.apache.accumulo.server.security.SecurityOperation; +import org.apache.accumulo.server.security.SecurityUtil; import org.apache.accumulo.server.tabletserver.TabletTime; import org.apache.accumulo.server.trace.TraceFileSystem; import org.apache.accumulo.server.util.AddressUtil; http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java b/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java index 9508c89..bc1b754 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java +++ b/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java @@ -21,13 +21,13 @@ import static com.google.common.base.Charsets.UTF_8; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.file.FileUtil; import org.apache.accumulo.core.master.thrift.MasterGoalState; -import org.apache.accumulo.core.security.SecurityUtil; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.server.Accumulo; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; +import org.apache.accumulo.server.security.SecurityUtil; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.hadoop.fs.FileSystem; http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java index a0518db..0aac860 100644 --- a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java +++ b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java @@ -43,7 +43,6 @@ import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.master.thrift.MasterMonitorInfo; import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; -import org.apache.accumulo.core.security.SecurityUtil; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.Daemon; import org.apache.accumulo.core.util.LoggingRunnable; @@ -77,6 +76,7 @@ import org.apache.accumulo.server.monitor.servlets.trace.Summary; import org.apache.accumulo.server.problems.ProblemReports; import org.apache.accumulo.server.problems.ProblemType; import org.apache.accumulo.server.security.SecurityConstants; +import org.apache.accumulo.server.security.SecurityUtil; import org.apache.accumulo.server.util.EmbeddedWebServer; import org.apache.accumulo.server.util.Halt; import org.apache.accumulo.server.zookeeper.ZooLock; http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java b/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java index 88e70cd..abcf151 100644 --- a/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java +++ b/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.core.security; +package org.apache.accumulo.server.security; import java.io.IOException; import java.net.InetAddress; http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java index df0b835..9ed9370 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java @@ -108,7 +108,6 @@ import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletLoadState; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.security.SecurityUtil; import org.apache.accumulo.core.security.thrift.TCredentials; import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction; import org.apache.accumulo.core.tabletserver.thrift.ActiveScan; @@ -161,6 +160,7 @@ import org.apache.accumulo.server.problems.ProblemReports; import org.apache.accumulo.server.security.AuditedSecurityOperation; import org.apache.accumulo.server.security.SecurityConstants; import org.apache.accumulo.server.security.SecurityOperation; +import org.apache.accumulo.server.security.SecurityUtil; import org.apache.accumulo.server.tabletserver.Compactor.CompactionInfo; import org.apache.accumulo.server.tabletserver.Tablet.CommitSession; import org.apache.accumulo.server.tabletserver.Tablet.KVEntry; http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java b/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java index 13f555b..1edf050 100644 --- a/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java +++ b/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java @@ -42,7 +42,6 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.file.FileUtil; import org.apache.accumulo.core.iterators.user.AgeOffFilter; -import org.apache.accumulo.core.security.SecurityUtil; import org.apache.accumulo.core.trace.TraceFormatter; import org.apache.accumulo.core.util.AddressUtil; import org.apache.accumulo.core.util.CachedConfiguration; @@ -52,6 +51,7 @@ import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.Accumulo; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; +import org.apache.accumulo.server.security.SecurityUtil; import org.apache.accumulo.server.util.time.SimpleTimer; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.accumulo.start.classloader.AccumuloClassLoader; http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bcc3c9e/server/src/main/java/org/apache/accumulo/server/util/Initialize.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java index c2348ee..9750bc4 100644 --- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java +++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java @@ -43,7 +43,6 @@ import org.apache.accumulo.core.file.FileUtil; import org.apache.accumulo.core.iterators.user.VersioningIterator; import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.master.thrift.MasterGoalState; -import org.apache.accumulo.core.security.SecurityUtil; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; @@ -57,6 +56,7 @@ import org.apache.accumulo.server.iterators.MetadataBulkLoadFilter; import org.apache.accumulo.server.master.state.tables.TableManager; import org.apache.accumulo.server.security.AuditedSecurityOperation; import org.apache.accumulo.server.security.SecurityConstants; +import org.apache.accumulo.server.security.SecurityUtil; import org.apache.accumulo.server.tabletserver.TabletTime; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.hadoop.conf.Configuration;
