svn commit: r1461105 - /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java

2013-03-26 Thread ecn 
Author: ecn
Date: Tue Mar 26 13:01:58 2013
New Revision: 1461105

URL: http://svn.apache.org/r1461105
Log:
ACCUMULO-1204 fix scansessions entry in json

Modified:

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java?rev=1461105r1=1461104r2=1461105view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
 Tue Mar 26 13:01:58 2013
@@ -59,7 +59,7 @@ public class JSONServlet extends BasicSe
map.put(ingestMB, ingestMB);
map.put(queryMB, queryMB);
map.put(scans, scans);
-   map.put(scans, scansessions);
+   map.put(scanssessions, scansessions);
map.put(holdtime, holdtime);
return map;
   }

svn commit: r1461106 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java

2013-03-26 Thread ecn 
Author: ecn
Date: Tue Mar 26 13:02:49 2013
New Revision: 1461106

URL: http://svn.apache.org/r1461106
Log:
ACCUMULO-1204 fix scansessions entry in json

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1461105

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1461105

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1461105

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1461105

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1461105

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1461105

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1461105

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java?rev=1461106r1=1461105r2=1461106view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
 Tue Mar 26 13:02:49 2013
@@ -59,7 +59,7 @@ public class JSONServlet extends BasicSe
map.put(ingestMB, ingestMB);
map.put(queryMB, queryMB);
map.put(scans, scans);
-   map.put(scans, scansessions);
+   map.put(scanssessions, scansessions);
map.put(holdtime, holdtime);
return map;
   }

Propchange: accumulo/trunk/src/
--
  Merged /accumulo/branches/1.5/src:r1461105

svn commit: r1461111 - /accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java

2013-03-26 Thread ecn 
Author: ecn
Date: Tue Mar 26 13:12:26 2013
New Revision: 146

URL: http://svn.apache.org/r146
Log:
ACCUMULO-581 added last command (?)

Modified:

accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java

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=146r1=1461110r2=146view=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
 Tue Mar 26 13:12:26 2013
