Author: ecn
Date: Wed Apr 3 12:58:55 2013
New Revision: 1463988
URL: http://svn.apache.org/r1463988
Log:
ACCUMULO-259 clean up warnings
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1463988&r1=1463987&r2=1463988&view=diff
==============================================================================
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Wed Apr 3 12:58:55 2013
@@ -246,9 +246,11 @@ public class Shell extends ShellOptions
String sysUser = System.getProperty("user.name");
if (sysUser == null)
sysUser = "root";
+ @SuppressWarnings("deprecation")
String user = cl.getOptionValue(usernameOption.getOpt());
String principal = cl.getOptionValue(principalOption.getOpt(), sysUser);
+ @SuppressWarnings("deprecation")
String passw = cl.getOptionValue(passwOption.getOpt(), null);
tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());
String[] loginOptions = cl.getOptionValues(loginOption.getOpt());
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java?rev=1463988&r1=1463987&r2=1463988&view=diff
==============================================================================
---
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
(original)
+++
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
Wed Apr 3 12:58:55 2013
@@ -66,6 +66,7 @@ abstract class Basic extends BasicServle
return TraceFormatter.formatDate(new Date(millis));
}
+ @SuppressWarnings("deprecation")
protected Scanner getScanner(StringBuilder sb) throws AccumuloException,
AccumuloSecurityException {
AccumuloConfiguration conf = Monitor.getSystemConfiguration();
String principal = conf.get(Property.TRACE_PRINCIPAL);
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1463988&r1=1463987&r2=1463988&view=diff
==============================================================================
---
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
(original)
+++
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
Wed Apr 3 12:58:55 2013
@@ -155,6 +155,7 @@ public class TraceServer implements Watc
}
+ @SuppressWarnings("deprecation")
public TraceServer(ServerConfiguration serverConfiguration, String hostname)
throws Exception {
this.serverConfiguration = serverConfiguration;
AccumuloConfiguration conf = serverConfiguration.getConfiguration();
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java?rev=1463988&r1=1463987&r2=1463988&view=diff
==============================================================================
---
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
(original)
+++
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
Wed Apr 3 12:58:55 2013
@@ -24,7 +24,6 @@ import org.apache.accumulo.core.client.I
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.master.state.tables.TableState;
-import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.server.master.LiveTServerSet;
import org.apache.accumulo.server.master.LiveTServerSet.Listener;
Modified:
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java?rev=1463988&r1=1463987&r2=1463988&view=diff
==============================================================================
---
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
(original)
+++
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
Wed Apr 3 12:58:55 2013
@@ -42,7 +42,6 @@ import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
-import org.junit.Test;
public class InMemoryMapTest extends TestCase {
Modified:
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1463988&r1=1463987&r2=1463988&view=diff
==============================================================================
---
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
(original)
+++
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Wed Apr 3 12:58:55 2013
@@ -13,7 +13,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.lang.reflect.Constructor;
-import java.util.Arrays;
import java.util.Map.Entry;
import jline.ConsoleReader;
@@ -31,7 +30,6 @@ import org.apache.accumulo.core.file.Fil
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.shell.Shell;
import org.apache.accumulo.server.trace.TraceServer;
-import org.apache.commons.logging.impl.Log4JCategoryLog;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;