@@ -466,6 +466,8 @@ public class ShellServerTest {
   @Test(timeout = 3)
   public void help() throws Exception {
 exec(help -np, true, Help Commands, true);
+shell.getReader().setInput(new ByteArrayInputStream(\n\n.getBytes()));
+exec(?, true, Help Commands, true);
   }
   
   // @Test(timeout = 3)

svn commit: r1461198 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java test/ja

2013-03-26 Thread kturner 
Author: kturner
Date: Tue Mar 26 16:05:28 2013
New Revision: 1461198

URL: http://svn.apache.org/r1461198
Log:
ACCUMULO-1203 applied patch from Kevin Faro that adds human readable date 
formatter

Added:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java
Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java

Added: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java?rev=1461198view=auto
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java
 (added)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java
 Tue Mar 26 16:05:28 2013
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.util.format;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
+
+public class DateStringFormatter implements Formatter {
+  boolean printTimestamps = false;
+  DefaultFormatter defaultFormatter = new DefaultFormatter();
+  public static final String DATE_FORMAT = /MM/dd HH:mm:ss.SSS;
+  // SimpleDataFormat is not thread safe
+  private static final ThreadLocalDateFormat formatter = new 
ThreadLocalDateFormat() {
+@Override
+protected SimpleDateFormat initialValue() {
+  return new SimpleDateFormat(DATE_FORMAT);
+}
+  };
+  
+  @Override
+  public void initialize(IterableEntryKey,Value scanner, boolean 
printTimestamps) {
+this.printTimestamps = printTimestamps;
+defaultFormatter.initialize(scanner, printTimestamps);
+  }
+  @Override
+  public boolean hasNext() {
+return defaultFormatter.hasNext();
+  }
+  @Override
+  public String next() {
+DateFormat timestampformat = null;
+
+if(printTimestamps) {
+  timestampformat = formatter.get();
+}
+
+return defaultFormatter.next(timestampformat);
+  }
+  @Override
+  public void remove() {
+defaultFormatter.remove();
+  }
+}

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java?rev=1461198r1=1461197r2=1461198view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
 Tue Mar 26 16:05:28 2013
@@ -16,6 +16,10 @@
  */
 package org.apache.accumulo.core.util.format;
 
+import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
@@ -27,6 +31,28 @@ import org.apache.hadoop.io.Text;
 public class DefaultFormatter implements Formatter {
   private IteratorEntryKey,Value si;
   private boolean doTimestamps;
+  private static final ThreadLocalDateFormat formatter = new 
ThreadLocalDateFormat() {
+@Override
+protected DateFormat initialValue() {
+  return new DefaultDateFormat();
+}
+
+class DefaultDateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+
+  @Override
+  public StringBuffer format(Date date, StringBuffer toAppendTo, 
FieldPosition fieldPosition) {
+toAppendTo.append(Long.toString(date.getTime()));
+return toAppendTo;
+  }
+
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+return new Date(Long.parseLong(source));
+  }
+  
+}
+  };
   
   @Override
   public void initialize(IterableEntryKey,Value

svn commit: r1461199 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java

2013-03-26 Thread kturner 
Author: kturner
Date: Tue Mar 26 16:11:23 2013
New Revision: 1461199

URL: http://svn.apache.org/r1461199
Log:
ACCUMULO-1203 marked a few things private

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java?rev=1461199r1=1461198r2=1461199view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DateStringFormatter.java
 Tue Mar 26 16:11:23 2013
@@ -24,8 +24,8 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Value;
 
 public class DateStringFormatter implements Formatter {
-  boolean printTimestamps = false;
-  DefaultFormatter defaultFormatter = new DefaultFormatter();
+  private boolean printTimestamps = false;
+  private DefaultFormatter defaultFormatter = new DefaultFormatter();
   public static final String DATE_FORMAT = /MM/dd HH:mm:ss.SSS;
   // SimpleDataFormat is not thread safe
   private static final ThreadLocalDateFormat formatter = new 
ThreadLocalDateFormat() {

svn commit: r1461260 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accu

2013-03-26 Thread ecn 
Author: ecn
Date: Tue Mar 26 18:36:44 2013
New Revision: 1461260

URL: http://svn.apache.org/r1461260
Log:
ACCUMULO-1210 remove stray println

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1461247,1461259

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1461247,1461259

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1461247,1461259

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1461260r1=1461259r2=1461260view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java 
(original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java 
Tue Mar 26 18:36:44 2013
@@ -123,7 +123,6 @@ public class ClientOpts extends Help {
 props.put(loginOption.getKey(), loginOption.getValue());
   
   try {
-System.out.println(props);
 return getInstance().getAuthenticator().login(props);
   } catch (AccumuloSecurityException e) {
 throw new RuntimeException(e);

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1461247,1461259

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1461247,1461259

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1461247,1461259

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1461247,1461259

Propchange: accumulo/trunk/src/
--
  Merged /accumulo/branches/1.5/src:r1461247,1461259

Modified: 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1461260r1=1461259r2=1461260view=diff
==
--- 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java 
(original)
+++ 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java 
Tue Mar 26 18:36:44 2013
@@ -165,12 +165,13 @@ public class ShellServerTest {
   ConstructorDistCp[] constructors = (ConstructorDistCp[]) 
DistCp.class.getConstructors();
   for (ConstructorDistCp constructor : constructors) {
 Class?[] parameterTypes = constructor.getParameterTypes();
-if (parameterTypes.length  1  
parameterTypes[0].equals(Configuration.class))
+if (parameterTypes.length  0  
parameterTypes[0].equals(Configuration.class)) {
   if (parameterTypes.length == 1) {
 return constructor.newInstance(new Configuration());
   } else if (parameterTypes.length == 2) {
 return constructor.newInstance(new Configuration(), null);
   }
+}
   }
 } catch (Exception e) {
   throw new RuntimeException(e);

svn commit: r1461261 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java

2013-03-26 Thread ecn 
Author: ecn
Date: Tue Mar 26 18:39:16 2013
New Revision: 1461261

URL: http://svn.apache.org/r1461261
Log:
ACCUMULO-1194 updated java docs so users will know how to fix their code

Modified:

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java?rev=1461261r1=1461260r2=1461261view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
 Tue Mar 26 18:39:16 2013
@@ -83,7 +83,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(Properties)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector getConnector(String user, byte[] pass) throws 
AccumuloException, AccumuloSecurityException;
@@ -98,7 +98,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(String, 
AuthenticationToken)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException;
@@ -115,7 +115,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(Properties)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector getConnector(String user, ByteBuffer pass) throws 
AccumuloException, AccumuloSecurityException;
@@ -132,7 +132,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(Properties)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector getConnector(String user, CharSequence pass) 
throws AccumuloException, AccumuloSecurityException;

svn commit: r1461262 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/a

2013-03-26 Thread ecn 
Author: ecn
Date: Tue Mar 26 18:39:47 2013
New Revision: 1461262

URL: http://svn.apache.org/r1461262
Log:
ACCUMULO-1194 updated java docs so users will know how to fix their code

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1461261

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1461261

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1461261

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java?rev=1461262r1=1461261r2=1461262view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java 
(original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java 
Tue Mar 26 18:39:47 2013
@@ -83,7 +83,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(Properties)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector getConnector(String user, byte[] pass) throws 
AccumuloException, AccumuloSecurityException;
@@ -98,7 +98,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(String, 
AuthenticationToken)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException;
@@ -115,7 +115,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(Properties)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector getConnector(String user, ByteBuffer pass) throws 
AccumuloException, AccumuloSecurityException;
@@ -132,7 +132,7 @@ public interface Instance {
*   when a generic exception occurs
* @throws AccumuloSecurityException
*   when a user's credentials are invalid
-   * @deprecated since 1.5, use {@link #getConnector(Properties)}
+   * @deprecated since 1.5, use {@link #getConnector(String, Properties)}
*/
   @Deprecated
   public abstract Connector getConnector(String user, CharSequence pass) 
throws AccumuloException, AccumuloSecurityException;

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1461261

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1461261

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1461261

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1461261

Propchange: accumulo/trunk/src/
--
  Merged /accumulo/branches/1.5/src:r1461261

svn commit: r1461265 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java server/src/main/java/org/apache/accumulo/server/monitor/servlets/tra

2013-03-26 Thread vines 
Author: vines
Date: Tue Mar 26 18:45:04 2013
New Revision: 1461265

URL: http://svn.apache.org/r1461265
Log:
ACCUMULO-1161 - fixed logic error for backwards compatability. Also, more 
descriptive error messaging.


Modified:

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java?rev=1461265r1=1461264r2=1461265view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
 Tue Mar 26 18:45:04 2013
@@ -54,6 +54,8 @@ public class AccumuloSecurityException e
 return The configured permission handler failed for some reason;
   case TOKEN_EXPIRED:
 return The supplied token expired, please update and try again;
+  case INSUFFICIENT_PROPERTIES:
+return The login properties supplied are not sufficient for 
authentication. Please check the requested properties and try again;
   case DEFAULT_SECURITY_ERROR:
   default:
 return Unknown security exception;

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=1461265r1=1461264r2=1461265view=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
 Tue Mar 26 18:45:04 2013
@@ -73,7 +73,7 @@ abstract class Basic extends BasicServle
   principal = conf.get(Property.TRACE_USER);
 AuthenticationToken at;
 MapString, String loginMap = 
conf.getAllPropertiesWithPrefix(Property.TRACE_LOGIN_PROPERTIES);
-if (loginMap == null)
+if (loginMap.isEmpty())
   at = new PasswordToken(conf.get(Property.TRACE_PASSWORD).getBytes());
 else{
   Properties props = new Properties();

svn commit: r1461315 - /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java

2013-03-26 Thread ctubbsii 
Author: ctubbsii
Date: Tue Mar 26 21:07:56 2013
New Revision: 1461315

URL: http://svn.apache.org/r1461315
Log:
ACCUMULO-597 Made graphs on monitor page respect, and show the local timezone. 
Can be overridden by setting the TZ environment variable in conf/accumulo-env.sh

Modified:

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java?rev=1461315r1=1461314r2=1461315view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
 Tue Mar 26 21:07:56 2013
@@ -29,7 +29,10 @@ import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
@@ -192,7 +195,7 @@ public class DefaultServlet extends Basi
 
 sb.append(sep);
 sep = ,;
-sb.append([ + point.getFirst() + , + y + ]);
+sb.append([ + utc2local(point.getFirst()) + , + y + ]);
   }
   sb.append(];\n);
 }
@@ -217,11 +220,28 @@ public class DefaultServlet extends Basi
   sb.append(data: d + i + ,  + opts + , color:\ + colors[i] + \ 
});
 }
 sb.append(], );
-sb.append({yaxis:{}, xaxis:{mode:\time\,minTickSize: [1, 
\minute\],timeformat: \%H:%M\, ticks:3}}););
+sb.append({yaxis:{}, xaxis:{mode:\time\,minTickSize: [1, 
\minute\],timeformat: \%H:%Mbr / + getShortTZName() + \, ticks:3}}););
 sb.append(   });\n);
 sb.append(/script\n);
   }
   
+  /**
+   * Shows the current time zone (based on the current time) short name
+   */
+  private static String getShortTZName() {
+TimeZone tz = TimeZone.getDefault();
+return tz.getDisplayName(tz.inDaylightTime(new Date()), TimeZone.SHORT);
+  }
+  
+  /**
+   * Converts a unix timestamp in UTC to one that is relative to the local 
timezone
+   */
+  private static Long utc2local(Long utcMillis) {
+Calendar currentCalendar = Calendar.getInstance(); // default timezone
+currentCalendar.setTimeInMillis(utcMillis + 
currentCalendar.getTimeZone().getOffset(utcMillis));
+return currentCalendar.getTime().getTime();
+  }
+  
   @Override
   protected void pageBody(HttpServletRequest req, HttpServletResponse resp, 
StringBuilder sb) throws IOException {
 if (req.getRequestURI().equals(/docs) || 
req.getRequestURI().equals(/docs/apidocs)) {

svn commit: r1461320 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java

2013-03-26 Thread ctubbsii 
Author: ctubbsii
Date: Tue Mar 26 21:25:44 2013
New Revision: 1461320

URL: http://svn.apache.org/r1461320
Log:
ACCUMULO-597 Merge changes to trunk

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1461266-1461317

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1460921-1461104,1461106-1461110,1461112-1461246,1461248-1461258,1461260,1461262-1461317

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1461266-1461317

Propchange: accumulo/trunk/examples/
--
  Merged 
/accumulo/branches/1.5/examples:r1460921-1461104,1461106-1461110,1461112-1461246,1461248-1461258,1461260,1461262-1461317

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1460921-1461104,1461106-1461110,1461112-1461246,1461248-1461258,1461260,1461262-1461317

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1460921-1461104,1461106-1461110,1461112-1461246,1461248-1461258,1461260,1461262-1461317

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1461266-1461317

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java?rev=1461320r1=1461319r2=1461320view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
 Tue Mar 26 21:25:44 2013
@@ -29,7 +29,10 @@ import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
@@ -192,7 +195,7 @@ public class DefaultServlet extends Basi
 
 sb.append(sep);
 sep = ,;
-sb.append([ + point.getFirst() + , + y + ]);
+sb.append([ + utc2local(point.getFirst()) + , + y + ]);
   }
   sb.append(];\n);
 }
@@ -217,11 +220,28 @@ public class DefaultServlet extends Basi
   sb.append(data: d + i + ,  + opts + , color:\ + colors[i] + \ 
});
 }
 sb.append(], );
-sb.append({yaxis:{}, xaxis:{mode:\time\,minTickSize: [1, 
\minute\],timeformat: \%H:%M\, ticks:3}}););
+sb.append({yaxis:{}, xaxis:{mode:\time\,minTickSize: [1, 
\minute\],timeformat: \%H:%Mbr / + getShortTZName() + \, ticks:3}}););
 sb.append(   });\n);
 sb.append(/script\n);
   }
   
+  /**
+   * Shows the current time zone (based on the current time) short name
+   */
+  private static String getShortTZName() {
+TimeZone tz = TimeZone.getDefault();
+return tz.getDisplayName(tz.inDaylightTime(new Date()), TimeZone.SHORT);
+  }
+  
+  /**
+   * Converts a unix timestamp in UTC to one that is relative to the local 
timezone
+   */
+  private static Long utc2local(Long utcMillis) {
+Calendar currentCalendar = Calendar.getInstance(); // default timezone
+currentCalendar.setTimeInMillis(utcMillis + 
currentCalendar.getTimeZone().getOffset(utcMillis));
+return currentCalendar.getTime().getTime();
+  }
+  
   @Override
   protected void pageBody(HttpServletRequest req, HttpServletResponse resp, 
StringBuilder sb) throws IOException {
 if (req.getRequestURI().equals(/docs) ||

svn commit: r1461330 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/clien

2013-03-26 Thread vines 
Author: vines
Date: Tue Mar 26 21:51:55 2013
New Revision: 1461330

URL: http://svn.apache.org/r1461330
Log:
ACCUMULO-259 - Ripping principal out of ZKAuthenticator login properties and 
made principal part of the login interface


Modified:

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/Authenticator.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/InsecureAuthenticator.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/ZKAuthenticator.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java

accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.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/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1461330r1=1461329r2=1461330view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
 Tue Mar 26 21:51:55 2013
@@ -123,7 +123,7 @@ public class ClientOpts extends Help {
 props.put(loginOption.getKey(), loginOption.getValue());
   
   try {
-return getInstance().getAuthenticator().login(props);
+return getInstance().getAuthenticator().login(principal, props);
   } catch (AccumuloSecurityException e) {
 throw new RuntimeException(e);
   } catch (AccumuloException e) {

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java?rev=1461330r1=1461329r2=1461330view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/Instance.java
 Tue Mar 26 21:51:55 2013
@@ -164,7 +164,7 @@ public interface Instance {
* @param principal
* @param token
*  A known SecurityToken type. If uncertain which should be 
provided, use {@link #getAuthenticatorClassName()} and
-   *  {@link Authenticator#login(Properties)}
+   *  {@link Authenticator#login(String, Properties)}
* @throws AccumuloException
* @throws AccumuloSecurityException
* @since 1.5.0
@@ -184,7 +184,7 @@ public interface Instance {
   
   /**
* 
-   * @return Returns the corresponding Authenticator class, which can be used 
to create a token ({@link Authenticator#login(Properties)} or get a list of
+   * @return Returns the corresponding Authenticator class, which can be used 
to create a token ({@link Authenticator#login(String, Properties)} or get a 
list of
* required properties {@link Authenticator#getProperties()}
* @throws AccumuloException
* @throws AccumuloSecurityException

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1461330r1=1461329r2=1461330view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
 Tue Mar 26 21:51:55 2013
@@ -234,7 +234,7 @@ public class ZooKeeperInstance implement
   
   public Connector getConnector(String principal, Properties props) throws 
AccumuloException, AccumuloSecurityException {
 Authenticator authenticator = getAuthenticator();
-AuthenticationToken authToken = authenticator.login(props);
+AuthenticationToken authToken =

svn commit: r1461381 - in /accumulo/branches/1.5/server/src: main/java/org/apache/accumulo/server/monitor/servlets/trace/ test/java/org/apache/accumulo/server/monitor/

2013-03-26 Thread elserj 
Author: elserj
Date: Wed Mar 27 00:54:55 2013
New Revision: 1461381

URL: http://svn.apache.org/r1461381
Log:
ACCUMULO-1206 Override compareTo to sort the trace entries by start time 
instead of their toString(). Add a simple test to make sure the Comparator 
compares correctly.

Added:

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTraceLinkType.java
   (with props)

accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/monitor/ShowTraceLinkTypeTest.java
   (with props)
Modified:

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java?rev=1461381r1=1461380r2=1461381view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java
 Wed Mar 27 00:54:55 2013
@@ -16,13 +16,11 @@
  */
 package org.apache.accumulo.server.monitor.servlets.trace;
 
-import java.util.Date;
 import java.util.Map.Entry;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.accumulo.trace.thrift.RemoteSpan;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -31,6 +29,7 @@ import org.apache.accumulo.core.trace.Tr
 import org.apache.accumulo.server.monitor.util.Table;
 import org.apache.accumulo.server.monitor.util.celltypes.DurationType;
 import org.apache.accumulo.server.monitor.util.celltypes.StringType;
+import org.apache.accumulo.trace.thrift.RemoteSpan;
 import org.apache.hadoop.io.Text;
 
 
@@ -46,16 +45,6 @@ public class ListType extends Basic {
 return getIntParameter(req, minutes, Summary.DEFAULT_MINUTES);
   }
   
-  private static class ShowTraceLinkType extends StringTypeRemoteSpan {
-
-public String format(Object obj) {
-  if (obj == null)
-return -;
-  RemoteSpan span = (RemoteSpan) obj;
-  return String.format(a href='/trace/show?id=%s'%s/a, 
Long.toHexString(span.traceId), TraceFormatter.formatDate(new 
Date(span.start)));
-}
-  }
-  
   @Override
   public void pageBody(HttpServletRequest req, HttpServletResponse resp, 
StringBuilder sb) throws Exception {
 String type = getType(req);

Added: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTraceLinkType.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTraceLinkType.java?rev=1461381view=auto
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTraceLinkType.java
 (added)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTraceLinkType.java
 Wed Mar 27 00:54:55 2013
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.server.monitor.servlets.trace;
+
+import java.util.Date;
+
+import org.apache.accumulo.core.trace.TraceFormatter;
+import org.apache.accumulo.server.monitor.util.celltypes.StringType;
+import org.apache.accumulo.trace.thrift.RemoteSpan;
+
+/**
+ * 
+ */
+public class ShowTraceLinkType extends StringTypeRemoteSpan {
+  @Override
+  public String format(Object obj) {
+if (obj == null)
+  return -;
+RemoteSpan span = (RemoteSpan) obj;
+return String.format(a href='/trace/show?id=%s'%s/a, 
Long.toHexString(span.traceId), TraceFormatter.formatDate(new 
Date(span.start)));
+  }
+  
+  @Override
+  public int compare(RemoteSpan o1, RemoteSpan o2) {
+if (o1 == null  o2 == null)
+  return 0;
+else if (o1 ==