svn commit: r1396385 - /accumulo/trunk/pom.xml

2012-10-09 Thread ctubbsii
Author: ctubbsii
Date: Tue Oct  9 22:27:28 2012
New Revision: 1396385

URL: http://svn.apache.org/viewvc?rev=1396385view=rev
Log:
Fix cobertura plugin for Jenkins builds.

Modified:
accumulo/trunk/pom.xml

Modified: accumulo/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1396385r1=1396384r2=1396385view=diff
==
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Tue Oct  9 22:27:28 2012
@@ -195,6 +195,16 @@
 pluginManagement
   plugins
 plugin
+  groupIdorg.codehaus.mojo/groupId
+  artifactIdcobertura-maven-plugin/artifactId
+  version2.5.2/version
+  configuration
+formats
+  formatxml/format
+/formats
+  /configuration
+/plugin
+plugin
   artifactIdmaven-jar-plugin/artifactId
   configuration
 archive
@@ -367,7 +377,7 @@
   plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdcobertura-maven-plugin/artifactId
-version2.5.1/version
+version2.5.2/version
 configuration
   formats
 formatxml/format




svn commit: r1398586 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell: Shell.java commands/ConfigCommand.java commands/ScanCommand.java

2012-10-15 Thread ctubbsii
Author: ctubbsii
Date: Tue Oct 16 00:27:23 2012
New Revision: 1398586

URL: http://svn.apache.org/viewvc?rev=1398586view=rev
Log:
ACCUMULO-808 Applied patch provided by Jira user jskora after formatting to 
Accumulo template

Modified:

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

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1398586r1=1398585r2=1398586view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
 Tue Oct 16 00:27:23 2012
@@ -766,6 +766,10 @@ public class Shell extends ShellOptions 
   };
   
   public final void printLines(IteratorString lines, boolean paginate) 
throws IOException {
+printLines(lines, paginate, null);
+  }
+
+  public final void printLines(IteratorString lines, boolean paginate, 
PrintLine out) throws IOException {
 int linesPrinted = 0;
 String prompt = -- hit any key to continue or 'q' to quit --;
 int lastPromptLength = prompt.length();
@@ -778,46 +782,59 @@ public class Shell extends ShellOptions 
   if (nextLine == null)
 continue;
   for (String line : nextLine.split(\\n)) {
-if (peek != null) {
-  reader.printString(peek);
-  reader.printNewline();
-  if (paginate) {
-linesPrinted += peek.length() == 0 ? 0 : Math.ceil(peek.length() * 
1.0 / termWidth);
-
-// check if displaying the next line would result in
-// scrolling off the screen
-if (linesPrinted + Math.ceil(lastPromptLength * 1.0 / termWidth) + 
Math.ceil(prompt.length() * 1.0 / termWidth)
-+ Math.ceil(line.length() * 1.0 / termWidth)  maxLines) {
-  linesPrinted = 0;
-  int numdashes = (termWidth - prompt.length()) / 2;
-  String nextPrompt = repeat(-, numdashes) + prompt + 
repeat(-, numdashes);
-  lastPromptLength = nextPrompt.length();
-  reader.printString(nextPrompt);
-  reader.flushConsole();
-  if (Character.toUpperCase((char) reader.readVirtualKey()) == 
'Q') {
+if (out == null) {
+  if (peek != null) {
+reader.printString(peek);
+reader.printNewline();
+if (paginate) {
+  linesPrinted += peek.length() == 0 ? 0 : Math.ceil(peek.length() 
* 1.0 / termWidth);
+  
+  // check if displaying the next line would result in
+  // scrolling off the screen
+  if (linesPrinted + Math.ceil(lastPromptLength * 1.0 / termWidth) 
+ Math.ceil(prompt.length() * 1.0 / termWidth)
+  + Math.ceil(line.length() * 1.0 / termWidth)  maxLines) {
+linesPrinted = 0;
+int numdashes = (termWidth - prompt.length()) / 2;
+String nextPrompt = repeat(-, numdashes) + prompt + 
repeat(-, numdashes);
+lastPromptLength = nextPrompt.length();
+reader.printString(nextPrompt);
+reader.flushConsole();
+if (Character.toUpperCase((char) reader.readVirtualKey()) == 
'Q') {
+  reader.printNewline();
+  return;
+}
 reader.printNewline();
-return;
+termWidth = reader.getTermwidth();
+maxLines = reader.getTermheight();
   }
-  reader.printNewline();
-  termWidth = reader.getTermwidth();
-  maxLines = reader.getTermheight();
 }
   }
+  peek = line;
+} else {
+  out.print(line);
 }
-peek = line;
   }
 }
-if (peek != null) {
+if (out == null  peek != null) {
   reader.printString(peek);
   reader.printNewline();
 }
   }
   
+  public final void printRecords(IterableEntryKey,Value scanner, boolean 
printTimestamps, boolean paginate, Class? extends Formatter formatterClass,
+  PrintLine outFile) throws IOException {
+printLines(FormatterFactory.getFormatter(formatterClass, scanner, 
printTimestamps), paginate, outFile);
+  }
+  
   public final void printRecords(IterableEntryKey,Value scanner, boolean 
printTimestamps, boolean paginate, Class? extends Formatter formatterClass)
   throws IOException {
 printLines(FormatterFactory.getFormatter(formatterClass, scanner, 
printTimestamps), paginate);
   }
   
+  public final void

svn commit: r1411754 - /accumulo/trunk/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf

2012-11-20 Thread ctubbsii
Author: ctubbsii
Date: Tue Nov 20 17:25:29 2012
New Revision: 1411754

URL: http://svn.apache.org/viewvc?rev=1411754view=rev
Log:
ACCUMULO-790 Added missing version 6 test resource for testing prior version of 
RFile with latest code

Added:

accumulo/trunk/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf

Added: 
accumulo/trunk/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf?rev=1411754view=auto
==
Files 
accumulo/trunk/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf
 (added) and 
accumulo/trunk/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf
 Tue Nov 20 17:25:29 2012 differ




svn commit: r1421044 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/client/mapreduce/ main/java/org/apache/accumulo/core/file/rfile/ main/java/org/apache/accumulo/core/util/ test/ja

2012-12-12 Thread ctubbsii
Author: ctubbsii
Date: Wed Dec 12 23:46:48 2012
New Revision: 1421044

URL: http://svn.apache.org/viewvc?rev=1421044view=rev
Log:
ACCUMULO-467 Change the behavior of AccumuloFileOutputFormat to carry Accumulo 
properties in an AccumuloConfiguration object, to remove the side-effect 
behavior of RFileOperations permitting Hadoop configuration to override 
AccumuloConfiguration in all cases.
ACCUMULO-769 The new methods that were added were done so in a way that is 
consistent with Hadoop's context-oriented MapReduce framework.

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java?rev=1421044r1=1421043r2=1421044view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
 Wed Dec 12 23:46:48 2012
@@ -17,88 +17,232 @@
 package org.apache.accumulo.core.client.mapreduce;
 
 import java.io.IOException;
+import java.util.Map.Entry;
 
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.file.FileOperations;
 import org.apache.accumulo.core.file.FileSKVWriter;
-import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.JobContext;
 import org.apache.hadoop.mapreduce.RecordWriter;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 
 /**
- * This class allows MapReduce jobs to use the Accumulo data file format for 
output of data
+ * This class allows MapReduce jobs to write output in the Accumulo data file 
format.br /
+ * Care should be taken to write only sorted data (sorted by {@link Key}), as 
this is an important requirement of Accumulo data files.
  * 
- * The user must specify the output path that does not exist following via 
static method calls to this class:
- * 
- * AccumuloFileOutputFormat.setOutputPath(job, outputDirectory)
- * 
- * Other methods from FileOutputFormat to configure options are ignored 
Compression is using the DefaultCodec and is always on
+ * p
+ * The output path to be created must be specified via {@link 
AccumuloFileOutputFormat#setOutputPath(Job, Path)}. This is inherited from
+ * {@link FileOutputFormat#setOutputPath(Job, Path)}. Other methods from 
{@link FileOutputFormat} are not supported and may be ignored or cause 
failures. Using
+ * other Hadoop configuration options that affect the behavior of the 
underlying files directly in the Job's configuration may work, but are not 
directly
+ * supported at this time.
  */
 public class AccumuloFileOutputFormat extends FileOutputFormatKey,Value {
-  private static final String PREFIX = 
AccumuloOutputFormat.class.getSimpleName();
-  public static final String FILE_TYPE = PREFIX + .file_type;
+  private static final String PREFIX = 
AccumuloOutputFormat.class.getSimpleName() + .;
+  private static final String ACCUMULO_PROPERTY_PREFIX = PREFIX + 
accumuloProperties.;
+  
+  /**
+   * This helper method provides an AccumuloConfiguration object constructed 
from the Accumulo defaults, and overridden with Accumulo properties that have 
been
+   * stored in the Job's configuration
+   * 
+   * @since 1.5.0
+   */
+  protected static AccumuloConfiguration getAccumuloConfiguration(JobContext 
context) {
+ConfigurationCopy acuConf = new 
ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration());
+for (EntryString,String entry : context.getConfiguration())
+  if (entry.getKey().startsWith(ACCUMULO_PROPERTY_PREFIX))
+
acuConf.set(Property.getPropertyByKey(entry.getKey().substring(ACCUMULO_PROPERTY_PREFIX.length())),
 entry.getValue());
+return acuConf;
+  }
   
-  private static final String INSTANCE_HAS_BEEN_SET = PREFIX

svn commit: r1421416 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/util/ContextFactory.java test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java

2012-12-13 Thread ctubbsii
Author: ctubbsii
Date: Thu Dec 13 18:22:00 2012
New Revision: 1421416

URL: http://svn.apache.org/viewvc?rev=1421416view=rev
Log:
ACCUMULO-467, ACCUMULO-769 Partially revert edits that cause strange 
compilation errors on the build server, and remove createJob() from the 
ContextFactory, as it isn't needed.

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java?rev=1421416r1=1421415r2=1421416view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
 Thu Dec 13 18:22:00 2012
@@ -23,7 +23,6 @@ import java.lang.reflect.InvocationTarge
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.InputSplit;
-import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.JobContext;
 import org.apache.hadoop.mapreduce.JobID;
 import org.apache.hadoop.mapreduce.MapContext;
@@ -41,7 +40,6 @@ import org.apache.hadoop.mapreduce.TaskA
  */
 public class ContextFactory {
   
-  private static final Constructor? JOB_CONSTRUCTOR;
   private static final Constructor? JOB_CONTEXT_CONSTRUCTOR;
   private static final Constructor? TASK_CONTEXT_CONSTRUCTOR;
   private static final Constructor? TASK_ID_CONSTRUCTOR;
@@ -60,7 +58,6 @@ public class ContextFactory {
   v21 = false;
 }
 useV21 = v21;
-Class? jobCls;
 Class? jobContextCls;
 Class? taskContextCls;
 Class? mapCls;
@@ -68,7 +65,6 @@ public class ContextFactory {
 Class? innerMapContextCls;
 try {
   if (v21) {
-jobCls = Class.forName(PACKAGE + .Job);
 jobContextCls = Class.forName(PACKAGE + .task.JobContextImpl);
 taskContextCls = Class.forName(PACKAGE + 
.task.TaskAttemptContextImpl);
 TASK_TYPE_CLASS = Class.forName(PACKAGE + .TaskType);
@@ -76,7 +72,6 @@ public class ContextFactory {
 mapCls = Class.forName(PACKAGE + .lib.map.WrappedMapper);
 innerMapContextCls = Class.forName(PACKAGE + 
.lib.map.WrappedMapper$Context);
   } else {
-jobCls = Class.forName(PACKAGE + .Job);
 jobContextCls = Class.forName(PACKAGE + .JobContext);
 taskContextCls = Class.forName(PACKAGE + .TaskAttemptContext);
 TASK_TYPE_CLASS = null;
@@ -88,7 +83,6 @@ public class ContextFactory {
   throw new IllegalArgumentException(Can't find class, e);
 }
 try {
-  JOB_CONSTRUCTOR = jobCls.getConstructor(Configuration.class, 
String.class);
   JOB_CONTEXT_CONSTRUCTOR = 
jobContextCls.getConstructor(Configuration.class, JobID.class);
   JOB_CONTEXT_CONSTRUCTOR.setAccessible(true);
   TASK_CONTEXT_CONSTRUCTOR = 
taskContextCls.getConstructor(Configuration.class, TaskAttemptID.class);
@@ -117,22 +111,6 @@ public class ContextFactory {
 }
   }
   
-  public static Job createJob() {
-return createJob(new Configuration());
-  }
-  
-  public static Job createJob(Configuration conf) {
-try {
-  return (Job) JOB_CONSTRUCTOR.newInstance(conf, new JobID(local, 
0).toString());
-} catch (InstantiationException e) {
-  throw new IllegalArgumentException(Can't create object, e);
-} catch (IllegalAccessException e) {
-  throw new IllegalArgumentException(Can't create object, e);
-} catch (InvocationTargetException e) {
-  throw new IllegalArgumentException(Can't create object, e);
-}
-  }
-  
   public static JobContext createJobContext() {
 return createJobContext(new Configuration());
   }
@@ -174,19 +152,16 @@ public class ContextFactory {
 return createMapContext(m, tac, reader, writer, null, null, split);
   }
   
+  @SuppressWarnings({unchecked, rawtypes})
   public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context 
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac, 
RecordReaderK1,V1 reader,
   RecordWriterK2,V2 writer, OutputCommitter committer, StatusReporter 
reporter, InputSplit split) {
 try {
   if (useV21) {
 Object basis = 
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(), 
tac.getTaskAttemptID(), reader, writer, committer, reporter, split);
-@SuppressWarnings(unchecked)
-MapperK1,V1,K2,V2.Context newInstance = 
(MapperK1,V1,K2,V2.Context) 
MAP_CONTEXT_CONSTRUCTOR.newInstance(MAP_CONSTRUCTOR.newInstance(), basis);
-return newInstance;
+return (Mapper.Context) 
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2) 
MAP_CONSTRUCTOR.newInstance(), basis);
   } else {
-@SuppressWarnings

svn commit: r1429190 [2/2] - in /accumulo/trunk: core/ core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ core/src/main/java/org/apache/accumulo/core/data/thrift/ core/src/main/java/org/a

2013-01-04 Thread ctubbsii
Modified: accumulo/trunk/trace/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/trace/pom.xml?rev=1429190r1=1429189r2=1429190view=diff
==
--- accumulo/trunk/trace/pom.xml (original)
+++ accumulo/trunk/trace/pom.xml Sat Jan  5 01:56:36 2013
@@ -37,6 +37,24 @@
 /plugin
   /plugins
 /pluginManagement
+plugins
+  plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdexec-maven-plugin/artifactId
+executions
+  execution
+idgenerate-core-thrift/id
+phasegenerate-sources/phase
+goals
+  goalexec/goal
+/goals
+configuration
+  
executable${basedir}/src/main/scripts/generate-thrift.sh/executable
+/configuration
+  /execution
+/executions
+  /plugin
+/plugins
   /build
 
   dependencies

Modified: 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java?rev=1429190r1=1429189r2=1429190view=diff
==
--- 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
 (original)
+++ 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
 Sat Jan  5 01:56:36 2013
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java?rev=1429190r1=1429189r2=1429190view=diff
==
--- 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
 (original)
+++ 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
 Sat Jan  5 01:56:36 2013
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java?rev=1429190r1=1429189r2=1429190view=diff
==
--- 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
 (original)
+++ 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
 Sat Jan  5 01:56:36 2013
@@ -1,3 +1,19 @@
+/*
+ * 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
+ * 

svn commit: r1430566 - /accumulo/site/trunk/content/people.mdtext

2013-01-08 Thread ctubbsii
Author: ctubbsii
Date: Tue Jan  8 22:04:38 2013
New Revision: 1430566

URL: http://svn.apache.org/viewvc?rev=1430566view=rev
Log:
ACCUMULO-946 Updated ctubbsii data

Modified:
accumulo/site/trunk/content/people.mdtext

Modified: accumulo/site/trunk/content/people.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1430566r1=1430565r2=1430566view=diff
==
--- accumulo/site/trunk/content/people.mdtext (original)
+++ accumulo/site/trunk/content/people.mdtext Tue Jan  8 22:04:38 2013
@@ -43,7 +43,7 @@ PMC and Committers
   tr class=eventdbimargulies/tdtdBenson 
Margulies/tdtd/tdtd/td/tr
   tr class=oddtdbillie/tdtdBillie Rinaldi/tdtda 
href=http://hortonworks.com/Hortonworks/a/tdtd/td/tr
   tr class=eventdcawaring/tdtdChris 
Waring/tdtd/tdtd/td/tr
-  tr class=oddtdctubbsii/tdtdChristopher 
Tubbs/tdtd/tdtd/td/tr
+  tr class=oddtda 
href=http://people.apache.org/~ctubbsii/;ctubbsii/a/tdtdChristopher 
Tubbs/tdtda href=http://www.nsa.gov/;NSA/a/tdtd-5/td/tr
   tr class=eventddlmarion/tdtdDave Marion/tdtd/tdtd/td/tr
   tr class=oddtdmedined/tdtdDavid 
Medinets/tdtd/tdtd/td/tr
   tr class=eventddrew/tdtdDrew Farris/tdtd/tdtd/td/tr




svn commit: r845613 - in /websites/production/accumulo/content: ./ 1.4/apidocs/

2013-01-08 Thread ctubbsii
Author: ctubbsii
Date: Tue Jan  8 22:10:57 2013
New Revision: 845613

Log:
Committing changes to ctubbsii row

Added:
websites/production/accumulo/content/
  - copied from r845611, websites/staging/accumulo/trunk/content/
websites/production/accumulo/content/1.4/apidocs/
  - copied from r845612, websites/production/accumulo/content/1.4/apidocs/



svn commit: r1431013 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java fate/src/main/j

2013-01-09 Thread ctubbsii
Author: ctubbsii
Date: Wed Jan  9 19:13:18 2013
New Revision: 1431013

URL: http://svn.apache.org/viewvc?rev=1431013view=rev
Log:
ACCUMULO-934 Add default case to switch statements in AgeOffStore, added 
javadoc comment for UNKNOWN fate state

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/TStore.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java?rev=1431013r1=1431012r2=1431013view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
 Wed Jan  9 19:13:18 2013
@@ -40,7 +40,6 @@ import org.apache.accumulo.core.client.a
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.file.FileOperations;
@@ -182,12 +181,11 @@ public class MockTableOperations extends
 long time = System.currentTimeMillis();
 MockTable table = acu.tables.get(tableName);
 if (table == null) {
-  throw new TableNotFoundException(null, tableName,
-  The table was not found);
+  throw new TableNotFoundException(null, tableName, The table was not 
found);
 }
 Path importPath = new Path(dir);
 Path failurePath = new Path(failureDir);
-
+
 FileSystem fs = acu.getFileSystem();
 /*
  * check preconditions
@@ -222,9 +220,8 @@ public class MockTableOperations extends
  */
 for (FileStatus importStatus : fs.listStatus(importPath)) {
   try {
-FileSKVIterator importIterator = FileOperations.getInstance()
-.openReader(importStatus.getPath().toString(), true, fs,
-fs.getConf(), AccumuloConfiguration.getDefaultConfiguration());
+FileSKVIterator importIterator = 
FileOperations.getInstance().openReader(importStatus.getPath().toString(), 
true, fs, fs.getConf(),
+AccumuloConfiguration.getDefaultConfiguration());
 while (importIterator.hasTop()) {
   Key key = importIterator.getTopKey();
   Value value = importIterator.getTopValue();
@@ -233,12 +230,10 @@ public class MockTableOperations extends
   }
   Mutation mutation = new Mutation(key.getRow());
   if (!key.isDeleted()) {
-mutation.put(key.getColumnFamily(), key.getColumnQualifier(),
-new ColumnVisibility(key.getColumnVisibilityData().toArray()),
-key.getTimestamp(), value);
+mutation.put(key.getColumnFamily(), key.getColumnQualifier(), new 
ColumnVisibility(key.getColumnVisibilityData().toArray()), key.getTimestamp(),
+value);
   } else {
-mutation.putDelete(key.getColumnFamily(), key.getColumnQualifier(),
-new ColumnVisibility(key.getColumnVisibilityData().toArray()),
+mutation.putDelete(key.getColumnFamily(), 
key.getColumnQualifier(), new 
ColumnVisibility(key.getColumnVisibilityData().toArray()),
 key.getTimestamp());
   }
   table.addMutation(mutation);
@@ -248,8 +243,7 @@ public class MockTableOperations extends
 FSDataOutputStream failureWriter = null;
 DataInputStream failureReader = null;
 try {
-  failureWriter = fs.create(failurePath.suffix(/
-  + importStatus.getPath().getName()));
+  failureWriter = fs.create(failurePath.suffix(/ + 
importStatus.getPath().getName()));
   failureReader = fs.open(importStatus.getPath());
   int read = 0;
   byte[] buffer = new byte[1024];
@@ -298,7 +292,7 @@ public class MockTableOperations extends
   public void merge(String tableName, Text start, Text end) throws 
AccumuloException, AccumuloSecurityException, TableNotFoundException {
 if (!exists(tableName))
   throw new TableNotFoundException(tableName, tableName, );
-}
+  }
   
   @Override
   public void deleteRows(String tableName, Text start, Text end) throws 
AccumuloException, AccumuloSecurityException, TableNotFoundException {
@@ -333,7 +327,7 @@ public class MockTableOperations extends
   public void flush(String tableName, Text start, Text end, boolean wait) 
throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
 if (!exists(tableName))
   throw new

svn commit: r1431031 - in /accumulo/branches: 1.3.6/ 1.4.1/ 1.4.2/

2013-01-09 Thread ctubbsii
Author: ctubbsii
Date: Wed Jan  9 19:53:06 2013
New Revision: 1431031

URL: http://svn.apache.org/viewvc?rev=1431031view=rev
Log:
ACCUMULO-951 Removed obsolete branches 1.3.6, 1.4.1, and 1.4.2

Removed:
accumulo/branches/1.3.6/
accumulo/branches/1.4.1/
accumulo/branches/1.4.2/



svn commit: r1432331 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/src/main/java/org/apache/accumulo/core/clie

2013-01-11 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 11 23:22:54 2013
New Revision: 1432331

URL: http://svn.apache.org/viewvc?rev=1432331view=rev
Log:
ACCUMULO-961 Document deprecated methods by adding missing annotations; no 
functional code change here

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java?rev=1432331r1=1432330r2=1432331view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
 Fri Jan 11 23:22:54 2013
@@ -207,6 +207,7 @@ public class ClientSideIteratorScanner e
 return new IteratorAdapter(skvi);
   }
   
+  @Deprecated
   @Override
   public void setTimeOut(int timeOut) {
 if (timeOut == Integer.MAX_VALUE)
@@ -215,6 +216,7 @@ public class ClientSideIteratorScanner e
   setTimeout(timeOut, TimeUnit.SECONDS);
   }
   
+  @Deprecated
   @Override
   public int getTimeOut() {
 long timeout = getTimeout(TimeUnit.SECONDS);

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java?rev=1432331r1=1432330r2=1432331view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
 Fri Jan 11 23:22:54 2013
@@ -173,6 +173,7 @@ public class IsolatedScanner extends Sca
   public static interface RowBuffer extends IterableEntryKey,Value {
 void add(EntryKey,Value entry);
 
+@Override
 IteratorEntryKey,Value iterator();
 
 void clear();
@@ -229,6 +230,7 @@ public class IsolatedScanner extends Sca
 return new RowBufferingIterator(scanner, this, range, timeOut, batchSize, 
bufferFactory);
   }
   
+  @Deprecated
   @Override
   public void setTimeOut(int timeOut) {
 if (timeOut == Integer.MAX_VALUE)
@@ -237,6 +239,7 @@ public class IsolatedScanner extends Sca
   setTimeout(timeOut, TimeUnit.SECONDS);
   }
   
+  @Deprecated
   @Override
   public int getTimeOut() {
 long timeout = getTimeout(TimeUnit.SECONDS);

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1432331r1=1432330r2=1432331view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
 Fri Jan 11 23:22:54 2013
@@ -52,18 +52,19 @@ public class ConnectorImpl extends Conne
   private TableOperations tableops = null;
   private InstanceOperations instanceops = null;
   
-/**
- * 
- * Use {@link Instance#getConnector(String, byte[])}
- * 
- * @param instance
- * @param user
- * @param password
- * @throws AccumuloException
- * @throws AccumuloSecurityException
- * @see Instance#getConnector(String user, byte[] password)
- * @deprecated Not for client use
- */
+  /**
+   * 
+   * Use {@link Instance#getConnector(String, byte[])}
+   * 
+   * @param instance
+   * @param user
+   * @param password

svn commit: r1433745 [3/3] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/c

2013-01-15 Thread ctubbsii
Modified: 
accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java?rev=1433745r1=1433744r2=1433745view=diff
==
--- 
accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
 (original)
+++ 
accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
 Tue Jan 15 23:50:42 2013
@@ -63,7 +63,7 @@ import com.beust.jcommander.Parameter;
  * the same way TeraSort does use 100 rows and 10/10 byte key length 
and 78/78 byte value length. Along with the 10 byte row id and \r\n this gives 
you
  * 100 byte row * 100 rows = 1tb. Min/Max ranges for key and value 
parameters are inclusive/inclusive respectively.
  * 
- *  
+ * 
  */
 public class TeraSortIngest extends Configured implements Tool {
   /**
@@ -84,19 +84,23 @@ public class TeraSortIngest extends Conf
 rowCount = length;
   }
   
+  @Override
   public long getLength() throws IOException {
 return 0;
   }
   
+  @Override
   public String[] getLocations() throws IOException {
 return new String[] {};
   }
   
+  @Override
   public void readFields(DataInput in) throws IOException {
 firstRow = WritableUtils.readVLong(in);
 rowCount = WritableUtils.readVLong(in);
   }
   
+  @Override
   public void write(DataOutput out) throws IOException {
 WritableUtils.writeVLong(out, firstRow);
 WritableUtils.writeVLong(out, rowCount);
@@ -119,8 +123,10 @@ public class TeraSortIngest extends Conf
 totalRows = split.rowCount;
   }
   
+  @Override
   public void close() throws IOException {}
   
+  @Override
   public float getProgress() throws IOException {
 return finishedRows / (float) totalRows;
   }
@@ -148,6 +154,7 @@ public class TeraSortIngest extends Conf
   }
 }
 
+@Override
 public RecordReaderLongWritable,NullWritable 
createRecordReader(InputSplit split, TaskAttemptContext context) throws 
IOException {
   // reporter.setStatus(Creating record reader);
   return new RangeRecordReader((RangeInputSplit) split);
@@ -156,6 +163,7 @@ public class TeraSortIngest extends Conf
 /**
  * Create the desired number of splits, dividing the number of rows 
between the mappers.
  */
+@Override
 public ListInputSplit getSplits(JobContext job) {
   long totalRows = job.getConfiguration().getLong(NUMROWS, 0);
   int numSplits = job.getConfiguration().getInt(NUMSPLITS, 1);
@@ -305,6 +313,7 @@ public class TeraSortIngest extends Conf
 value.append(filler[(base + valuelen) % 26], 0, valuelen);
 }
 
+@Override
 public void map(LongWritable row, NullWritable ignored, Context context) 
throws IOException, InterruptedException {
   context.setStatus(Entering);
   long rowId = row.get();
@@ -344,17 +353,17 @@ public class TeraSortIngest extends Conf
   }
   
   static class Opts extends ClientOnRequiredTable {
-@Parameter(names=--count, description=number of rows to ingest, 
required=true)
+@Parameter(names = --count, description = number of rows to ingest, 
required = true)
 long numRows;
-@Parameter(names={-nk, --minKeySize}, description=miniumum key size, 
required=true)
+@Parameter(names = {-nk, --minKeySize}, description = miniumum key 
size, required = true)
 int minKeyLength;
-@Parameter(names={-xk, --maxKeySize}, description=maximum key size, 
required=true)
+@Parameter(names = {-xk, --maxKeySize}, description = maximum key 
size, required = true)
 int maxKeyLength;
-@Parameter(names={-nv, --minValueSize}, description=minimum key 
size, required=true)
+@Parameter(names = {-nv, --minValueSize}, description = minimum key 
size, required = true)
 int minValueLength;
-@Parameter(names={-xv, --maxValueSize}, description=maximum key 
size, required=true)
+@Parameter(names = {-xv, --maxValueSize}, description = maximum key 
size, required = true)
 int maxValueLength;
-@Parameter(names=--splits, description=number of splits to create in 
the table)
+@Parameter(names = --splits, description = number of splits to create 
in the table)
 int splits = 0;
   }
   
@@ -374,7 +383,7 @@ public class TeraSortIngest extends Conf
 
 job.setOutputFormatClass(AccumuloOutputFormat.class);
 opts.setAccumuloConfigs(job);
-AccumuloOutputFormat.setMaxMutationBufferSize(job.getConfiguration(), 10L 
* 1000 * 1000);
+AccumuloOutputFormat.setMaxMutationBufferSize(job, 10L * 1000 * 1000);
 
 Configuration conf = job.getConfiguration();
 conf.setLong(NUMROWS, 

svn commit: r1433751 - in /accumulo/contrib/bsp/trunk: ./ src/main/java/org/apache/accumulo/bsp/ src/test/java/org/apache/accumulo/core/client/mapreduce/

2013-01-15 Thread ctubbsii
Author: ctubbsii
Date: Tue Jan 15 23:58:38 2013
New Revision: 1433751

URL: http://svn.apache.org/viewvc?rev=1433751view=rev
Log:
ACCUMULO-532 Update contrib to reflect changes in ACCUMULO-769 and to use the 
released versions of Hama BSP so we can close this ticket

Added:

accumulo/contrib/bsp/trunk/src/main/java/org/apache/accumulo/bsp/MapreduceWrapper.java

accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java

accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
  - copied, changed from r1431766, 
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
Removed:

accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
Modified:
accumulo/contrib/bsp/trunk/pom.xml

accumulo/contrib/bsp/trunk/src/main/java/org/apache/accumulo/bsp/AccumuloInputFormat.java

accumulo/contrib/bsp/trunk/src/main/java/org/apache/accumulo/bsp/AccumuloOutputFormat.java

accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java

Modified: accumulo/contrib/bsp/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/contrib/bsp/trunk/pom.xml?rev=1433751r1=1433750r2=1433751view=diff
==
--- accumulo/contrib/bsp/trunk/pom.xml (original)
+++ accumulo/contrib/bsp/trunk/pom.xml Tue Jan 15 23:58:38 2013
@@ -19,12 +19,113 @@
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-bsp/artifactId
   version1.5.0-SNAPSHOT/version
-  
+
+  parent
+groupIdorg.apache/groupId
+artifactIdapache/artifactId
+version12/version
+  /parent
+
+  properties
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
+  /properties
+
+  build
+pluginManagement
+  plugins
+plugin
+  groupIdorg.eclipse.m2e/groupId
+  artifactIdlifecycle-mapping/artifactId
+  version1.0.0/version
+  configuration
+lifecycleMappingMetadata
+  pluginExecutions
+pluginExecution
+  pluginExecutionFilter
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-remote-resources-plugin/artifactId
+versionRange[1.0,)/versionRange
+goals
+  goalprocess/goal
+/goals
+  /pluginExecutionFilter
+  action
+ignore /
+  /action
+/pluginExecution
+  /pluginExecutions
+/lifecycleMappingMetadata
+  /configuration
+/plugin
+plugin
+  groupIdorg.apache.maven.plugins/groupId
+  artifactIdmaven-compiler-plugin/artifactId
+  configuration
+source1.6/source
+target1.6/target
+  /configuration
+/plugin
+  /plugins
+/pluginManagement
+  /build
+
+  profiles
+profile
+  idintegration-tests/id
+  activation
+property
+  name!skipTests/name
+/property
+  /activation
+  build
+plugins
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-jar-plugin/artifactId
+executions
+  execution
+idcreate-integration-test-jar/id
+phasepre-integration-test/phase
+goals
+  goaltest-jar/goal
+/goals
+configuration
+  finalNameintegration/finalName
+/configuration
+  /execution
+/executions
+  /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-failsafe-plugin/artifactId
+executions
+  execution
+idrun-integration-tests/id
+phaseintegration-test/phase
+goals
+  goalintegration-test/goal
+/goals
+  /execution
+  execution
+idverify-integration-tests/id
+phaseverify/phase
+goals
+  goalverify/goal
+/goals
+  /execution
+/executions
+  /plugin
+/plugins
+  /build
+/profile
+  /profiles
+
   dependencies
 dependency
   groupIdorg.apache.hama/groupId
   artifactIdhama-core/artifactId
-  version0.4.0-incubating/version
+  version0.6.0/version
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
@@ -34,7 +135,13 @@
 dependency
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop

svn commit: r1435013 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/core

2013-01-17 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 18 03:18:29 2013
New Revision: 1435013

URL: http://svn.apache.org/viewvc?rev=1435013view=rev
Log:
ACCUMULO-955 Made BatchWriterConfig Writable, so it can be stored in a job's 
configuration in a human-readable way. Updated AccumuloOutputFormat to use it, 
and
added unit tests for ACCUMULO-706 and ACCUMULO-955. Added an additional check 
for a reasonable minimum maxMemory value.

Added:

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java

accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java?rev=1435013r1=1435012r2=1435013view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
 Fri Jan 18 03:18:29 2013
@@ -16,24 +16,43 @@
  */
 package org.apache.accumulo.core.client;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringUtils;
+
 /**
  * This object holds configuration settings used to instantiate a {@link 
BatchWriter}
  */
-public class BatchWriterConfig {
-  private long maxMemory = 50 * 1024 * 1024;
-  private long maxLatency = 12;
-  private long timeout = Long.MAX_VALUE;
-  private int maxWriteThreads = 3;
+public class BatchWriterConfig implements Writable {
+  
+  private static final Long DEFAULT_MAX_MEMORY = 50 * 1024 * 1024l;
+  private Long maxMemory = null;
+  
+  private static final Long DEFAULT_MAX_LATENCY = 2 * 60 * 1000l;
+  private Long maxLatency = null;
+  
+  private static final Long DEFAULT_TIMEOUT = Long.MAX_VALUE;
+  private Long timeout = null;
+  
+  private static final Integer DEFAULT_MAX_WRITE_THREADS = 3;
+  private Integer maxWriteThreads = null;
   
   /**
* 
* @param maxMemory
-   *  size in bytes of the maximum memory to batch before writing. 
Defaults to 50M.
+   *  size in bytes of the maximum memory to batch before writing. 
Minimum 1K. Defaults to 50M.
*/
   
   public BatchWriterConfig setMaxMemory(long maxMemory) {
+if (maxMemory  1024)
+  throw new IllegalArgumentException(Max memory is too low at  + 
maxMemory + . Minimum 1K.);
 this.maxMemory = maxMemory;
 return this;
   }
@@ -93,18 +112,76 @@ public class BatchWriterConfig {
   }
   
   public long getMaxMemory() {
-return maxMemory;
+return maxMemory != null ? maxMemory : DEFAULT_MAX_MEMORY;
   }
   
   public long getMaxLatency(TimeUnit timeUnit) {
-return timeUnit.convert(maxLatency, TimeUnit.MILLISECONDS);
+return timeUnit.convert(maxLatency != null ? maxLatency : 
DEFAULT_MAX_LATENCY, TimeUnit.MILLISECONDS);
   }
   
   public long getTimeout(TimeUnit timeUnit) {
-return timeUnit.convert(timeout, TimeUnit.MILLISECONDS);
+return timeUnit.convert(timeout != null ? timeout : DEFAULT_TIMEOUT, 
TimeUnit.MILLISECONDS);
   }
   
   public int getMaxWriteThreads() {
-return maxWriteThreads;
+return maxWriteThreads != null ? maxWriteThreads : 
DEFAULT_MAX_WRITE_THREADS;
+  }
+  
+  @Override
+  public void write(DataOutput out) throws IOException {
+// write this out in a human-readable way
+ArrayListString fields = new ArrayListString();
+if (maxMemory != null)
+  addField(fields, maxMemory, maxMemory);
+if (maxLatency != null)
+  addField(fields, maxLatency, maxLatency);
+if (maxWriteThreads != null)
+  addField(fields, maxWriteThreads, maxWriteThreads);
+if (timeout != null)
+  addField(fields, timeout, timeout);
+String output = StringUtils.join(,, fields);
+
+byte[] bytes = output.getBytes(Charset.forName(UTF-8));
+byte[] len = String.format(%6s#, Integer.toString(bytes.length, 
36)).getBytes(UTF-8);
+if (len.length != 7)
+  throw

svn commit: r1435230 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java proxy/pom.xml

2013-01-18 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 18 16:25:53 2013
New Revision: 1435230

URL: http://svn.apache.org/viewvc?rev=1435230view=rev
Log:
ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated 
that didn't exist in prior version.
ACCUMULO-975 Fix proxy pom.xml to support Hadoop 2.0

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
accumulo/trunk/proxy/pom.xml

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1435230r1=1435229r2=1435230view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
 Fri Jan 18 16:25:53 2013
@@ -85,7 +85,6 @@ import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.JobContext;
 import org.apache.hadoop.mapreduce.RecordReader;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
@@ -862,16 +861,6 @@ public abstract class InputFormatBaseK,
   scannerIterator = scanner.iterator();
 }
 
-/**
- * @deprecated since 1.5.0; Use {@link #initialize(InputSplit, 
TaskAttemptContext)} instead. br /
- * This class is written for the Hadoop MapReduce framework, 
and is not guaranteed to function in other frameworks. Other frameworks using 
this
- * class are expected to wrap their objects to conform to the 
supported framework.
- */
-@Deprecated
-public void initialize(InputSplit inSplit, Configuration conf) throws 
IOException {
-  initialize(inSplit, new TaskAttemptContext(conf, new TaskAttemptID()));
-}
-
 @Override
 public void close() {}
 
@@ -1093,14 +1082,6 @@ public abstract class InputFormatBaseK,
   }
   
   /**
-   * @deprecated since 1.5.0; Use {@link #getSplits(JobContext)} instead.
-   */
-  @Deprecated
-  public ListInputSplit getSplits(Configuration conf) throws IOException {
-return getSplits(new TaskAttemptContext(conf, new TaskAttemptID()));
-  }
-  
-  /**
* The Class RangeInputSplit. Encapsulates an Accumulo range for use in Map 
Reduce jobs.
*/
   public static class RangeInputSplit extends InputSplit implements Writable {

Modified: accumulo/trunk/proxy/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1435230r1=1435229r2=1435230view=diff
==
--- accumulo/trunk/proxy/pom.xml (original)
+++ accumulo/trunk/proxy/pom.xml Fri Jan 18 16:25:53 2013
@@ -15,92 +15,125 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --
-project
-   xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
-   xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-   modelVersion4.0.0/modelVersion
-   parent
-   artifactIdaccumulo/artifactId
-   groupIdorg.apache.accumulo/groupId
-   version1.5.0-SNAPSHOT/version
-   /parent
-   artifactIdaccumulo-proxy/artifactId
-   nameaccumulo-proxy/name
-   urlhttp://maven.apache.org/url
-   properties
-   
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
-   /properties
-   build
-   pluginManagement
-   plugins
-   plugin
-   
artifactIdmaven-jar-plugin/artifactId
-   configuration
-   
outputDirectory../lib/outputDirectory
-   /configuration
-   /plugin
-   /plugins
-   /pluginManagement
-   plugins
-   plugin
-   groupIdorg.codehaus.mojo/groupId
-   artifactIdexec-maven-plugin/artifactId
-   executions
-   execution
-   idgenerate-core-thrift/id
-   phasegenerate-sources/phase
-   goals
-   goalexec/goal
-   /goals
-   configuration

svn commit: r1435592 - in /accumulo/trunk: core/pom.xml proxy/pom.xml proxy/src/main/scripts/generate-thrift.sh trace/pom.xml

2013-01-19 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 19 16:37:57 2013
New Revision: 1435592

URL: http://svn.apache.org/viewvc?rev=1435592view=rev
Log:
ACCUMULO-979 Point the generate-thrift script for the proxy to the core, to get 
any future benefits from changes to that script; rename the maven tasks for 
building scripts, because they were misleading

Modified:
accumulo/trunk/core/pom.xml
accumulo/trunk/proxy/pom.xml
accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh
accumulo/trunk/trace/pom.xml

Modified: accumulo/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1435592r1=1435591r2=1435592view=diff
==
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Sat Jan 19 16:37:57 2013
@@ -44,7 +44,7 @@
 artifactIdexec-maven-plugin/artifactId
 executions
   execution
-idgenerate-core-thrift/id
+idgenerate-thrift/id
 phasegenerate-sources/phase
 goals
   goalexec/goal

Modified: accumulo/trunk/proxy/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1435592r1=1435591r2=1435592view=diff
==
--- accumulo/trunk/proxy/pom.xml (original)
+++ accumulo/trunk/proxy/pom.xml Sat Jan 19 16:37:57 2013
@@ -46,7 +46,7 @@
 artifactIdexec-maven-plugin/artifactId
 executions
   execution
-idgenerate-core-thrift/id
+idgenerate-thrift/id
 phasegenerate-sources/phase
 goals
   goalexec/goal

Modified: accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh?rev=1435592r1=1435591r2=1435592view=diff
==
--- accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh (original)
+++ accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh Sat Jan 19 
16:37:57 2013
@@ -15,96 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This script will regenerate the thrift code for Accumulo's RPC mechanisms.
+# This script will regenerate the thrift code for cloudtrace.
+INCLUDED_MODULES=(-)
+BASE_OUTPUT_PACKAGE='org.apache.accumulo'
+PACKAGES_TO_GENERATE=(proxy)
 
-# NOTES:
-#   To support this script being called by other modules, only edit the right 
side.
-#   In other scripts, set the variables that diverge from the defaults below, 
then call this script.
-#   PACKAGES_TO_GENERATE should be an array, and each element should be the 
portion of the dot-separated Java package
-# name following the BASE_OUTPUT_PACKAGE
-#   Leave the BUILD_DIR and FINAL_DIR alone for Maven builds.
-#   INCLUDED_MODULES should be an array that includes other Maven modules with 
src/main/thrift directories
-#   Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
-# 

-[ -z $REQUIRED_THRIFT_VERSION ]  REQUIRED_THRIFT_VERSION='0.9'
-[ -z $INCLUDED_MODULES ] INCLUDED_MODULES=
-[ -z $BASE_OUTPUT_PACKAGE ]  BASE_OUTPUT_PACKAGE='org.apache.accumulo'
-[ -z $PACKAGES_TO_GENERATE ] PACKAGES_TO_GENERATE=(proxy)
-[ -z $BUILD_DIR ]BUILD_DIR='target'
-[ -z $FINAL_DIR ]FINAL_DIR='src/main/java'
-# 

+. ../core/src/main/scripts/generate-thrift.sh
 
-fail() {
-  echo $@
-  exit 1
-}
-
-# Test to see if we have thrift installed
-VERSION=$(thrift -version 2/dev/null | grep -F ${REQUIRED_THRIFT_VERSION} | 
 wc -l)
-if [ $VERSION -ne 1 ] ; then 
-  # Nope: bail
-  echo 
-  echo *** thrift is not available
-  echo ***   expecting 'thrift -version' to return ${REQUIRED_THRIFT_VERSION}
-  echo *** generated code will not be updated
-  echo 
-  exit 0
-fi
-
-# Include thrift sources from additional modules
-THRIFT_ARGS=''
-for i in ${INCLUDED_MODULES[@]}; do
-  if [ ${i} != '-' ]; then
-test -d ${i} || fail missing required included module ${i}
-THRIFT_ARGS=${THRIFT_ARGS} -I ${i}/src/main/thrift
-  fi
-done
-
-# Ensure output directories are created
-THRIFT_ARGS=${THRIFT_ARGS} -o $BUILD_DIR
-mkdir -p $BUILD_DIR
-rm -rf $BUILD_DIR/gen-java
-for f in src/main/thrift/*.thrift; do
-  thrift ${THRIFT_ARGS} --gen java $f || fail unable to generate java thrift 
classes
-  thrift ${THRIFT_ARGS} --gen py $f || fail unable to generate python thrift 
classes
-  thrift ${THRIFT_ARGS} --gen rb $f || fail unable to generate ruby thrift 
classes
-  thrift

svn commit: r1437073 [1/3] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/c

2013-01-22 Thread ctubbsii
Author: ctubbsii
Date: Tue Jan 22 18:07:17 2013
New Revision: 1437073

URL: http://svn.apache.org/viewvc?rev=1437073view=rev
Log:
ACCUMULO-769 Modify mapreduce API to use the Hadoop static configurator 
conventions, but done in a way that allows us to standardize and reuse 
configurator code to support multiple frameworks.

Added:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/ConfiguratorBase.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/FileOutputConfigurator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/OutputConfigurator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/package-info.java
Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java

accumulo/trunk/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/CopyTool.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/MapRedVerifyTool.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java?rev=1437073r1=1437072r2=1437073view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
 Tue Jan 22 18:07:17 2013
@@ -41,8 +41,12 @@ public class ClientOnDefaultTable extend
   @Override
   public void setAccumuloConfigs(Job job) {
 super.setAccumuloConfigs(job);
-AccumuloInputFormat.setInputInfo(job, user, getPassword(), getTableName(), 
auths);
-AccumuloOutputFormat.setOutputInfo(job, user, getPassword(), true, 
getTableName());
+AccumuloInputFormat.setConnectorInfo(job, user, getPassword());
+AccumuloInputFormat.setInputTableName(job, getTableName());
+AccumuloInputFormat.setScanAuthorizations(job, auths);
+AccumuloOutputFormat.setConnectorInfo(job, user, getPassword());
+AccumuloOutputFormat.setCreateTables(job, true);
+AccumuloOutputFormat.setDefaultTableName(job, getTableName());
   }
   
 }

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java?rev=1437073r1=1437072r2=1437073view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
 Tue Jan 22 18:07:17 2013
@@ -30,7 +30,11 @@ public class ClientOnRequiredTable exten
   @Override
   public void setAccumuloConfigs(Job job) {
 super.setAccumuloConfigs(job);
-AccumuloInputFormat.setInputInfo(job, user, getPassword(), tableName, 
auths);
-AccumuloOutputFormat.setOutputInfo(job, user, getPassword(), true, 
tableName);
+AccumuloInputFormat.setConnectorInfo(job, user, getPassword());
+AccumuloInputFormat.setInputTableName(job, tableName);
+AccumuloInputFormat.setScanAuthorizations(job, auths

svn commit: r1437073 [3/3] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/c

2013-01-22 Thread ctubbsii
Added: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java?rev=1437073view=auto
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
 (added)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
 Tue Jan 22 18:07:17 2013
@@ -0,0 +1,532 @@
+/**
+ * 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.client.mapreduce.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ClientSideIteratorScanner;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.IsolatedScanner;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
+import org.apache.accumulo.core.client.impl.TabletLocator;
+import org.apache.accumulo.core.client.mock.MockTabletLocator;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.security.thrift.AuthInfo;
+import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.util.TextUtil;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.util.StringUtils;
+
+/**
+ * @since 1.5.0
+ */
+public class InputConfigurator extends ConfiguratorBase {
+  
+  /**
+   * Configuration keys for {@link Scanner}.
+   * 
+   * @since 1.5.0
+   */
+  public static enum ScanOpts {
+TABLE_NAME, AUTHORIZATIONS, RANGES, COLUMNS, ITERATORS
+  }
+  
+  /**
+   * Configuration keys for various features.
+   * 
+   * @since 1.5.0
+   */
+  public static enum Features {
+AUTO_ADJUST_RANGES, SCAN_ISOLATION, USE_LOCAL_ITERATORS, SCAN_OFFLINE
+  }
+  
+  /**
+   * Sets the name of the input table, over which this job will scan.
+   * 
+   * @param implementingClass
+   *  the class whose name will be used as a prefix for the property 
configuration key
+   * @param conf
+   *  the Hadoop configuration object to configure
+   * @param tableName
+   *  the table to use when the tablename is null in the write call
+   * @since 1.5.0
+   */
+  public static void setInputTableName(Class? implementingClass, 
Configuration conf, String tableName) {
+ArgumentChecker.notNull(tableName);
+conf.set(enumToConfKey(implementingClass, ScanOpts.TABLE_NAME), tableName);
+  }
+  
+  /**
+   * Gets the table name from the configuration.
+   * 
+   * @param implementingClass
+   *  the class whose name will be used as a prefix for the property 
configuration key
+   * @param conf
+   *  the Hadoop configuration object to configure
+   * @return the table name
+   * @since 1.5.0
+   * @see #setInputTableName(Class, Configuration, String)
+   */
+  public static String getInputTableName(Class? implementingClass, 
Configuration conf) {
+return conf.get(enumToConfKey(implementingClass, ScanOpts.TABLE_NAME));
+  }
+  
+  /**
+   * Sets the {@link Authorizations} 

svn commit: r1437074 - in /accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce: AccumuloInputFormatIT.java AccumuloOutputFormatIT.java

2013-01-22 Thread ctubbsii
Author: ctubbsii
Date: Tue Jan 22 18:08:30 2013
New Revision: 1437074

URL: http://svn.apache.org/viewvc?rev=1437074view=rev
Log:
ACCUMULO-769 Fix bsp contrib build due to mapreduce changes in previous commit

Modified:

accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java

accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java

Modified: 
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
URL: 
http://svn.apache.org/viewvc/accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java?rev=1437074r1=1437073r2=1437074view=diff
==
--- 
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
 (original)
+++ 
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
 Tue Jan 22 18:08:30 2013
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 
 import org.apache.accumulo.bsp.AccumuloInputFormat;
 import org.apache.accumulo.bsp.MapreduceWrapper;
@@ -30,7 +31,6 @@ import org.apache.accumulo.core.client.m
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
@@ -97,7 +97,8 @@ public class AccumuloInputFormatIT {
 bspJob.setBspClass(InputFormatTestBSP.class);
 bspJob.setInputPath(new Path(test));
 
-AccumuloInputFormat.setInputInfo(job, root, .getBytes(), testtable, 
new Authorizations());
+AccumuloInputFormat.setConnectorInfo(job, root, 
.getBytes(Charset.forName(UTF-8)));
+AccumuloInputFormat.setInputTableName(job, testtable);
 AccumuloInputFormat.setMockInstance(job, testmapinstance);
 
 AccumuloInputFormat input = new AccumuloInputFormat();

Modified: 
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
URL: 
http://svn.apache.org/viewvc/accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java?rev=1437074r1=1437073r2=1437074view=diff
==
--- 
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
 (original)
+++ 
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
 Tue Jan 22 18:08:30 2013
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
@@ -124,9 +125,11 @@ public class AccumuloOutputFormatIT {
 
 Job job = MapreduceWrapper.wrappedJob(bspJob);
 
-AccumuloInputFormat.setInputInfo(job, root, .getBytes(), testtable1, 
new Authorizations());
+AccumuloInputFormat.setConnectorInfo(job, root, 
.getBytes(Charset.forName(UTF-8)));
+AccumuloInputFormat.setInputTableName(job, testtable1);
 AccumuloInputFormat.setMockInstance(job, testmrinstance);
-AccumuloOutputFormat.setOutputInfo(job, root, .getBytes(), false, 
testtable2);
+AccumuloOutputFormat.setConnectorInfo(job, root, 
.getBytes(Charset.forName(UTF-8)));
+AccumuloOutputFormat.setDefaultTableName(job, testtable2);
 AccumuloOutputFormat.setMockInstance(job, testmrinstance);
 
 AccumuloInputFormat input = new AccumuloInputFormat();




svn commit: r1438191 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/file/ core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/ core/src/main/java/org/apache/accumulo/core/

2013-01-24 Thread ctubbsii
Author: ctubbsii
Date: Thu Jan 24 20:58:22 2013
New Revision: 1438191

URL: http://svn.apache.org/viewvc?rev=1438191view=rev
Log:
ACCUMULO-971 Fix some malformed javadocs

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/FileManager.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java?rev=1438191r1=1438190r2=1438191view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
 Thu Jan 24 20:58:22 2013
@@ -280,11 +280,11 @@ public class BloomFilterLayer {
 }
 
 /**
- * Checks if this MyMapFile has the indicated key. The membership test is 
performed using a Bloom filter, so the result has always non-zero probability of
+ * Checks if this {@link RFile} contains keys from this range. The 
membership test is performed using a Bloom filter, so the result has always 
non-zero probability of
  * false positives.
  * 
- * @param key
- *  key to check
+ * @param range
+ *  range of keys to check
  * @return false iff key doesn't exist, true if key probably exists.
  * @throws IOException
  */

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java?rev=1438191r1=1438190r2=1438191view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
 Thu Jan 24 20:58:22 2013
@@ -159,7 +159,6 @@ public final class BCFile {
   /**
* Current size of compressed data.
* 
-   * @return
* @throws IOException
*/
   long getCompressedSize() throws IOException {

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java?rev=1438191r1=1438190r2=1438191view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
 Thu Jan 24 20:58:22 2013
@@ -877,7 +877,6 @@ public class TFile {
  *  the input key
  * @param greater
  *  boolean flag
- * @return
  * @throws IOException
  */
 Location getBlockContainsKey(RawComparable key, boolean greater) throws 
IOException {

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java?rev=1438191r1=1438190r2=1438191view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
 Thu Jan 24 20:58:22 2013
@@ -607,7 +607,7 @@ abstract public class TransformingIterat
   
   /**
* Indicates the prefix of keys that will be transformed by this iterator. 
In other words, this is the part of the key that will inot/i be transformed 
by
-   * this iterator. For example, if this method returns ROW_COLFAM, then 
{@link #transformKey(Key)} may be changing the column qualifier, column 
visibility, or
+   * this iterator. For example, if this method returns ROW_COLFAM, then 
{@link #transformKeys()} may be changing the column qualifier, column 
visibility, or
* timestamp, but it won't be changing the row or column family.
* 
* @return the part of the key this iterator is not transforming

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/FileManager.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server

svn commit: r1438248 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/client/BatchWriterConfig.java test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java

2013-01-24 Thread ctubbsii
Author: ctubbsii
Date: Thu Jan 24 22:51:06 2013
New Revision: 1438248

URL: http://svn.apache.org/viewvc?rev=1438248view=rev
Log:
ACCUMULO-984 Prevent unexpected behavior when using a really small timeout 
values, that get truncated to zero on conversion internally.
ACCUMULO-955 Removed the minimum value for maxMemory, and accept any 
non-negative value.

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java?rev=1438248r1=1438247r2=1438248view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
 Thu Jan 24 22:51:06 2013
@@ -45,27 +45,45 @@ public class BatchWriterConfig implement
   private Integer maxWriteThreads = null;
   
   /**
+   * Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.br /
+   * If set to a value smaller than a single mutation, then it will {@link 
BatchWriter#flush()} after each added mutation. Must be non-negative.
+   * 
+   * p
+   * bDefault:/b 50M
* 
* @param maxMemory
-   *  size in bytes of the maximum memory to batch before writing. 
Minimum 1K. Defaults to 50M.
+   *  max size in bytes
+   * @throws IllegalArgumentException
+   *   if {@code maxMemory} is less than 0
+   * @return {@code this} to allow chaining of set methods
*/
-  
   public BatchWriterConfig setMaxMemory(long maxMemory) {
-if (maxMemory  1024)
-  throw new IllegalArgumentException(Max memory is too low at  + 
maxMemory + . Minimum 1K.);
+if (maxMemory  0)
+  throw new IllegalArgumentException(Max memory must be non-negative.);
 this.maxMemory = maxMemory;
 return this;
   }
   
   /**
+   * Sets the maximum amount of time to hold the data in memory before 
flushing it to servers.br /
+   * For no maximum, set to zero, or {@link Long#MAX_VALUE} with {@link 
TimeUnit#MILLISECONDS}.
+   * 
+   * p
+   * {@link TimeUnit#MICROSECONDS} or {@link TimeUnit#NANOSECONDS} will be 
truncated to the nearest {@link TimeUnit#MILLISECONDS}.br /
+   * If this truncation would result in making the value zero when it was 
specified as non-zero, then a minimum value of one {@link 
TimeUnit#MILLISECONDS} will
+   * be used.
+   * 
+   * p
+   * bDefault:/b 120 seconds
+   * 
* @param maxLatency
-   *  The maximum amount of time to hold data in memory before 
flushing it to servers. For no max set to zero or Long.MAX_VALUE with 
TimeUnit.MILLIS.
-   *  Defaults to 120 seconds.
+   *  the maximum latency, in the unit specified by the value of 
{@code timeUnit}
* @param timeUnit
-   *  Determines how maxLatency will be interpreted.
-   * @return this to allow chaining of set methods
+   *  determines how {@code maxLatency} will be interpreted
+   * @throws IllegalArgumentException
+   *   if {@code maxLatency} is less than 0
+   * @return {@code this} to allow chaining of set methods
*/
-  
   public BatchWriterConfig setMaxLatency(long maxLatency, TimeUnit timeUnit) {
 if (maxLatency  0)
   throw new IllegalArgumentException(Negative max latency not allowed  + 
maxLatency);
@@ -73,19 +91,31 @@ public class BatchWriterConfig implement
 if (maxLatency == 0)
   this.maxLatency = Long.MAX_VALUE;
 else
-  this.maxLatency = timeUnit.toMillis(maxLatency);
+  // make small, positive values that truncate to 0 when converted use the 
minimum millis instead
+  this.maxLatency = Math.max(1, timeUnit.toMillis(maxLatency));
 return this;
   }
   
   /**
+   * Sets the maximum amount of time an unresponsive server will be re-tried. 
When this timeout is exceeded, the {@link BatchWriter} should throw an 
exception.br /
+   * For no timeout, set to zero, or {@link Long#MAX_VALUE} with {@link 
TimeUnit#MILLISECONDS}.
+   * 
+   * p
+   * {@link TimeUnit#MICROSECONDS} or {@link TimeUnit#NANOSECONDS} will be 
truncated to the nearest {@link TimeUnit#MILLISECONDS}.br /
+   * If this truncation would result in making the value zero when it was 
specified as non-zero, then a minimum value of one {@link 
TimeUnit#MILLISECONDS} will
+   * be used.
+   * 
+   * p
+   * bDefault:/b {@link Long#MAX_VALUE} (no timeout)
* 
* @param timeout
-   *  The maximum amount of time an unresponsive server will be 
retried. When this timeout is exceeded, the BatchWriter should throw an 
exception. For
-   *  no timeout set

svn commit: r1438309 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/cli

2013-01-24 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 25 03:31:59 2013
New Revision: 1438309

URL: http://svn.apache.org/viewvc?rev=1438309view=rev
Log:
ACCUMULO-973 Add deprecation annotations for those that were missing them. 
Javadoc deprecation tags are okay for documentation, but insufficient for 
programmatically determining deprecated APIs (or for compiler warnings); This 
is a 'play nice with other developers' enhancement.

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java

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

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java?rev=1438309r1=1438308r2=1438309view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
 Fri Jan 25 03:31:59 2013
@@ -46,6 +46,7 @@ public class Connector {
*   when a user's credentials are invalid
* @see Instance#getConnector(String user, byte[] password)
*/
+  @Deprecated
   public Connector(Instance instance, String user, byte[] password) throws 
AccumuloException, AccumuloSecurityException {
 impl = instance.getConnector(user, password);
   }
@@ -54,6 +55,7 @@ public class Connector {
* @see Instance#getConnector(String user, byte[] password)
* @deprecated Not for client use
*/
+  @Deprecated
   public Connector() {
 impl = null;
   }

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: 
http://svn.apache.org/viewvc

svn commit: r1438593 - /accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java

2013-01-25 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 25 17:05:35 2013
New Revision: 1438593

URL: http://svn.apache.org/viewvc?rev=1438593view=rev
Log:
ACCUMULO-692 Updated log message to show the host:port when failing to connect 
to garbage collector.

Modified:

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java?rev=1438593r1=1438592r2=1438593view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
 Fri Jan 25 17:05:35 2013
@@ -415,6 +415,7 @@ public class Monitor {
   
   private static GCStatus fetchGcStatus() {
 GCStatus result = null;
+InetSocketAddress address = null;
 try {
   // Read the gc location from its lock
   Instance instance = HdfsZooInstance.getInstance();
@@ -429,7 +430,7 @@ public class Monitor {
 ListString locks = zk.getChildren(path, null);
 if (locks != null  locks.size()  0) {
   Collections.sort(locks);
-  InetSocketAddress address = new ServerServices(new 
String(zk.getData(path + / + locks.get(0), null, 
null))).getAddress(Service.GC_CLIENT);
+  address = new ServerServices(new String(zk.getData(path + / + 
locks.get(0), null, null))).getAddress(Service.GC_CLIENT);
   GCMonitorService.Client client = ThriftUtil.getClient(new 
GCMonitorService.Client.Factory(), address, config.getConfiguration());
   try {
 result = client.getStatus(Tracer.traceInfo(), 
SecurityConstants.getThriftSystemCredentials());
@@ -441,7 +442,7 @@ public class Monitor {
 zk.close();
   }
 } catch (Exception ex) {
-  log.warn(Unable to contact the garbage collector, ex);
+  log.warn(Unable to contact the garbage collector at  + address, ex);
 }
 return result;
   }




svn commit: r1438630 - in /accumulo/trunk/contrib: Eclipse-Accumulo-Codestyle.xml Eclipse-Accumulo-Template.xml

2013-01-25 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 25 18:23:18 2013
New Revision: 1438630

URL: http://svn.apache.org/viewvc?rev=1438630view=rev
Log:
ACCUMULO-957 Enable turning formatter on/off for special use cases. Remove 
comment from overriding methods, and make LICENSE header comment a regular 
comment.

Modified:
accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml
accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml

Modified: accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml?rev=1438630r1=1438629r2=1438630view=diff
==
--- accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml (original)
+++ accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml Fri Jan 25 18:23:18 
2013
@@ -32,7 +32,7 @@
 setting 
id=org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation
 value=do not insert/
 setting id=org.eclipse.jdt.core.formatter.blank_lines_before_field 
value=0/
 setting 
id=org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while 
value=do not insert/
-setting id=org.eclipse.jdt.core.formatter.use_on_off_tags value=false/
+setting id=org.eclipse.jdt.core.formatter.use_on_off_tags value=true/
 setting 
id=org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration
 value=do not insert/
 setting 
id=org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement 
value=do not insert/
 setting 
id=org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator 
value=do not insert/

Modified: accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml?rev=1438630r1=1438629r2=1438630view=diff
==
--- accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml (original)
+++ accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml Fri Jan 25 18:23:18 
2013
@@ -22,7 +22,7 @@
  * @param ${param} the ${bare_field_name} to set
  *//templatetemplate autoinsert=true context=constructorcomment_context 
deleted=false description=Comment for created constructors enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.constructorcomment 
name=constructorcomment/**
  * ${tags}
- *//templatetemplate autoinsert=false context=filecomment_context 
deleted=false description=Comment for created Java files enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.filecomment 
name=filecomment/**#13;
+ *//templatetemplate autoinsert=false context=filecomment_context 
deleted=false description=Comment for created Java files enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.filecomment 
name=filecomment/*#13;
  * Licensed to the Apache Software Foundation (ASF) under one or more#13;
  * contributor license agreements.  See the NOTICE file distributed with#13;
  * this work for additional information regarding copyright ownership.#13;
@@ -41,9 +41,7 @@
  * ${tags}
  *//templatetemplate autoinsert=false context=fieldcomment_context 
deleted=false description=Comment for fields enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.fieldcomment 
name=fieldcomment/template autoinsert=true 
context=methodcomment_context deleted=false description=Comment for 
non-overriding methods enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.methodcomment 
name=methodcomment/**
  * ${tags}
- *//templatetemplate autoinsert=true context=overridecomment_context 
deleted=false description=Comment for overriding methods enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.overridecomment 
name=overridecomment/* (non-Javadoc)
- * ${see_to_overridden}
- *//templatetemplate autoinsert=true context=delegatecomment_context 
deleted=false description=Comment for delegate methods enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.delegatecomment 
name=delegatecomment/**
+ *//templatetemplate autoinsert=false context=overridecomment_context 
deleted=false description=Comment for overriding methods enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.overridecomment 
name=overridecomment/template autoinsert=true 
context=delegatecomment_context deleted=false description=Comment for 
delegate methods enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.delegatecomment 
name=delegatecomment/**
  * ${tags}
  * ${see_to_target}
  *//templatetemplate autoinsert=true context=newtype_context 
deleted=false description=Newly created files enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.newtype name=newtype${filecomment}
@@ -59,4 +57,4 @@ ${exception_var}.printStackTrace();/tem
 ${body_statement}/templatetemplate autoinsert=true 
context=constructorbody_context deleted=false description=Code in created 
constructor stubs enabled=true 
id=org.eclipse.jdt.ui.text.codetemplates.constructorbody 
name=constructorbody${body_statement}
 // ${todo} Auto-generated

svn commit: r1438699 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/master/thrift/ proxy/src/main/java/org/apache/accumulo/proxy/thrift/ trace/src/main/java/org/apache/accumulo/clou

2013-01-25 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 25 20:54:02 2013
New Revision: 1438699

URL: http://svn.apache.org/viewvc?rev=1438699view=rev
Log:
ACCUMULO-259 Checking in generated thrift code, due to discrepency from 
previous merge.

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java

accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java

accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1438699r1=1438698r2=1438699view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
 Fri Jan 25 20:54:02 2013
@@ -1127,7 +1127,7 @@ import org.slf4j.LoggerFactory;
 for (int _i1 = 0; _i1  _map0.size; ++_i1)
 {
   String _key2; // required
-  TableInfo _val3; // optional
+  TableInfo _val3; // required
   _key2 = iprot.readString();
   _val3 = new TableInfo();
   _val3.read(iprot);

Modified: 
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java?rev=1438699r1=1438698r2=1438699view=diff
==
--- 
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
 (original)
+++ 
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
 Fri Jan 25 20:54:02 2013
@@ -620,7 +620,7 @@ import org.slf4j.LoggerFactory;
 for (int _i9 = 0; _i9  _map8.size; ++_i9)
 {
   String _key10; // required
-  String _val11; // optional
+  String _val11; // required
   _key10 = iprot.readString();
   _val11 = iprot.readString();
   struct.properties.put(_key10, _val11);

Modified: 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java?rev=1438699r1=1438698r2=1438699view=diff
==
--- 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
 (original)
+++ 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
 Fri Jan 25 20:54:02 2013
@@ -1029,7 +1029,7 @@ import org.slf4j.LoggerFactory;
 for (int _i1 = 0; _i1  _map0.size; ++_i1)
 {
   String _key2; // required
-  String _val3; // optional
+  String _val3; // required
   _key2 = iprot.readString();
   _val3 = iprot.readString();
   struct.data.put(_key2, _val3);
@@ -1224,7 +1224,7 @@ import org.slf4j.LoggerFactory;
   for (int _i7 = 0; _i7  _map6.size; ++_i7)
   {
 String _key8; // required
-String _val9; // optional
+String _val9; // required
 _key8 = iprot.readString();
 _val9 = iprot.readString();
 struct.data.put(_key8, _val9);




svn commit: r1438700 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/Constants.java server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java

2013-01-25 Thread ctubbsii
Author: ctubbsii
Date: Fri Jan 25 20:56:12 2013
New Revision: 1438700

URL: http://svn.apache.org/viewvc?rev=1438700view=rev
Log:
ACCUMULO-751 Switched from using the release version to an explicit wire 
version for on-the-wire compatibility. This will need to be manually updated 
when
thrift code changes between versions, or when interoperability is not possible 
between versions due to functional differences.

Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1438700r1=1438699r2=1438700view=diff
==
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java 
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java 
Fri Jan 25 20:56:12 2013
@@ -16,6 +16,8 @@
  */
 package org.apache.accumulo.core;
 
+import java.nio.charset.Charset;
+
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
@@ -28,7 +30,11 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 
 public class Constants {
+  public static final Charset UTF8 = Charset.forName(UTF-8);
   public static final String VERSION = 1.5.0-SNAPSHOT;
+  
+  // versions should never be negative
+  public static final Integer WIRE_VERSION = 2;
   public static final int DATA_VERSION = 4;
   public static final int PREV_DATA_VERSION = 3;
   
@@ -75,7 +81,7 @@ public class Constants {
   public static final String ZNEXT_FILE = /next_file;
   
   public static final String ZBULK_FAILED_COPYQ = /bulk_failed_copyq;
-
+  
   public static final String ZHDFS_RESERVATIONS = /hdfs_reservations;
   public static final String ZRECOVERY = /recovery;
   
@@ -164,7 +170,7 @@ public class Constants {
   public static final String EXPORT_TABLE_CONFIG_FILE = table_config.txt;
   public static final String EXPORT_FILE = exportMetadata.zip;
   public static final String EXPORT_INFO_FILE = accumulo_export_info.txt;
-
+  
   public static String getBaseDir(final AccumuloConfiguration conf) {
 return conf.get(Property.INSTANCE_DFS_DIR);
   }

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java?rev=1438700r1=1438699r2=1438700view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
 Fri Jan 25 20:56:12 2013
@@ -60,19 +60,18 @@ public class SecurityConstants {
   }
   
   private static byte[] makeSystemPassword() {
-byte[] version = Constants.VERSION.getBytes();
-byte[] inst = HdfsZooInstance.getInstance().getInstanceID().getBytes();
+int wireVersion = Constants.WIRE_VERSION;
+byte[] inst = 
HdfsZooInstance.getInstance().getInstanceID().getBytes(Constants.UTF8);
 try {
   confChecksum = getSystemConfigChecksum();
 } catch (NoSuchAlgorithmException e) {
   throw new RuntimeException(Failed to compute configuration checksum, 
e);
 }
 
-ByteArrayOutputStream bytes = new ByteArrayOutputStream(3 * (Integer.SIZE 
/ Byte.SIZE) + version.length + inst.length + confChecksum.length);
+ByteArrayOutputStream bytes = new ByteArrayOutputStream(3 * (Integer.SIZE 
/ Byte.SIZE) + inst.length + confChecksum.length);
 DataOutputStream out = new DataOutputStream(bytes);
 try {
-  out.write(version.length);
-  out.write(version);
+  out.write(wireVersion * -1);
   out.write(inst.length);
   out.write(inst);
   out.write(confChecksum.length);
@@ -101,12 +100,10 @@ public class SecurityConstants {
 ByteArrayInputStream bytes = new ByteArrayInputStream(decodedPassword);
 DataInputStream in = new DataInputStream(bytes);
 try {
+  versionFails = in.readInt() * -1 != Constants.WIRE_VERSION;
   byte[] buff = new byte[in.readInt()];
   in.readFully(buff);
-  versionFails = !Arrays.equals(buff, Constants.VERSION.getBytes());
-  buff = new byte[in.readInt()];
-  in.readFully(buff);
-  instanceFails = !Arrays.equals(buff, 
HdfsZooInstance.getInstance().getInstanceID().getBytes());
+  instanceFails = !Arrays.equals(buff, 
HdfsZooInstance.getInstance().getInstanceID().getBytes(Constants.UTF8));
   buff = new byte[in.readInt()];
   in.readFully(buff);
   confFails = !Arrays.equals(buff

svn commit: r1438827 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client: mapred/ mapreduce/ mapreduce/lib/util/

2013-01-25 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 26 03:11:36 2013
New Revision: 1438827

URL: http://svn.apache.org/viewvc?rev=1438827view=rev
Log:
ACCUMULO-829 Adds a new option to pass in the path to a file that gets added to 
the distributed cache, with the user's credentials.

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java?rev=1438827r1=1438826r2=1438827view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
 Sat Jan 26 03:11:36 2013
@@ -22,7 +22,9 @@ import java.util.Map.Entry;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AccumuloToken;
 import org.apache.accumulo.core.util.format.DefaultFormatter;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.InputFormat;
 import org.apache.hadoop.mapred.InputSplit;
 import org.apache.hadoop.mapred.JobConf;
@@ -36,7 +38,7 @@ import org.apache.hadoop.mapred.Reporter
  * The user must specify the following via static configurator methods:
  * 
  * ul
- * li{@link AccumuloInputFormat#setConnectorInfo(JobConf, String, byte[])}
+ * li{@link AccumuloInputFormat#setConnectorInfo(JobConf, AccumuloToken)} OR 
{@link AccumuloInputFormat#setConnectorInfo(JobConf, Path)}
  * li{@link AccumuloInputFormat#setInputTableName(JobConf, String)}
  * li{@link AccumuloInputFormat#setScanAuthorizations(JobConf, 
Authorizations)}
  * li{@link AccumuloInputFormat#setZooKeeperInstance(JobConf, String, 
String)} OR {@link AccumuloInputFormat#setMockInstance(JobConf, String)}

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java?rev=1438827r1=1438826r2=1438827view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
 Sat Jan 26 03:11:36 2013
@@ -41,7 +41,10 @@ import org.apache.accumulo.core.data.Mut
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
 import org.apache.accumulo.core.security.tokens.AccumuloToken;
+import org.apache.accumulo.core.security.tokens.TokenHelper;
+import org.apache.hadoop.filecache.DistributedCache;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.OutputFormat;
@@ -58,7 +61,7 @@ import org.apache.log4j.Logger;
  * The user must specify the following via static configurator methods:
  * 
  * ul
- * li{@link AccumuloOutputFormat#setConnectorInfo(JobConf, AccumuloToken)}
+ * li{@link AccumuloOutputFormat#setConnectorInfo(JobConf, AccumuloToken)} 
OR {@link AccumuloOutputFormat#setConnectorInfo(JobConf, Path)}
  * li{@link AccumuloOutputFormat#setZooKeeperInstance(JobConf, String, 
String)} OR {@link AccumuloOutputFormat#setMockInstance(JobConf, String)}
  * /ul
  * 
@@ -72,10 +75,14 @@ public class AccumuloOutputFormat implem
   /**
* Sets the connector information needed to communicate with Accumulo in 
this job.
* 
+   * p
+   * bWARNING:/b The serialized token is stored in the configuration and 
shared with all MapReduce tasks. It is BASE64 encoded to provide a charset safe

svn commit: r1438962 [5/5] - in /accumulo/trunk: conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB

2013-01-26 Thread ctubbsii
Modified: accumulo/trunk/test/system/test3/bigrow.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/test3/bigrow.sh?rev=1438962r1=1438961r2=1438962view=diff
==
--- accumulo/trunk/test/system/test3/bigrow.sh (original)
+++ accumulo/trunk/test/system/test3/bigrow.sh Sat Jan 26 21:04:27 2013
@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56  
 --rows 1   --start 500 --cols 200;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56  
 --rows 100 --start 0   --cols 1;
-#../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.VerifyIngest --timestamp 1 --size 50 --random 
56 --rows 1  --start 500 --cols 200;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 
56 --rows 100 --start 0   --cols 1;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56  
 --rows 100 --start 700 --cols 1;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 
56 --rows 100 --start 700 --cols 1;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random 56   
--rows 1   --start 500 --cols 200;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random 56   
--rows 100 --start 0   --cols 1;
+#../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.VerifyIngest --timestamp 1 --size 50 --random 56 
--rows 1  --start 500 --cols 200;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 
--rows 100 --start 0   --cols 1;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random 56   
--rows 100 --start 700 --cols 1;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 
--rows 100 --start 700 --cols 1;

Modified: accumulo/trunk/test/system/test4/README
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/test4/README?rev=1438962r1=1438961r2=1438962view=diff
==
--- accumulo/trunk/test/system/test4/README (original)
+++ accumulo/trunk/test/system/test4/README Sat Jan 26 21:04:27 2013
@@ -3,4 +3,4 @@ Test bulk importing data
 Can run this test with pre-existing splits... use the following command to 
create the table with
 100 pre-existing splits 
 
-hadoop jar ../../../lib/accumulo.jar 
'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100
+hadoop jar ../../../lib/accumulo.jar 
'org.apache.accumulo.test.TestIngest$CreateTable' 0 500 100

Modified: accumulo/trunk/test/system/test4/bulk_import_test.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/test4/bulk_import_test.sh?rev=1438962r1=1438961r2=1438962view=diff
==
--- accumulo/trunk/test/system/test4/bulk_import_test.sh (original)
+++ accumulo/trunk/test/system/test4/bulk_import_test.sh Sat Jan 26 21:04:27 
2013
@@ -19,26 +19,26 @@ hadoop dfs -rmr /testmf
 
 echo creating first set of map files
 
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf01 --timestamp 1 --size 50 --random 56 --rows 100 --start 0 
--cols 1 
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf02 --timestamp 1 --size 50 --random 56 --rows 100 --start 100 
--cols 1 
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf03 --timestamp 1 --size 50 --random 56 --rows 100 --start 200 
--cols 1 
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf04 --timestamp 1 --size 50 --random 56 --rows 100 --start 300 
--cols 1 
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf05 --timestamp 1 --size 50 --random 56 --rows 100 --start 400 
--cols 1 
+../../../bin/accumulo org.apache.accumulo.test.TestIngest --rfile /testmf/mf01 
--timestamp 1 --size 50 --random 56 --rows 100 --start 0 --cols 1 
+../../../bin/accumulo org.apache.accumulo.test.TestIngest --rfile /testmf/mf02 
--timestamp 1 --size 50 --random 56 --rows 100 --start 100 

svn commit: r1438976 [3/8] - in /accumulo/trunk: ./ assemble/ bin/ contrib/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/ma

2013-01-26 Thread ctubbsii
Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java?rev=1438976r1=1438975r2=1438976view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
 Sat Jan 26 22:17:53 2013
@@ -50,13 +50,13 @@ import org.slf4j.LoggerFactory;
 
   public interface Iface {
 
-public GCStatus getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException;
+public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-public void getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, 
org.apache.thrift.async.AsyncMethodCallbackAsyncClient.getStatus_call 
resultHandler) throws org.apache.thrift.TException;
+public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, 
org.apache.thrift.async.AsyncMethodCallbackAsyncClient.getStatus_call 
resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -80,13 +80,13 @@ import org.slf4j.LoggerFactory;
   super(iprot, oprot);
 }
 
-public GCStatus getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException
+public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException
 {
   send_getStatus(tinfo, credentials);
   return recv_getStatus();
 }
 
-public void send_getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws org.apache.thrift.TException
+public void send_getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws org.apache.thrift.TException
 {
   getStatus_args args = new getStatus_args();
   args.setTinfo(tinfo);
@@ -125,7 +125,7 @@ import org.slf4j.LoggerFactory;
   super(protocolFactory, clientManager, transport);
 }
 
-public void getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallbackgetStatus_call 
resultHandler) throws org.apache.thrift.TException {
+public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallbackgetStatus_call 
resultHandler) throws org.apache.thrift.TException {
   checkReady();
   getStatus_call method_call = new getStatus_call(tinfo, credentials, 
resultHandler, this, ___protocolFactory, ___transport);
   this.___currentMethod = method_call;
@@ -133,9 +133,9 @@ import org.slf4j.LoggerFactory;
 }
 
 public static class getStatus_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-  private org.apache.accumulo.cloudtrace.thrift.TInfo tinfo;
+  private org.apache.accumulo.trace.thrift.TInfo tinfo;
   private 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper credentials;
-  public getStatus_call(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallbackgetStatus_call 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+  public getStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallbackgetStatus_call 
resultHandler, org.apache.thrift.async.TAsyncClient client, 

svn commit: r1438976 [1/8] - in /accumulo/trunk: ./ assemble/ bin/ contrib/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/ma

2013-01-26 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 26 22:17:53 2013
New Revision: 1438976

URL: http://svn.apache.org/viewvc?rev=1438976view=rev
Log:
ACCUMULO-618 Update trace to reflect the naming conventions of the rest of the 
project. Also updated instamo and other examples to match the artifact naming 
conventions, and gave the artifacts simple names for display during the project 
build.

Added:
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/
  - copied from r1438967, 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/SpanReceiver.java

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
accumulo/trunk/trace/src/main/thrift/trace.thrift
  - copied, changed from r1438967, 
accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift
accumulo/trunk/trace/src/test/java/org/apache/accumulo/trace/
  - copied from r1438967, 
accumulo/trunk/trace/src/test/java/org/apache/accumulo/cloudtrace/
Removed:
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/
accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift
accumulo/trunk/trace/src/test/java/org/apache/accumulo/cloudtrace/
Modified:
accumulo/trunk/assemble/pom.xml
accumulo/trunk/bin/tool.sh
accumulo/trunk/contrib/findbugs_build.xml
accumulo/trunk/core/pom.xml

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java
accumulo/trunk/core/src/main/thrift/client.thrift
accumulo/trunk/core/src/main/thrift/gc.thrift
accumulo/trunk/core/src/main/thrift/master.thrift
accumulo/trunk/core/src/main/thrift/tabletserver.thrift
accumulo/trunk/examples/instamo/pom.xml
accumulo/trunk/examples/pom.xml
accumulo/trunk/examples/simple/pom.xml
accumulo/trunk/fate/pom.xml
accumulo/trunk/pom.xml
accumulo/trunk/proxy/pom.xml
accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh
accumulo/trunk/server/pom.xml

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java

accumulo/trunk/server/src

svn commit: r1438976 [8/8] - in /accumulo/trunk: ./ assemble/ bin/ contrib/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/ma

2013-01-26 Thread ctubbsii
Added: 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java?rev=1438976view=auto
==
--- 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
 (added)
+++ 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
 Sat Jan 26 22:17:53 2013
@@ -0,0 +1,1013 @@
+/*
+ * 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.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.accumulo.trace.thrift;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings(all) public class TestService {
+
+  public interface Iface {
+
+public boolean checkTrace(TInfo tinfo, String message) throws 
org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+public void checkTrace(TInfo tinfo, String message, 
org.apache.thrift.async.AsyncMethodCallbackAsyncClient.checkTrace_call 
resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+public static class Factory implements 
org.apache.thrift.TServiceClientFactoryClient {
+  public Factory() {}
+  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+return new Client(prot);
+  }
+  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
+return new Client(iprot, oprot);
+  }
+}
+
+public Client(org.apache.thrift.protocol.TProtocol prot)
+{
+  super(prot, prot);
+}
+
+public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
+  super(iprot, oprot);
+}
+
+public boolean checkTrace(TInfo tinfo, String message) throws 
org.apache.thrift.TException
+{
+  send_checkTrace(tinfo, message);
+  return recv_checkTrace();
+}
+
+public void send_checkTrace(TInfo tinfo, String message) throws 
org.apache.thrift.TException
+{
+  checkTrace_args args = new checkTrace_args();
+  args.setTinfo(tinfo);
+  args.setMessage(message);
+  sendBase(checkTrace, args);
+}
+
+public boolean recv_checkTrace() throws org.apache.thrift.TException
+{
+  checkTrace_result result = new checkTrace_result();
+  receiveBase(result, checkTrace);
+  if (result.isSetSuccess()) {
+return result.success;
+  }
+  throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 checkTrace failed: unknown result);
+}
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient 
implements AsyncIface {
+public static class Factory implements 
org.apache.thrift.async.TAsyncClientFactoryAsyncClient {
+  private org.apache.thrift.async.TAsyncClientManager clientManager;
+  private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+  public Factory(org.apache.thrift.async.TAsyncClientManager 
clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+this.clientManager = clientManager;
+this.protocolFactory = protocolFactory;
+  }
+  public AsyncClient 

svn commit: r1438989 - in /accumulo/trunk/assemble: dist.xml pom.xml

2013-01-26 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 26 23:09:57 2013
New Revision: 1438989

URL: http://svn.apache.org/viewvc?rev=1438989view=rev
Log:
ACCUMULO-370 Added 'apache' branding to the dist tarball and top-level 
directory inside the tarball. Also fixed the formatting of the xml LICENSE 
comment.

Modified:
accumulo/trunk/assemble/dist.xml
accumulo/trunk/assemble/pom.xml

Modified: accumulo/trunk/assemble/dist.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1438989r1=1438988r2=1438989view=diff
==
--- accumulo/trunk/assemble/dist.xml (original)
+++ accumulo/trunk/assemble/dist.xml Sat Jan 26 23:09:57 2013
@@ -1,20 +1,26 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- 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. --
+!--
+  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.
+--
 assembly
   iddist/id
   formats
 formattar.gz/format
   /formats
-  baseDirectoryaccumulo-${project.version}/baseDirectory
+  baseDirectoryapache-accumulo-${project.version}/baseDirectory
   fileSets
 fileSet
   directory../bin/directory

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1438989r1=1438988r2=1438989view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat Jan 26 23:09:57 2013
@@ -1,14 +1,20 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- 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. --
+!--
+  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.
+--
 project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
 
@@ -87,7 +93,7 @@
 plugin
   artifactIdmaven-assembly-plugin/artifactId
   configuration
-
finalName

svn commit: r1438991 - /accumulo/trunk/README

2013-01-26 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 26 23:27:08 2013
New Revision: 1438991

URL: http://svn.apache.org/viewvc?rev=1438991view=rev
Log:
ACCUMULO-370 Update README to reflect new tarball name.

Modified:
accumulo/trunk/README

Modified: accumulo/trunk/README
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1438991r1=1438990r2=1438991view=diff
==
--- accumulo/trunk/README (original)
+++ accumulo/trunk/README Sat Jan 26 23:27:08 2013
@@ -44,7 +44,7 @@ easier to install.
 
 Copy the accumulo tar file produced by mvn package from the 
src/assemble/target/
 directory to the desired destination, then untar it (e.g. 
-tar xvzf accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
+tar xzf apache-accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
 
 If you are using the RPM, install the RPM on every machine that will run
 accumulo.




svn commit: r1440118 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators: system/VisibilityFilter.java user/VisibilityFilter.java

2013-01-29 Thread ctubbsii
Author: ctubbsii
Date: Tue Jan 29 20:49:34 2013
New Revision: 1440118

URL: http://svn.apache.org/viewvc?rev=1440118view=rev
Log:
ACCUMULO-918 Added user iterator for visibilities. TODO: add a test.

Added:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java?rev=1440118r1=1440117r2=1440118view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
 Tue Jan 29 20:49:34 2013
@@ -32,10 +32,10 @@ import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
 public class VisibilityFilter extends Filter {
-  private VisibilityEvaluator ve;
-  private Text defaultVisibility;
-  private LRUMap cache;
-  private Text tmpVis;
+  protected VisibilityEvaluator ve;
+  protected Text defaultVisibility;
+  protected LRUMap cache;
+  protected Text tmpVis;
   
   private static final Logger log = Logger.getLogger(VisibilityFilter.class);
   

Added: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java?rev=1440118view=auto
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
 (added)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
 Tue Jan 29 20:49:34 2013
@@ -0,0 +1,109 @@
+/*
+ * 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.iterators.user;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.iterators.IteratorEnvironment;
+import org.apache.accumulo.core.iterators.OptionDescriber;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.core.security.VisibilityEvaluator;
+import org.apache.accumulo.core.util.BadArgumentException;
+import org.apache.commons.collections.map.LRUMap;
+import org.apache.hadoop.io.Text;
+
+/**
+ * 
+ */
+public class VisibilityFilter extends 
org.apache.accumulo.core.iterators.system.VisibilityFilter implements 
OptionDescriber {
+  
+  public static final String AUTHS = auths;
+  public static final String FILTER_INVALID_ONLY = filterInvalid;
+  
+  private boolean filterInvalid;
+  
+  /**
+   * 
+   */
+  public VisibilityFilter() {
+super();
+  }
+  
+  @Override
+  public void init(SortedKeyValueIteratorKey,Value source, 
MapString,String options, IteratorEnvironment env) throws IOException {
+super.init(source, options, env);
+validateOptions(options);
+this.filterInvalid = 
Boolean.parseBoolean(options.get(FILTER_INVALID_ONLY));
+
+if (!filterInvalid) {
+  this.ve = new VisibilityEvaluator(new 
Authorizations(options.get(AUTHS).getBytes(Constants.UTF8)));
+  this.defaultVisibility = new Text();
+  this.cache = new LRUMap(1000);
+  this.tmpVis = new Text();
+}
+  }
+  
+  @Override
+  public boolean accept(Key k, Value v) {
+if (filterInvalid) {
+  Text testVis = k.getColumnVisibility(tmpVis);
+  try {
+new ColumnVisibility(testVis);
+cache.put(new Text(testVis), true);
+return true;
+  } catch (BadArgumentException e) {
+cache.put(new Text(testVis

svn commit: r1440627 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java

2013-01-30 Thread ctubbsii
Author: ctubbsii
Date: Wed Jan 30 19:56:00 2013
New Revision: 1440627

URL: http://svn.apache.org/viewvc?rev=1440627view=rev
Log:
ACCUMULO-918 Added unit tests and fixed a few discovered bugs in user 
visibility filter (specifically, made the invalid label check use the cache, 
and fixed
empty authorizations problem).

Added:

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java?rev=1440627r1=1440626r2=1440627view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
 Wed Jan 30 19:56:00 2013
@@ -38,8 +38,8 @@ import org.apache.hadoop.io.Text;
  */
 public class VisibilityFilter extends 
org.apache.accumulo.core.iterators.system.VisibilityFilter implements 
OptionDescriber {
   
-  public static final String AUTHS = auths;
-  public static final String FILTER_INVALID_ONLY = filterInvalid;
+  private static final String AUTHS = auths;
+  private static final String FILTER_INVALID_ONLY = filterInvalid;
   
   private boolean filterInvalid;
   
@@ -57,17 +57,22 @@ public class VisibilityFilter extends or
 this.filterInvalid = 
Boolean.parseBoolean(options.get(FILTER_INVALID_ONLY));
 
 if (!filterInvalid) {
-  this.ve = new VisibilityEvaluator(new 
Authorizations(options.get(AUTHS).getBytes(Constants.UTF8)));
+  String auths = options.get(AUTHS);
+  Authorizations authObj = auths == null || auths.isEmpty() ? new 
Authorizations() : new Authorizations(auths.getBytes(Constants.UTF8));
+  this.ve = new VisibilityEvaluator(authObj);
   this.defaultVisibility = new Text();
-  this.cache = new LRUMap(1000);
-  this.tmpVis = new Text();
 }
+this.cache = new LRUMap(1000);
+this.tmpVis = new Text();
   }
   
   @Override
   public boolean accept(Key k, Value v) {
 if (filterInvalid) {
   Text testVis = k.getColumnVisibility(tmpVis);
+  Boolean b = (Boolean) cache.get(testVis);
+  if (b != null)
+return b;
   try {
 new ColumnVisibility(testVis);
 cache.put(new Text(testVis), true);

Added: 
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java?rev=1440627view=auto
==
--- 
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
 (added)
+++ 
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VisibilityFilterTest.java
 Wed Jan 30 19:56:00 2013
@@ -0,0 +1,231 @@
+/*
+ * 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.iterators.user;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.data.ByteSequence;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.iterators.Filter;
+import org.apache.accumulo.core.iterators.SortedMapIterator;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.hadoop.io.Text;
+import org.junit.Test;
+
+public class VisibilityFilterTest {
+  
+  private static final CollectionByteSequence EMPTY_COL_FAMS = new 
ArrayListByteSequence();
+  
+  private static

svn commit: r1441692 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/client/mapreduce/ test/java/org/apache/accumulo/core/client/mapred/ test/java/org/apache/accumulo/core/client/map

2013-02-01 Thread ctubbsii
Author: ctubbsii
Date: Sat Feb  2 02:56:40 2013
New Revision: 1441692

URL: http://svn.apache.org/viewvc?rev=1441692view=rev
Log:
ACCUMULO-993 Added unit tests for mapred package. Reverted deprecated tests for 
maxVersions and found a bug with deprecated method in mapreduce package.
Prevented M/R tests from stepping on each other with different table names for 
mock (based on the test class name).

Added:
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormatTest.java
Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1441692r1=1441691r2=1441692view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
 Sat Feb  2 02:56:40 2013
@@ -506,7 +506,7 @@ public abstract class InputFormatBaseK,
* @return an Accumulo tablet locator
* @throws TableNotFoundException
*   if the table name set on the configuration doesn't exist
-   * @throws AccumuloSecurityException 
+   * @throws AccumuloSecurityException
* @since 1.5.0
*/
   protected static TabletLocator getTabletLocator(JobContext context) throws 
TableNotFoundException, AccumuloSecurityException {
@@ -1024,8 +1024,12 @@ public abstract class InputFormatBaseK,
*/
   @Deprecated
   public static void setMaxVersions(Configuration conf, int maxVersions) 
throws IOException {
-IteratorSetting vers = new IteratorSetting(0, vers, 
VersioningIterator.class);
-VersioningIterator.setMaxVersions(vers, maxVersions);
+IteratorSetting vers = new IteratorSetting(1, vers, 
VersioningIterator.class);
+try {
+  VersioningIterator.setMaxVersions(vers, maxVersions);
+} catch (IllegalArgumentException e) {
+  throw new IOException(e);
+}
 InputConfigurator.addIterator(CLASS, conf, vers);
   }
   
@@ -1192,7 +1196,7 @@ public abstract class InputFormatBaseK,
 // deconstruct to get at this option in the first place, but to preserve 
correct behavior, this appears necessary.
 ListIteratorSetting iteratorSettings = 
InputConfigurator.getIterators(CLASS, conf);
 for (IteratorSetting setting : iteratorSettings) {
-  if (vers.equals(setting.getName())  0 == setting.getPriority()  
VersioningIterator.class.getName().equals(setting.getIteratorClass())) {
+  if (vers.equals(setting.getName())  1 == setting.getPriority()  
VersioningIterator.class.getName().equals(setting.getIteratorClass())) {
 if (setting.getOptions().containsKey(maxVersions))
   return Integer.parseInt(setting.getOptions().get(maxVersions));
 else

Added: 
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java?rev=1441692view=auto
==
--- 
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
 (added)
+++ 
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
 Sat Feb  2 02:56:40 2013
@@ -0,0 +1,250 @@
+/*
+ * 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

svn commit: r1444244 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTe

2013-02-08 Thread ctubbsii
Author: ctubbsii
Date: Fri Feb  8 21:18:11 2013
New Revision: 1444244

URL: http://svn.apache.org/r1444244
Log:
ACCUMULO-1001 Fix typo on setAuthorizations method name.

Modified:

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java?rev=1444244r1=1444243r2=1444244view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
 Fri Feb  8 21:18:11 2013
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
@@ -79,7 +79,7 @@ abstract public class TransformingIterat
   public static final String AUTH_OPT = authorizations;
   public static final String MAX_BUFFER_SIZE_OPT = maxBufferSize;
   private static final long DEFAULT_MAX_BUFFER_SIZE = 1000;
-
+  
   protected Logger log = Logger.getLogger(getClass());
   
   protected ArrayListPairKey,Value keys = new ArrayListPairKey,Value();
@@ -120,7 +120,7 @@ abstract public class TransformingIterat
 } else {
   maxBufferSize = DEFAULT_MAX_BUFFER_SIZE;
 }
-
+
 parsedVisibilitiesCache = new LRUMap(100);
   }
   
@@ -129,9 +129,9 @@ abstract public class TransformingIterat
 String desc = This iterator allows ranges of key to be transformed (with 
the exception of row transformations).;
 String authDesc = Comma-separated list of user's scan authorizations.  
 + If excluded or empty, then no visibility check is performed on 
transformed keys.;
-String bufferDesc = Maximum buffer size (in accumulo memory spec) to use 
for buffering keys before throwing a BufferOverflowException.   +
-   Users should keep this limit in mind when deciding what to 
transform.  That is, if transforming the column family for example, then all  +
-   keys sharing the same row and column family must fit within 
this limit (along with their associated values);
+String bufferDesc = Maximum buffer size (in accumulo memory spec) to use 
for buffering keys before throwing a BufferOverflowException.  
++ Users should keep this limit in mind when deciding what to 
transform.  That is, if transforming the column family for example, then all 
++ keys sharing the same row and column family must fit within this 
limit (along with their associated values);
 HashMapString,String namedOptions = new HashMapString,String();
 namedOptions.put(AUTH_OPT, authDesc);
 namedOptions.put(MAX_BUFFER_SIZE_OPT, bufferDesc);
@@ -231,7 +231,7 @@ abstract public class TransformingIterat
   transformKeys();
 }
   }
-
+  
   private static class RangeIterator implements 
SortedKeyValueIteratorKey,Value {
 
 private SortedKeyValueIteratorKey,Value source;
@@ -244,7 +244,7 @@ abstract public class TransformingIterat
   this.prefixKey = prefixKey;
   this.keyPrefix = keyPrefix;
 }
-
+
 @Override
 public void init(SortedKeyValueIteratorKey,Value source, 
MapString,String options, IteratorEnvironment env) throws IOException {
   throw new UnsupportedOperationException();
@@ -286,7 +286,7 @@ abstract public class TransformingIterat
 }
 
   }
-
+  
   /**
* Reads all keys matching the first key's prefix from the source iterator, 
transforms them, and sorts the resulting keys. Transformed keys that fall 
outside
* of our seek range or can't be seen by the user are excluded.
@@ -299,7 +299,7 @@ abstract public class TransformingIterat
 transformRange(new RangeIterator(getSource(), prefixKey, getKeyPrefix()), 
new KVBuffer() {
   
   long appened = 0;
-
+  
   @Override
   public void append(Key key, Value val) {
 // ensure the key provided by the user has the correct prefix
@@ -314,7 +314,7 @@ abstract public class TransformingIterat
   // try to defend against a scan or compaction using all memory in a 
tablet server
   if (appened  maxBufferSize)
 throw new BufferOverflowException(Exceeded buffer size of  + 
maxBufferSize + , prefixKey:  + prefixKey);
-
+  
   if (getSource().hasTop()  key == getSource().getTopKey())
 key = new Key(key);
   keys.add(new PairKey,Value(key, new Value(val)));
@@ -322,7 +322,7 @@ abstract public class TransformingIterat

svn commit: r1449464 - /accumulo/branches/ACCUMULO-259-polishing/

2013-02-24 Thread ctubbsii
Author: ctubbsii
Date: Sun Feb 24 12:09:32 2013
New Revision: 1449464

URL: http://svn.apache.org/r1449464
Log:
ACCUMULO-259 Creating a branch for polishing 259 and related sub-tasks.

Added:
accumulo/branches/ACCUMULO-259-polishing/   (props changed)
  - copied from r1449463, accumulo/branches/1.5/

Propchange: accumulo/branches/ACCUMULO-259-polishing/
--
--- svn:ignore (added)
+++ svn:ignore Sun Feb 24 12:09:32 2013
@@ -0,0 +1,8 @@
+logs
+walogs
+target
+.idea
+.project
+.settings
+.pydevproject
+accumulo.iml

Propchange: accumulo/branches/ACCUMULO-259-polishing/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 24 12:09:32 2013
@@ -0,0 +1,19 @@
+/accumulo/branches/1.3:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864
+/accumulo/branches/1.4/src:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054
+/accumulo/branches/1.4.2:1399210,1402681
+/accumulo/branches/1.4.2/src:1399210,1402681
+/accumulo/branches/ACCUMULO-259:1343822-1438343
+/accumulo/branches/ACCUMULO-672:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk:1447829,1448390
+/accumulo/trunk/src:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3/src:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3.5rc:1209938
+/incubator/accumulo/branches/1.3.5rc/src:1209938
+/incubator/accumulo/branches/1.4:1201902-1305402
+/incubator/accumulo/branches/1.4/src:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src:1304025,1305326
+/incubator/accumulo/trunk/src:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495




svn commit: r1449467 [3/9] - in /accumulo/branches/ACCUMULO-259-polishing: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/a

2013-02-24 Thread ctubbsii
Modified: 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java?rev=1449467r1=1449466r2=1449467view=diff
==
--- 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
 (original)
+++ 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
 Sun Feb 24 12:30:11 2013
@@ -41,7 +41,7 @@ import org.apache.accumulo.core.data.Mut
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.security.CredentialHelper;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 import org.apache.hadoop.filecache.DistributedCache;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -88,7 +88,7 @@ public class AccumuloOutputFormat implem
* @throws AccumuloSecurityException 
* @since 1.5.0
*/
-  public static void setConnectorInfo(JobConf job, String principal, 
SecurityToken token) throws AccumuloSecurityException {
+  public static void setConnectorInfo(JobConf job, String principal, 
AuthenticationToken token) throws AccumuloSecurityException {
 OutputConfigurator.setConnectorInfo(CLASS, job, principal, token);
   }
   
@@ -129,7 +129,7 @@ public class AccumuloOutputFormat implem
*  the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, SecurityToken)
+   * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
   protected static String getPrincipal(JobConf job) {
@@ -143,7 +143,7 @@ public class AccumuloOutputFormat implem
*  the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, SecurityToken)
+   * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
   protected static String getTokenClass(JobConf job) {

Modified: 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java?rev=1449467r1=1449466r2=1449467view=diff
==
--- 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
 (original)
+++ 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
 Sun Feb 24 12:30:11 2013
@@ -55,8 +55,8 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.thrift.Credential;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.hadoop.filecache.DistributedCache;
@@ -101,7 +101,7 @@ public abstract class InputFormatBaseK,
* @throws AccumuloSecurityException 
* @since 1.5.0
*/
-  public static void setConnectorInfo(JobConf job, String principal, 
SecurityToken token) throws AccumuloSecurityException {
+  public static void setConnectorInfo(JobConf job, String principal, 
AuthenticationToken token) throws AccumuloSecurityException {
 InputConfigurator.setConnectorInfo(CLASS, job, principal, token);
   }
   
@@ -142,7 +142,7 @@ public abstract class InputFormatBaseK,
*  the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, SecurityToken)
+   * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
   protected static String getUsername(JobConf job) {
@@ -156,7 +156,7 @@ public abstract class InputFormatBaseK,
*  the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, SecurityToken)
+   * @see #setConnectorInfo(JobConf, String, AuthenticationToken)

svn commit: r1449493 [2/2] - in /accumulo/branches/ACCUMULO-259-polishing: core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/j

2013-02-24 Thread ctubbsii
Modified: 
accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java?rev=1449493r1=1449492r2=1449493view=diff
==
--- 
accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
 (original)
+++ 
accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
 Sun Feb 24 15:18:46 2013
@@ -450,18 +450,19 @@ public class TabletLocatorImplTest exten
 public Connector getConnector(TCredentials auth) throws AccumuloException, 
AccumuloSecurityException {
   return getConnector(auth.getPrincipal(), auth.getToken());
 }
-
+
+@Deprecated
 @Override
 public Connector getConnector(AuthInfo auth) throws AccumuloException, 
AccumuloSecurityException {
   return getConnector(auth.user, auth.getPassword());
 }
-
+
 @Override
 public String getAuthenticatorClassName() throws AccumuloException {
   return null;
   // Doesn't matter
 }
-
+
 @Override
 public Connector getConnector(String principal, AuthenticationToken token) 
throws AccumuloException, AccumuloSecurityException {
   throw new UnsupportedOperationException();
@@ -592,7 +593,7 @@ public class TabletLocatorImplTest exten
   throw new RuntimeException(Asked for empty tablet, but non empty tablet 
exists);
 }
   }
-
+  
   static void setLocation(TServers tservers, String server, KeyExtent tablet, 
KeyExtent ke, String location) {
 MapKeyExtent,SortedMapKey,Value tablets = 
tservers.tservers.get(server);
 if (tablets == null) {

Modified: 
accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java?rev=1449493r1=1449492r2=1449493view=diff
==
--- 
accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
 (original)
+++ 
accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
 Sun Feb 24 15:18:46 2013
@@ -84,7 +84,7 @@ public class MockConnectorTest {
   @Test
   public void testChangeAuths() throws Exception {
 Connector c = new MockConnector(root, new MockInstance());
-c.securityOperations().createUser(greg, new PasswordToken(new byte[0]));
+c.securityOperations().createLocalUser(greg, new PasswordToken(new 
byte[0]));
 assertTrue(c.securityOperations().getUserAuthorizations(greg).isEmpty());
 c.securityOperations().changeUserAuthorizations(greg, new 
Authorizations(A.getBytes()));
 
assertTrue(c.securityOperations().getUserAuthorizations(greg).contains(A.getBytes()));

Modified: 
accumulo/branches/ACCUMULO-259-polishing/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java?rev=1449493r1=1449492r2=1449493view=diff
==
--- 
accumulo/branches/ACCUMULO-259-polishing/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
 (original)
+++ 
accumulo/branches/ACCUMULO-259-polishing/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
 Sun Feb 24 15:18:46 2013
@@ -66,7 +66,6 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.security.thrift.TCredentials;
-import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.security.tokens.PasswordToken;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.TextUtil;
@@ -611,7 +610,7 @@ public class ProxyServer implements Accu
   @Override
   public boolean authenticateUser(ByteBuffer login, String user, ByteBuffer 
password) throws TException {
 try {
-  return getConnector(login).securityOperations().authenticateUser(user, 
ByteBufferUtil.toBytes(password));
+  return getConnector(login).securityOperations().authenticateUser(user, 
new PasswordToken(password));
 } catch (Exception e) {
   throw translateException(e);
 }
@@ -633,7 +632,7 @@ public class ProxyServer implements Accu
   @Override
   public void changeUserPassword(ByteBuffer login, String user, ByteBuffer 
password) throws TException {
 try {

svn commit: r1450395 - in /accumulo/branches/ACCUMULO-259-polishing: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/impl/ cor

2013-02-26 Thread ctubbsii
Author: ctubbsii
Date: Tue Feb 26 20:33:32 2013
New Revision: 1450395

URL: http://svn.apache.org/r1450395
Log:
ACCUMULO-259 merge 1.5 branch updates to polishing branch

Modified:
accumulo/branches/ACCUMULO-259-polishing/   (props changed)
accumulo/branches/ACCUMULO-259-polishing/assemble/   (props changed)
accumulo/branches/ACCUMULO-259-polishing/core/   (props changed)

accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java

accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java

accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java

accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java

accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/data/Key.java

accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java

accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
accumulo/branches/ACCUMULO-259-polishing/examples/   (props changed)

accumulo/branches/ACCUMULO-259-polishing/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java

accumulo/branches/ACCUMULO-259-polishing/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
   (props changed)

accumulo/branches/ACCUMULO-259-polishing/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/branches/ACCUMULO-259-polishing/server/   (props changed)

accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/Master.java

accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java

accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java

accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
accumulo/branches/ACCUMULO-259-polishing/src/   (props changed)

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/TestIngest.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTablePerm.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java

accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java

Propchange: accumulo/branches/ACCUMULO-259-polishing/
--
  Merged /accumulo/branches/1.4/src:r1450271
  Merged /accumulo/branches/1.5:r1449464-1450387
  Merged /accumulo/branches/1.4:r1450271

Propchange: accumulo/branches/ACCUMULO-259-polishing/assemble/
--
  Merged /accumulo/branches/1.4/src/assemble:r1450271
  Merged /accumulo/branches/1.4/assemble:r1450271
  Merged /accumulo/branches/1.5/assemble:r1449464-1450368

Propchange: accumulo/branches/ACCUMULO-259-polishing/core/
--
  Merged /accumulo/branches/1.5/core:r1449464-1450368
  Merged /accumulo/branches/1.4/core:r1450271
  Merged /accumulo/branches/1.4/src/core:r1450271

Modified: 
accumulo/branches/ACCUMULO-259-polishing/core/src/main

svn commit: r1451357 - in /accumulo/branches/ACCUMULO-259-polishing/core/src/main: java/org/apache/accumulo/core/security/thrift/AuthInfo.java thrift/security.thrift

2013-02-28 Thread ctubbsii
Author: ctubbsii
Date: Thu Feb 28 21:21:30 2013
New Revision: 1451357

URL: http://svn.apache.org/r1451357
Log:
ACCUMULO-1025 correct capitalization in javadoc tag

Modified:

accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java

accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift

Modified: 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java?rev=1451357r1=1451356r2=1451357view=diff
==
--- 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
 (original)
+++ 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
 Thu Feb 28 21:21:30 2013
@@ -47,8 +47,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- *  * @Deprecated since 1.5
- * *
+ * @deprecated since 1.5
  */
 @SuppressWarnings(all) public class AuthInfo implements 
org.apache.thrift.TBaseAuthInfo, AuthInfo._Fields, java.io.Serializable, 
Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(AuthInfo);

Modified: 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift?rev=1451357r1=1451356r2=1451357view=diff
==
--- 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift 
(original)
+++ 
accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift 
Thu Feb 28 21:21:30 2013
@@ -39,8 +39,8 @@ enum SecurityErrorCode {
 }
 
 /**
- * @Deprecated since 1.5
-**/
+ @deprecated since 1.5
+*/
 struct AuthInfo {
 1:string user,
 2:binary password,




svn commit: r1451401 [2/11] - in /accumulo/branches/1.5: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/

2013-02-28 Thread ctubbsii
Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java?rev=1451401r1=1451400r2=1451401view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
 Thu Feb 28 22:31:00 2013
@@ -32,16 +32,16 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.SortedKeyIterator;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 
 public class TabletServerBatchDeleter extends TabletServerBatchReader 
implements BatchDeleter {
   
   private Instance instance;
-  private Credential credentials;
+  private TCredentials credentials;
   private String tableId;
   private BatchWriterConfig bwConfig;
   
-  public TabletServerBatchDeleter(Instance instance, Credential credentials, 
String tableId, Authorizations authorizations, int numQueryThreads,
+  public TabletServerBatchDeleter(Instance instance, TCredentials credentials, 
String tableId, Authorizations authorizations, int numQueryThreads,
   BatchWriterConfig bwConfig) throws TableNotFoundException {
 super(instance, credentials, tableId, authorizations, numQueryThreads);
 this.instance = instance;

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java?rev=1451401r1=1451400r2=1451401view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
 Thu Feb 28 22:31:00 2013
@@ -29,7 +29,7 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.accumulo.core.util.SimpleThreadPool;
 import org.apache.log4j.Logger;
@@ -44,7 +44,7 @@ public class TabletServerBatchReader ext
   private Instance instance;
   private ArrayListRange ranges;
   
-  private Credential credentials;
+  private TCredentials credentials;
   private Authorizations authorizations = Constants.NO_AUTHS;
   
   private static int nextBatchReaderInstance = 1;
@@ -55,7 +55,7 @@ public class TabletServerBatchReader ext
   
   private final int batchReaderInstance = getNextBatchReaderInstance();
   
-  public TabletServerBatchReader(Instance instance, Credential credentials, 
String table, Authorizations authorizations, int numQueryThreads) {
+  public TabletServerBatchReader(Instance instance, TCredentials credentials, 
String table, Authorizations authorizations, int numQueryThreads) {
 ArgumentChecker.notNull(instance, credentials, table, authorizations);
 this.instance = instance;
 this.credentials = credentials;

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1451401r1=1451400r2=1451401view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 Thu Feb 28 22:31:00 2013
@@ -58,7 +58,7 @@ import org.apache.accumulo.core.data.thr
 import org.apache.accumulo.core.data.thrift.TRange;
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
 import 

svn commit: r1451401 [11/11] - in /accumulo/branches/1.5: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org

2013-02-28 Thread ctubbsii
Modified: 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java?rev=1451401r1=1451400r2=1451401view=diff
==
--- 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
 (original)
+++ 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
 Thu Feb 28 22:31:00 2013
@@ -25,7 +25,7 @@ import org.apache.accumulo.core.Constant
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
 import 
org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Processor;
@@ -64,13 +64,13 @@ public class ZombieTServer {
 }
 
 @Override
-synchronized public void fastHalt(TInfo tinfo, Credential credentials, 
String lock) {
+synchronized public void fastHalt(TInfo tinfo, TCredentials credentials, 
String lock) {
   halted = true;
   notifyAll();
 }
 
 @Override
-public TabletServerStatus getTabletServerStatus(TInfo tinfo, Credential 
credentials) throws ThriftSecurityException, TException {
+public TabletServerStatus getTabletServerStatus(TInfo tinfo, TCredentials 
credentials) throws ThriftSecurityException, TException {
   synchronized (this) {
 if (statusCount++  1) {
   TabletServerStatus result = new TabletServerStatus();
@@ -83,7 +83,7 @@ public class ZombieTServer {
 }
 
 @Override
-synchronized public void halt(TInfo tinfo, Credential credentials, String 
lock) throws ThriftSecurityException, TException {
+synchronized public void halt(TInfo tinfo, TCredentials credentials, 
String lock) throws ThriftSecurityException, TException {
   halted = true;
   notifyAll();
 }

Modified: 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java?rev=1451401r1=1451400r2=1451401view=diff
==
--- 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
 (original)
+++ 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
 Thu Feb 28 22:31:00 2013
@@ -56,7 +56,8 @@ public class MetadataBatchScanTest {
*/
   public static void main(String[] args) throws Exception {
 
-final Connector connector = new ZooKeeperInstance(acu14, 
localhost).getConnector(SecurityConstants.getSystemCredentials());
+final Connector connector = new ZooKeeperInstance(acu14, localhost)
+.getConnector(SecurityConstants.SYSTEM_PRINCIPAL, 
SecurityConstants.getSystemToken());
 
 TreeSetLong splits = new TreeSetLong();
 Random r = new Random(42);
@@ -205,6 +206,7 @@ public class MetadataBatchScanTest {
   count2.addStat(ss.count2);
 }
 
+@Override
 public String toString() {
   return [ + delta1 + ] [ + delta2 + ];
 }

Modified: 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java?rev=1451401r1=1451400r2=1451401view=diff
==
--- 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
 (original)
+++ 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
 Thu Feb 28 22:31:00 2013
@@ -63,7 +63,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.system.MultiIterator;
 import org.apache.accumulo.core.iterators.system.VisibilityFilter;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.util.AddressUtil;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.MetadataTable;
@@ -339,7 +339,7 @@ public class CollectTabletStats {
 
   }
   
-  private static ListKeyExtent 

svn commit: r1451401 [6/11] - in /accumulo/branches/1.5: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/

2013-02-28 Thread ctubbsii
Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java?rev=1451401r1=1451400r2=1451401view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java
 Thu Feb 28 22:31:00 2013
@@ -24,9 +24,9 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.security.thrift.Credential;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.log4j.Logger;
@@ -37,30 +37,16 @@ import org.apache.thrift.TSerializer;
 public class CredentialHelper {
   static Logger log = Logger.getLogger(CredentialHelper.class);
   
-  /**
-   * @param principal
-   * @param token
-   * @param instanceID
-   * @return A proper Credential object which can be deserialized by the server
-   */
-  public static Credential create(String principal, SecurityToken token, 
String instanceID) throws AccumuloSecurityException {
-String className = token.getClass().getCanonicalName();
-return new Credential(principal, className, 
ByteBuffer.wrap(toBytes(token)), instanceID);
-  }
-  
-  /**
-   * @param cred
-   * @return A serialized Credential as a Base64 encoded String
-   */
-  public static String asBase64String(Credential cred) throws 
AccumuloSecurityException {
+  public static TCredentials create(String principal, AuthenticationToken 
token, String instanceID) throws AccumuloSecurityException {
+String className = token.getClass().getName();
+return new TCredentials(principal, className, 
ByteBuffer.wrap(toBytes(token)), instanceID);
+  }
+  
+  public static String asBase64String(TCredentials cred) throws 
AccumuloSecurityException {
 return new String(Base64.encodeBase64(asByteArray(cred)), 
Charset.forName(UTF-8));
   }
   
-  /**
-   * @param cred
-   * @return a serialized Credential
-   */
-  public static byte[] asByteArray(Credential cred) throws 
AccumuloSecurityException {
+  public static byte[] asByteArray(TCredentials cred) throws 
AccumuloSecurityException {
 TSerializer ts = new TSerializer();
 try {
   return ts.serialize(cred);
@@ -71,22 +57,14 @@ public class CredentialHelper {
 }
   }
   
-  /**
-   * @param string
-   * @return
-   */
-  public static Credential fromBase64String(String string) throws 
AccumuloSecurityException {
+  public static TCredentials fromBase64String(String string) throws 
AccumuloSecurityException {
 return 
fromByteArray(Base64.decodeBase64(string.getBytes(Charset.forName(UTF-8;
   }
   
-  /**
-   * @param decodeBase64
-   * @return
-   */
-  private static Credential fromByteArray(byte[] decodeBase64) throws 
AccumuloSecurityException {
+  private static TCredentials fromByteArray(byte[] decodeBase64) throws 
AccumuloSecurityException {
 TDeserializer td = new TDeserializer();
 try {
-  Credential toRet = new Credential();
+  TCredentials toRet = new TCredentials();
   td.deserialize(toRet, decodeBase64);
   return toRet;
 } catch (TException e) {
@@ -96,23 +74,11 @@ public class CredentialHelper {
 }
   }
   
-  /**
-   * @param toAuth
-   * @return
-   * @throws AccumuloSecurityException
-   */
-  public static SecurityToken extractToken(Credential toAuth) throws 
AccumuloSecurityException {
-return extractToken(toAuth.tokenClass, toAuth.getToken());
-  }
-  
-  /**
-   * @param systemPrincipal
-   * @param systemToken
-   * @param instanceID
-   * @param b
-   * @return
-   */
-  public static Credential createSquelchError(String principal, SecurityToken 
token, String instanceID) {
+  public static AuthenticationToken extractToken(TCredentials toAuth) throws 
AccumuloSecurityException {
+return extractToken(toAuth.tokenClassName, toAuth.getToken());
+  }
+  
+  public static TCredentials createSquelchError(String principal, 
AuthenticationToken token, String instanceID) {
 try {
   return create(principal, token, instanceID);
 } catch (AccumuloSecurityException e) {
@@ -121,21 +87,11 @@ public class CredentialHelper {
 }
   }
   
-  /**
-   * @param token
-   * @return
-   * @throws AccumuloSecurityException 
-   */
-  public static String tokenAsBase64(SecurityToken token) throws 
AccumuloSecurityException {
+  public static String 

svn commit: r1451409 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/mock/ core/src/test/java/org/apache/accumulo/co

2013-02-28 Thread ctubbsii
Author: ctubbsii
Date: Thu Feb 28 22:40:05 2013
New Revision: 1451409

URL: http://svn.apache.org/r1451409
Log:
ACCUMULO-1025 Remove warnings associated with deprecated AuthInfo

Modified:

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/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.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=1451409r1=1451408r2=1451409view=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
 Thu Feb 28 22:40:05 2013
@@ -22,7 +22,6 @@ import java.util.Properties;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.security.handler.Authenticator;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 
@@ -101,7 +100,7 @@ public interface Instance {
* @deprecated since 1.5, use {@link #getConnector(String, 
AuthenticationToken)}
*/
   @Deprecated
-  public abstract Connector getConnector(AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException;
+  public abstract Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException;
   
   /**
* Returns a connection to accumulo.

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=1451409r1=1451408r2=1451409view=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
 Thu Feb 28 22:40:05 2013
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.conf.Pro
 import org.apache.accumulo.core.file.FileUtil;
 import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
 import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
@@ -304,7 +303,7 @@ public class ZooKeeperInstance implement
   
   @Deprecated
   @Override
-  public Connector getConnector(AuthInfo auth) throws AccumuloException, 
AccumuloSecurityException {
+  public Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException {
 return getConnector(auth.user, auth.password);
   }
   

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java?rev=1451409r1=1451408r2=1451409view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
 Thu Feb 28 22:40:05 2013
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.client.I
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.security.CredentialHelper;
 import org.apache.accumulo.core.security.handler.ZKAuthenticator;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.tokens.AuthenticationToken;
@@ -147,7 +146,7 @@ public class MockInstance implements Ins
   
   @Deprecated
   @Override
-  public Connector getConnector(AuthInfo auth) throws AccumuloException, 
AccumuloSecurityException {
+  public Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth

svn commit: r1451419 [2/11] - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/

2013-02-28 Thread ctubbsii
Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java?rev=1451419r1=1451418r2=1451419view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
 Thu Feb 28 23:05:24 2013
@@ -32,16 +32,16 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.SortedKeyIterator;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 
 public class TabletServerBatchDeleter extends TabletServerBatchReader 
implements BatchDeleter {
   
   private Instance instance;
-  private Credential credentials;
+  private TCredentials credentials;
   private String tableId;
   private BatchWriterConfig bwConfig;
   
-  public TabletServerBatchDeleter(Instance instance, Credential credentials, 
String tableId, Authorizations authorizations, int numQueryThreads,
+  public TabletServerBatchDeleter(Instance instance, TCredentials credentials, 
String tableId, Authorizations authorizations, int numQueryThreads,
   BatchWriterConfig bwConfig) throws TableNotFoundException {
 super(instance, credentials, tableId, authorizations, numQueryThreads);
 this.instance = instance;

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java?rev=1451419r1=1451418r2=1451419view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
 Thu Feb 28 23:05:24 2013
@@ -29,7 +29,7 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.accumulo.core.util.SimpleThreadPool;
 import org.apache.log4j.Logger;
@@ -44,7 +44,7 @@ public class TabletServerBatchReader ext
   private Instance instance;
   private ArrayListRange ranges;
   
-  private Credential credentials;
+  private TCredentials credentials;
   private Authorizations authorizations = Constants.NO_AUTHS;
   
   private static int nextBatchReaderInstance = 1;
@@ -55,7 +55,7 @@ public class TabletServerBatchReader ext
   
   private final int batchReaderInstance = getNextBatchReaderInstance();
   
-  public TabletServerBatchReader(Instance instance, Credential credentials, 
String table, Authorizations authorizations, int numQueryThreads) {
+  public TabletServerBatchReader(Instance instance, TCredentials credentials, 
String table, Authorizations authorizations, int numQueryThreads) {
 ArgumentChecker.notNull(instance, credentials, table, authorizations);
 this.instance = instance;
 this.credentials = credentials;

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1451419r1=1451418r2=1451419view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 Thu Feb 28 23:05:24 2013
@@ -58,7 +58,7 @@ import org.apache.accumulo.core.data.thr
 import org.apache.accumulo.core.data.thrift.TRange;
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
@@ -79,7 +79,7 @@ public class 

svn commit: r1451419 [6/11] - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/

2013-02-28 Thread ctubbsii
Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java?rev=1451419r1=1451418r2=1451419view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java
 Thu Feb 28 23:05:24 2013
@@ -24,9 +24,9 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.security.thrift.Credential;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.log4j.Logger;
@@ -37,30 +37,16 @@ import org.apache.thrift.TSerializer;
 public class CredentialHelper {
   static Logger log = Logger.getLogger(CredentialHelper.class);
   
-  /**
-   * @param principal
-   * @param token
-   * @param instanceID
-   * @return A proper Credential object which can be deserialized by the server
-   */
-  public static Credential create(String principal, SecurityToken token, 
String instanceID) throws AccumuloSecurityException {
-String className = token.getClass().getCanonicalName();
-return new Credential(principal, className, 
ByteBuffer.wrap(toBytes(token)), instanceID);
-  }
-  
-  /**
-   * @param cred
-   * @return A serialized Credential as a Base64 encoded String
-   */
-  public static String asBase64String(Credential cred) throws 
AccumuloSecurityException {
+  public static TCredentials create(String principal, AuthenticationToken 
token, String instanceID) throws AccumuloSecurityException {
+String className = token.getClass().getName();
+return new TCredentials(principal, className, 
ByteBuffer.wrap(toBytes(token)), instanceID);
+  }
+  
+  public static String asBase64String(TCredentials cred) throws 
AccumuloSecurityException {
 return new String(Base64.encodeBase64(asByteArray(cred)), 
Charset.forName(UTF-8));
   }
   
-  /**
-   * @param cred
-   * @return a serialized Credential
-   */
-  public static byte[] asByteArray(Credential cred) throws 
AccumuloSecurityException {
+  public static byte[] asByteArray(TCredentials cred) throws 
AccumuloSecurityException {
 TSerializer ts = new TSerializer();
 try {
   return ts.serialize(cred);
@@ -71,22 +57,14 @@ public class CredentialHelper {
 }
   }
   
-  /**
-   * @param string
-   * @return
-   */
-  public static Credential fromBase64String(String string) throws 
AccumuloSecurityException {
+  public static TCredentials fromBase64String(String string) throws 
AccumuloSecurityException {
 return 
fromByteArray(Base64.decodeBase64(string.getBytes(Charset.forName(UTF-8;
   }
   
-  /**
-   * @param decodeBase64
-   * @return
-   */
-  private static Credential fromByteArray(byte[] decodeBase64) throws 
AccumuloSecurityException {
+  private static TCredentials fromByteArray(byte[] decodeBase64) throws 
AccumuloSecurityException {
 TDeserializer td = new TDeserializer();
 try {
-  Credential toRet = new Credential();
+  TCredentials toRet = new TCredentials();
   td.deserialize(toRet, decodeBase64);
   return toRet;
 } catch (TException e) {
@@ -96,23 +74,11 @@ public class CredentialHelper {
 }
   }
   
-  /**
-   * @param toAuth
-   * @return
-   * @throws AccumuloSecurityException
-   */
-  public static SecurityToken extractToken(Credential toAuth) throws 
AccumuloSecurityException {
-return extractToken(toAuth.tokenClass, toAuth.getToken());
-  }
-  
-  /**
-   * @param systemPrincipal
-   * @param systemToken
-   * @param instanceID
-   * @param b
-   * @return
-   */
-  public static Credential createSquelchError(String principal, SecurityToken 
token, String instanceID) {
+  public static AuthenticationToken extractToken(TCredentials toAuth) throws 
AccumuloSecurityException {
+return extractToken(toAuth.tokenClassName, toAuth.getToken());
+  }
+  
+  public static TCredentials createSquelchError(String principal, 
AuthenticationToken token, String instanceID) {
 try {
   return create(principal, token, instanceID);
 } catch (AccumuloSecurityException e) {
@@ -121,21 +87,11 @@ public class CredentialHelper {
 }
   }
   
-  /**
-   * @param token
-   * @return
-   * @throws AccumuloSecurityException 
-   */
-  public static String tokenAsBase64(SecurityToken token) throws 
AccumuloSecurityException {
+  public static String 

svn commit: r1451419 [11/11] - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache

2013-02-28 Thread ctubbsii
Modified: 
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java?rev=1451419r1=1451418r2=1451419view=diff
==
--- 
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
 (original)
+++ 
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
 Thu Feb 28 23:05:24 2013
@@ -63,7 +63,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.system.MultiIterator;
 import org.apache.accumulo.core.iterators.system.VisibilityFilter;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.util.AddressUtil;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.MetadataTable;
@@ -339,7 +339,7 @@ public class CollectTabletStats {
 
   }
   
-  private static ListKeyExtent findTablets(boolean selectLocalTablets, 
Credential credentials, String table, Instance zki,
+  private static ListKeyExtent findTablets(boolean selectLocalTablets, 
TCredentials credentials, String table, Instance zki,
   MapKeyExtent,String locations) throws Exception {
 SortedSetKeyExtent tablets = new TreeSetKeyExtent();
 
@@ -374,7 +374,7 @@ public class CollectTabletStats {
 return tabletsToTest;
   }
   
-  private static ListString getTabletFiles(Credential token, Instance zki, 
String tableId, KeyExtent ke) {
+  private static ListString getTabletFiles(TCredentials token, Instance zki, 
String tableId, KeyExtent ke) {
 ListString files = new ArrayListString();
 
 SortedMapKey,Value tkv = new TreeMapKey,Value();

Modified: 
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java?rev=1451419r1=1451418r2=1451419view=diff
==
--- 
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
 (original)
+++ 
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
 Thu Feb 28 23:05:24 2013
@@ -46,7 +46,7 @@ import org.apache.accumulo.core.data.thr
 import org.apache.accumulo.core.data.thrift.TRange;
 import org.apache.accumulo.core.data.thrift.UpdateErrors;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction;
@@ -89,7 +89,7 @@ public class NullTserver {
 }
 
 @Override
-public long startUpdate(TInfo tinfo, Credential credentials) {
+public long startUpdate(TInfo tinfo, TCredentials credentials) {
   return updateSession++;
 }
 
@@ -102,7 +102,7 @@ public class NullTserver {
 }
 
 @Override
-public ListTKeyExtent bulkImport(TInfo tinfo, Credential credentials, 
long tid, MapTKeyExtent,MapString,MapFileInfo files, boolean setTime) {
+public ListTKeyExtent bulkImport(TInfo tinfo, TCredentials credentials, 
long tid, MapTKeyExtent,MapString,MapFileInfo files, boolean setTime) {
   return null;
 }
 
@@ -123,74 +123,74 @@ public class NullTserver {
 }
 
 @Override
-public void splitTablet(TInfo tinfo, Credential credentials, TKeyExtent 
extent, ByteBuffer splitPoint) {
+public void splitTablet(TInfo tinfo, TCredentials credentials, TKeyExtent 
extent, ByteBuffer splitPoint) {
   
 }
 
 @Override
-public InitialMultiScan startMultiScan(TInfo tinfo, Credential 
credentials, MapTKeyExtent,ListTRange batch, ListTColumn columns,
+public InitialMultiScan startMultiScan(TInfo tinfo, TCredentials 
credentials, MapTKeyExtent,ListTRange batch, ListTColumn columns,
 ListIterInfo ssiList, MapString,MapString,String ssio, 
ListByteBuffer authorizations, boolean waitForWrites) {
   return null;
 }
 
 @Override
-public InitialScan startScan(TInfo tinfo, Credential credentials, 
TKeyExtent extent, TRange range, ListTColumn columns, int batchSize,
+public InitialScan startScan(TInfo tinfo, TCredentials credentials, 
TKeyExtent extent, TRange range, ListTColumn columns, int batchSize,
 ListIterInfo ssiList, MapString,MapString,String ssio, 
ListByteBuffer authorizations, 

svn commit: r1451515 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/tokens/

2013-03-01 Thread ctubbsii
Author: ctubbsii
Date: Fri Mar  1 08:09:35 2013
New Revision: 1451515

URL: http://svn.apache.org/r1451515
Log:
ACCUMULO-1133 Finish incomplete move of tokens.

Removed:

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/tokens/



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) || 
req.getRequestURI().equals(/docs

svn commit: r1464817 [3/3] - in /accumulo/branches/1.5: ./ assemble/ assemble/deb/accumulo/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf

2013-04-04 Thread ctubbsii
Modified: accumulo/branches/1.5/start/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/pom.xml?rev=1464817r1=1464816r2=1464817view=diff
==
--- accumulo/branches/1.5/start/pom.xml (original)
+++ accumulo/branches/1.5/start/pom.xml Fri Apr  5 02:54:02 2013
@@ -16,51 +16,83 @@
   limitations under the License.
 --
 project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
-
+  modelVersion4.0.0/modelVersion
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
 version1.5.0-SNAPSHOT/version
   /parent
-
-  modelVersion4.0.0/modelVersion
   artifactIdaccumulo-start/artifactId
   nameStart/name
-
+  dependencies
+dependency
+  groupIdcommons-io/groupId
+  artifactIdcommons-io/artifactId
+/dependency
+dependency
+  groupIdcommons-logging/groupId
+  artifactIdcommons-logging/artifactId
+/dependency
+dependency
+  groupIdlog4j/groupId
+  artifactIdlog4j/artifactId
+/dependency
+dependency
+  groupIdorg.apache.commons/groupId
+  artifactIdcommons-vfs2/artifactId
+/dependency
+dependency
+  groupIdjavax.ws.rs/groupId
+  artifactIdjsr311-api/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdjunit/groupId
+  artifactIdjunit/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.easymock/groupId
+  artifactIdeasymock/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-api-easymock/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-core/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-module-junit4/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-reflect/artifactId
+  scopetest/scope
+/dependency
+  /dependencies
   build
 pluginManagement
   plugins
 plugin
-  artifactIdmaven-jar-plugin/artifactId
+  artifactIdmaven-surefire-plugin/artifactId
   configuration
-outputDirectory../lib/outputDirectory
-archive
-  manifestSections
-manifestSection
-  nameaccumulo/start//name
-  manifestEntries
-Sealedtrue/Sealed
-  /manifestEntries
-/manifestSection
-  /manifestSections
-/archive
+forkModealways/forkMode
   /configuration
 /plugin
-plugin
-  artifactIdmaven-surefire-plugin/artifactId
-  configuration
-forkModealways/forkMode
-  /configuration
-/plugin
-
   /plugins
 /pluginManagement
   /build
-  
   profiles
-!-- profile for building against Hadoop 1.0.x
-Activate by not specifying hadoop.profile --
 profile
+  !-- profile for building against Hadoop 1.0.x
+  Activate by not specifying hadoop.profile --
   idhadoop-1.0/id
   activation
 property
@@ -71,18 +103,18 @@
 dependency
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-core/artifactId
+  scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-test/artifactId
-  version${hadoop.version}/version
   scopetest/scope
 /dependency
   /dependencies
 /profile
-!-- profile for building against Hadoop 2.0.x
-Activate using: mvn -Dhadoop.profile=2.0 --
 profile
+  !-- profile for building against Hadoop 2.0.x
+  Activate using: mvn -Dhadoop.profile=2.0 --
   idhadoop-2.0/id
   activation
 property
@@ -94,71 +126,30 @@
 dependency
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-client/artifactId
+  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.hadoop/groupId
+  artifactIdhadoop-common/artifactId
+  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.hadoop/groupId
+  artifactIdhadoop-hdfs/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.apache.hadoop/groupId
+  artifactIdhadoop-hdfs/artifactId
+  typetest-jar/type
+  scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-minicluster/artifactId
-  version${hadoop.version}/version
   scopetest/scope
 

svn commit: r1464818 [3/3] - in /accumulo/trunk: ./ assemble/ assemble/deb/accumulo/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/exampl

2013-04-04 Thread ctubbsii
Modified: accumulo/trunk/server/src/test/resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/resources/log4j.properties?rev=1464818r1=1464817r2=1464818view=diff
==
--- accumulo/trunk/server/src/test/resources/log4j.properties (original)
+++ accumulo/trunk/server/src/test/resources/log4j.properties Fri Apr  5 
03:31:32 2013
@@ -1,3 +1,18 @@
+# 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

Propchange: accumulo/trunk/src/
--
  Merged 
/accumulo/branches/1.5/src:r1462232-1462246,1462248-1462258,1462260-1462466,1462468-1463545,1463547-1463551,1463554-1463733,1463735-1463743,1463745-1463979,1463981-1463987,1463989-1464091,1464093-1464118,1464120-1464188,1464190-1464193,1464195-1464581,1464583-1464671,1464673-1464817

Modified: accumulo/trunk/start/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/start/pom.xml?rev=1464818r1=1464817r2=1464818view=diff
==
--- accumulo/trunk/start/pom.xml (original)
+++ accumulo/trunk/start/pom.xml Fri Apr  5 03:31:32 2013
@@ -16,51 +16,83 @@
   limitations under the License.
 --
 project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
-
+  modelVersion4.0.0/modelVersion
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
 version1.6.0-SNAPSHOT/version
   /parent
-
-  modelVersion4.0.0/modelVersion
   artifactIdaccumulo-start/artifactId
   nameStart/name
-
+  dependencies
+dependency
+  groupIdcommons-io/groupId
+  artifactIdcommons-io/artifactId
+/dependency
+dependency
+  groupIdcommons-logging/groupId
+  artifactIdcommons-logging/artifactId
+/dependency
+dependency
+  groupIdlog4j/groupId
+  artifactIdlog4j/artifactId
+/dependency
+dependency
+  groupIdorg.apache.commons/groupId
+  artifactIdcommons-vfs2/artifactId
+/dependency
+dependency
+  groupIdjavax.ws.rs/groupId
+  artifactIdjsr311-api/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdjunit/groupId
+  artifactIdjunit/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.easymock/groupId
+  artifactIdeasymock/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-api-easymock/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-core/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-module-junit4/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.powermock/groupId
+  artifactIdpowermock-reflect/artifactId
+  scopetest/scope
+/dependency
+  /dependencies
   build
 pluginManagement
   plugins
 plugin
-  artifactIdmaven-jar-plugin/artifactId
+  artifactIdmaven-surefire-plugin/artifactId
   configuration
-outputDirectory../lib/outputDirectory
-archive
-  manifestSections
-manifestSection
-  nameaccumulo/start//name
-  manifestEntries
-Sealedtrue/Sealed
-  /manifestEntries
-/manifestSection
-  /manifestSections
-/archive
+forkModealways/forkMode
   /configuration
 /plugin
-plugin
-  artifactIdmaven-surefire-plugin/artifactId
-  configuration
-forkModealways/forkMode
-  /configuration
-/plugin
-
   /plugins
 /pluginManagement
   /build
-  
   profiles
-!-- profile for building against Hadoop 1.0.x
-Activate by not specifying 

svn commit: r1465796 - in /accumulo/branches/1.5: assemble/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/resources/org/apache/accumulo/core/conf/ docs/

2013-04-08 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr  8 21:24:52 2013
New Revision: 1465796

URL: http://svn.apache.org/r1465796
Log:
ACCUMULO-1253 Fix build of docs/config.html; strike-through deprecated 
properties

Removed:
accumulo/branches/1.5/assemble/docgen.sh
Modified:
accumulo/branches/1.5/assemble/build.sh
accumulo/branches/1.5/assemble/pom.xml

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java

accumulo/branches/1.5/core/src/main/resources/org/apache/accumulo/core/conf/config.html
accumulo/branches/1.5/docs/documentation.css

Modified: accumulo/branches/1.5/assemble/build.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/build.sh?rev=1465796r1=1465795r2=1465796view=diff
==
--- accumulo/branches/1.5/assemble/build.sh (original)
+++ accumulo/branches/1.5/assemble/build.sh Mon Apr  8 21:24:52 2013
@@ -46,7 +46,5 @@ if [ $COUNT -ne $EXPECTED ]
 then
fail expected $EXPECTED files missing licenses, but saw $COUNT
 fi
-#need to run mvn package twice to properly build docs/config.html
-run mvn package
 run mvn package javadoc:aggregate javadoc:jar source:jar -Pdist
 run mvn -P assemble

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1465796r1=1465795r2=1465796view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Mon Apr  8 21:24:52 2013
@@ -73,13 +73,15 @@
   execution
 idconfig-webpage/id
 goals
-  goalexec/goal
+  goaljava/goal
 /goals
-phasepackage/phase
+phaseprepare-package/phase
 configuration
-  executablebash/executable
+  
mainClassorg.apache.accumulo.core.conf.DefaultConfiguration/mainClass
+  classpathScopecompile/classpathScope
   arguments
-argumentdocgen.sh/argument
+argument--generate-doc/argument
+
argument${project.build.directory}/../../docs/config.html/argument
   /arguments
 /configuration
   /execution

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1465796r1=1465795r2=1465796view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
 Mon Apr  8 21:24:52 2013
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.core.conf;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -55,7 +56,7 @@ public class DefaultConfiguration extend
   
   private static void generateDocumentation(PrintStream doc) {
 // read static content from resources and output
-InputStream data = 
DefaultConfiguration.class.getClassLoader().getResourceAsStream(config.html);
+InputStream data = 
DefaultConfiguration.class.getResourceAsStream(config.html);
 if (data != null) {
   byte[] buffer = new byte[1024];
   int n;
@@ -66,11 +67,11 @@ public class DefaultConfiguration extend
 e.printStackTrace();
 return;
   } finally {
- try { 
- data.close();
- } catch (IOException ex) {
- log .error(ex, ex);
- }
+try {
+  data.close();
+} catch (IOException ex) {
+  log.error(ex, ex);
+}
   }
 }
 doc.println();
@@ -80,46 +81,54 @@ public class DefaultConfiguration extend
 for (Property prop : Property.values()) {
   if (prop.isExperimental())
 continue;
-
+  
   if (prop.getType().equals(PropertyType.PREFIX))
 prefixes.add(prop);
   else
 sortedProps.put(prop.getKey(), prop);
 }
 
-doc.println(  pJump to: );
+int indentDepth = 2;
+doc.println(indent(indentDepth++) + pJump to: );
 String delimiter = ;
 for (Property prefix : prefixes) {
   if (prefix.isExperimental())
 continue;
-
+  
   doc.print(delimiter + a href='# + prefix.name() + ' + 
prefix.getKey() + */a);
   delimiter = nbsp;|nbsp;;
 }
-doc.println(  /p);
+doc.println(indent(--indentDepth) + /p);
 
-doc.println(  table

svn commit: r1466685 - in /accumulo/branches/1.5: assemble/pom.xml bin/accumulo bin/bootstrap_hdfs.sh core/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.x

2013-04-10 Thread ctubbsii
Author: ctubbsii
Date: Wed Apr 10 21:13:04 2013
New Revision: 1466685

URL: http://svn.apache.org/r1466685
Log:
ACCUMULO-1244 Make more libraries provided, because they must be. So, we'll 
depend on the version given by Hadoop. Remove all provided jars and source jars 
from lib directory.

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/bin/accumulo
accumulo/branches/1.5/bin/bootstrap_hdfs.sh
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Wed Apr 10 21:13:04 2013
@@ -34,6 +34,11 @@
 modules in our assembly, we only need to ensure this distribution project 
builds AFTER those... --
   dependencies
 dependency
+  groupIdlog4j/groupId
+  artifactIdlog4j/artifactId
+  scopeprovided/scope
+/dependency
+dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-core/artifactId
   scopeprovided/scope

Modified: accumulo/branches/1.5/bin/accumulo
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/accumulo?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/bin/accumulo (original)
+++ accumulo/branches/1.5/bin/accumulo Wed Apr 10 21:13:04 2013
@@ -28,7 +28,7 @@ script=$( basename $SOURCE )
 
 . $bin/config.sh
 
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar
+START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
 
 #
 # Resolve a program to its installation directory
@@ -81,7 +81,8 @@ logger)  export ACCUMULO_OPTS=${ACCUMUL
 esac
 
 XML_FILES=${ACCUMULO_HOME}/conf
-CLASSPATH=${XML_FILES}:${START_JAR}
+LOG4J_JAR=$(ls $HADOOP_PREFIX/lib/log4j-*.jar | head -1)
+CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 
 if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
echo JAVA_HOME is not set or is not a directory.  Please make sure it's 
set globally or in conf/accumulo-env.sh

Modified: accumulo/branches/1.5/bin/bootstrap_hdfs.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/bootstrap_hdfs.sh?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/bin/bootstrap_hdfs.sh (original)
+++ accumulo/branches/1.5/bin/bootstrap_hdfs.sh Wed Apr 10 21:13:04 2013
@@ -74,8 +74,6 @@ fi
 #
 # We need two of the jars in lib, copy them back out and remove them from the 
system context dir
 #
-$HADOOP_PREFIX/bin/hadoop fs -copyToLocal 
$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar $ACCUMULO_HOME/lib/.   /dev/null
-$HADOOP_PREFIX/bin/hadoop fs -rmr 
$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar   /dev/null
 $HADOOP_PREFIX/bin/hadoop fs -copyToLocal 
$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar $ACCUMULO_HOME/lib/.   
/dev/null
 $HADOOP_PREFIX/bin/hadoop fs -rmr 
$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar   /dev/null
 $HADOOP_PREFIX/bin/hadoop fs -copyToLocal 
$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start-${ACCUMULO_VERSION}.jar 
$ACCUMULO_HOME/lib/.   /dev/null

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Wed Apr 10 21:13:04 2013
@@ -30,66 +30,74 @@
   artifactIdjcommander/artifactId
 /dependency
 dependency
+  groupIdjline/groupId
+  artifactIdjline/artifactId
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-fate/artifactId
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-start/artifactId
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-trace/artifactId
+/dependency
+dependency
+  groupIdorg.apache.thrift/groupId
+  artifactIdlibthrift/artifactId
+/dependency
+dependency
   groupIdcommons-cli/groupId
   artifactIdcommons-cli/artifactId
+  scopeprovided/scope
 /dependency
 dependency
   groupIdcommons-codec/groupId
   artifactIdcommons-codec/artifactId
+  scopeprovided/scope
 /dependency
 dependency
   groupIdcommons-collections/groupId

svn commit: r1467019 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/simple/pom.xml pom.xml proxy/pom.xml server/pom.xml test/pom.xml

2013-04-11 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 11 18:06:36 2013
New Revision: 1467019

URL: http://svn.apache.org/r1467019
Log:
ACCUMULO-1265 Fix 'mvn compile'

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/test/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1467019r1=1467018r2=1467019view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Thu Apr 11 18:06:36 2013
@@ -30,42 +30,50 @@
 jnilib**/*.jnilib/jnilib
 so**/*.so/so
   /properties
-  !-- NOTE: These dependency declarations are only required to sort this 
project to the end of the line in the multimodule build. Since we only include 
the child 
-modules in our assembly, we only need to ensure this distribution project 
builds AFTER those... --
   dependencies
-dependency
-  groupIdlog4j/groupId
-  artifactIdlog4j/artifactId
-  scopeprovided/scope
-/dependency
+!--
+   NOTE: These dependency declarations are required to sort
+   this project to the end of the line in the multimodule
+   build.
+   Further, the dependencies for Accumulo artifacts must be
+   here so they will be copied into the lib directory for
+   the binary distribution assemblies.
+   --
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-core/artifactId
-  scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-examples-simple/artifactId
-  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-fate/artifactId
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-proxy/artifactId
-  scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-server/artifactId
-  scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-start/artifactId
-  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-test/artifactId
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-trace/artifactId
+/dependency
+dependency
+  groupIdlog4j/groupId
+  artifactIdlog4j/artifactId
   scopeprovided/scope
 /dependency
   /dependencies

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1467019r1=1467018r2=1467019view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Thu Apr 11 18:06:36 2013
@@ -34,18 +34,6 @@
   artifactIdjline/artifactId
 /dependency
 dependency
-  groupIdorg.apache.accumulo/groupId
-  artifactIdaccumulo-fate/artifactId
-/dependency
-dependency
-  groupIdorg.apache.accumulo/groupId
-  artifactIdaccumulo-start/artifactId
-/dependency
-dependency
-  groupIdorg.apache.accumulo/groupId
-  artifactIdaccumulo-trace/artifactId
-/dependency
-dependency
   groupIdorg.apache.thrift/groupId
   artifactIdlibthrift/artifactId
 /dependency
@@ -85,6 +73,21 @@
   scopeprovided/scope
 /dependency
 dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-fate/artifactId
+  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-start/artifactId
+  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-trace/artifactId
+  scopeprovided/scope
+/dependency
+dependency
   groupIdorg.apache.zookeeper/groupId
   artifactIdzookeeper/artifactId
   scopeprovided/scope

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1467019r1=1467018r2=1467019view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Thu Apr 11 18:06:36 2013
@@ -30,10 +30,6 @@
   artifactIdjcommander/artifactId
 /dependency
 dependency
-  groupIdorg.apache.accumulo/groupId
-  artifactIdaccumulo-core/artifactId
-/dependency
-dependency
   groupIdcommons-codec/groupId

svn commit: r1467027 - /accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh

2013-04-11 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 11 18:13:03 2013
New Revision: 1467027

URL: http://svn.apache.org/r1467027
Log:
ACCUMULO-1250 Trivially fail the build when thrift profile is active

Modified:
accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh

Modified: accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh?rev=1467027r1=1467026r2=1467027view=diff
==
--- accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh (original)
+++ accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh Thu Apr 11 
18:13:03 2013
@@ -47,8 +47,7 @@ if [ $VERSION -ne 1 ] ; then 
   echo *** thrift is not available
   echo ***   expecting 'thrift -version' to return ${REQUIRED_THRIFT_VERSION}
   echo *** generated code will not be updated
-  echo 
-  exit 0
+  fail 
 fi
 
 # Include thrift sources from additional modules




svn commit: r1467036 - in /accumulo/trunk: ./ assemble/ bin/ core/ core/src/main/scripts/ examples/ examples/simple/ fate/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/ac

2013-04-11 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 11 18:32:33 2013
New Revision: 1467036

URL: http://svn.apache.org/r1467036
Log:
ACCUMULO-1265, ACCUMULO-1250, ACCUMULO-1244, ACCUMULO-1063 merged to trunk from 
1.5 branch

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/assemble/pom.xml
accumulo/trunk/bin/accumulo
accumulo/trunk/bin/bootstrap_hdfs.sh
accumulo/trunk/core/   (props changed)
accumulo/trunk/core/pom.xml
accumulo/trunk/core/src/main/scripts/generate-thrift.sh
accumulo/trunk/examples/   (props changed)
accumulo/trunk/examples/simple/pom.xml
accumulo/trunk/fate/pom.xml
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/pom.xml
accumulo/trunk/proxy/pom.xml
accumulo/trunk/server/   (props changed)
accumulo/trunk/server/pom.xml
accumulo/trunk/src/   (props changed)
accumulo/trunk/start/pom.xml
accumulo/trunk/test/pom.xml
accumulo/trunk/trace/pom.xml

Propchange: accumulo/trunk/
--
  Merged 
/accumulo/branches/1.5:r145-1466969,1466971-1467001,1467003-1467004,1467006-1467009,1467011-1467033

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r145-1466969,1466971-1467004,1467006-1467009,1467011-1467033

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1467036r1=1467035r2=1467036view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Thu Apr 11 18:32:33 2013
@@ -30,37 +30,50 @@
 jnilib**/*.jnilib/jnilib
 so**/*.so/so
   /properties
-  !-- NOTE: These dependency declarations are only required to sort this 
project to the end of the line in the multimodule build. Since we only include 
the child 
-modules in our assembly, we only need to ensure this distribution project 
builds AFTER those... --
   dependencies
+!--
+   NOTE: These dependency declarations are required to sort
+   this project to the end of the line in the multimodule
+   build.
+   Further, the dependencies for Accumulo artifacts must be
+   here so they will be copied into the lib directory for
+   the binary distribution assemblies.
+   --
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-core/artifactId
-  scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-examples-simple/artifactId
-  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-fate/artifactId
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-proxy/artifactId
-  scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-server/artifactId
-  scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-start/artifactId
-  scopeprovided/scope
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-test/artifactId
 /dependency
 dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-trace/artifactId
+/dependency
+dependency
+  groupIdlog4j/groupId
+  artifactIdlog4j/artifactId
   scopeprovided/scope
 /dependency
   /dependencies

Modified: accumulo/trunk/bin/accumulo
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/bin/accumulo?rev=1467036r1=1467035r2=1467036view=diff
==
--- accumulo/trunk/bin/accumulo (original)
+++ accumulo/trunk/bin/accumulo Thu Apr 11 18:32:33 2013
@@ -28,7 +28,7 @@ script=$( basename $SOURCE )
 
 . $bin/config.sh
 
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar
+START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
 
 #
 # Resolve a program to its installation directory
@@ -80,7 +80,8 @@ logger)  export ACCUMULO_OPTS=${ACCUMUL
 esac
 
 XML_FILES=${ACCUMULO_HOME}/conf
-CLASSPATH=${XML_FILES}:${START_JAR}
+LOG4J_JAR=$(ls $HADOOP_PREFIX/lib/log4j-*.jar | head -1)
+CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 
 if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
echo JAVA_HOME is not set or is not a directory.  Please make sure it's 
set globally or in conf/accumulo-env.sh

Modified: accumulo/trunk/bin/bootstrap_hdfs.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/bin

svn commit: r1467086 - in /accumulo/branches/1.5: assemble/dist.xml assemble/pom.xml pom.xml

2013-04-11 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 11 21:08:28 2013
New Revision: 1467086

URL: http://svn.apache.org/r1467086
Log:
ACCUMULO-1107 Build rpm and deb better. Made rpm noarch.

Modified:
accumulo/branches/1.5/assemble/dist.xml
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/pom.xml

Modified: accumulo/branches/1.5/assemble/dist.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/dist.xml?rev=1467086r1=1467085r2=1467086view=diff
==
--- accumulo/branches/1.5/assemble/dist.xml (original)
+++ accumulo/branches/1.5/assemble/dist.xml Thu Apr 11 21:08:28 2013
@@ -50,7 +50,7 @@
 include**/*.pl/include
 include**/*.sh/include
 include**/*.example/include
-include${so}/include
+include**/*.so/include
   /includes
   excludes
 exclude**/target/exclude
@@ -109,8 +109,6 @@
 exclude**/randomwalk/conf/logger.xml/exclude
 exclude**/randomwalk/conf/randomwalk.conf/exclude
 exclude**/randomwalk/conf/walkers/exclude
-exclude${so}/exclude
-exclude${jnilib}/exclude
   /excludes
   fileMode0644/fileMode
   directoryMode0755/directoryMode

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1467086r1=1467085r2=1467086view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Thu Apr 11 21:08:28 2013
@@ -27,8 +27,6 @@
   nameAssemble/name
   properties
 accumulo-top../accumulo-top
-jnilib**/*.jnilib/jnilib
-so**/*.so/so
   /properties
   dependencies
 !--
@@ -130,13 +128,6 @@
   /build
 /profile
 profile
-  iddist/id
-  properties
-jnilib/jnilib
-so/so
-  /properties
-/profile
-profile
   idrpm/id
   build
 plugins
@@ -152,7 +143,6 @@
 Google's BigTable design./description
   copyright2011 The Apache Software Foundation./copyright
   urlhttp://accumulo.apache.org/url
-  needarchtrue/needarch
   groupUtilities/group
   requires
 requirejdk/require
@@ -178,6 +168,9 @@
   sources
 source
   location${accumulo-top}/docs/location
+  excludes
+excludesrc/**/exclude
+  /excludes
 /source
   /sources
 /mapping
@@ -187,10 +180,15 @@
 source
   location${accumulo-top}/test/location
   excludes
-exclude${accumulo-top}/**/walkers.txt/exclude
-exclude${accumulo-top}/**/ingesters.txt/exclude
-exclude${accumulo-top}/**/continuous-env.sh/exclude
-exclude${accumulo-top}/**/*.pyc/exclude
+excludesrc/**/exclude
+excludetarget/**/exclude
+exclude**/walkers.txt/exclude
+exclude**/ingesters.txt/exclude
+exclude**/continuous-env.sh/exclude
+exclude.*/**/exclude
+exclude**/*.pyc/exclude
+exclude**/*.pyo/exclude
+excludepom.xml/exclude
   /excludes
 /source
   /sources
@@ -231,19 +229,24 @@
 /mapping
 mapping
   
directory/opt/accumulo/accumulo-${project.version}/lib/directory
-  dependency/dependency
   sources
 source
   location${accumulo-top}/lib/location
+  includes
+include*.jar/include
+  /includes
 /source
   /sources
 /mapping
+mapping
+  
directory/opt/accumulo/accumulo-${project.version}/lib/ext/directory
+/mapping
   /mappings
 /configuration
 executions
   execution
 goals
-  goalrpm/goal
+  goalattached-rpm/goal
 /goals
 phasepackage/phase
   /execution
@@ -267,10 +270,10 @@
 goals
   goaljdeb/goal
 /goals
-phaseinstall/phase
+phasepackage/phase
 configuration
+  classifierdeb/classifier
   
deb${project.build.directory}/${project.artifactId}_${project.version}.deb/deb
-  attachfalse/attach

svn commit: r1467098 - in /accumulo/trunk: ./ assemble/ assemble/dist.xml assemble/pom.xml core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accum

2013-04-11 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 11 21:22:57 2013
New Revision: 1467098

URL: http://svn.apache.org/r1467098
Log:
ACCUMULO-1107 merge to trunk

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/assemble/dist.xml
accumulo/trunk/assemble/pom.xml
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/pom.xml
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1467034-1467050,1467052-1467094

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1467034-1467050,1467052-1467094

Modified: accumulo/trunk/assemble/dist.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1467098r1=1467097r2=1467098view=diff
==
--- accumulo/trunk/assemble/dist.xml (original)
+++ accumulo/trunk/assemble/dist.xml Thu Apr 11 21:22:57 2013
@@ -50,7 +50,7 @@
 include**/*.pl/include
 include**/*.sh/include
 include**/*.example/include
-include${so}/include
+include**/*.so/include
   /includes
   excludes
 exclude**/target/exclude
@@ -109,8 +109,6 @@
 exclude**/randomwalk/conf/logger.xml/exclude
 exclude**/randomwalk/conf/randomwalk.conf/exclude
 exclude**/randomwalk/conf/walkers/exclude
-exclude${so}/exclude
-exclude${jnilib}/exclude
   /excludes
   fileMode0644/fileMode
   directoryMode0755/directoryMode

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1467098r1=1467097r2=1467098view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Thu Apr 11 21:22:57 2013
@@ -27,8 +27,6 @@
   nameAssemble/name
   properties
 accumulo-top../accumulo-top
-jnilib**/*.jnilib/jnilib
-so**/*.so/so
   /properties
   dependencies
 !--
@@ -130,13 +128,6 @@
   /build
 /profile
 profile
-  iddist/id
-  properties
-jnilib/jnilib
-so/so
-  /properties
-/profile
-profile
   idrpm/id
   build
 plugins
@@ -152,7 +143,6 @@
 Google's BigTable design./description
   copyright2011 The Apache Software Foundation./copyright
   urlhttp://accumulo.apache.org/url
-  needarchtrue/needarch
   groupUtilities/group
   requires
 requirejdk/require
@@ -178,6 +168,9 @@
   sources
 source
   location${accumulo-top}/docs/location
+  excludes
+excludesrc/**/exclude
+  /excludes
 /source
   /sources
 /mapping
@@ -187,10 +180,15 @@
 source
   location${accumulo-top}/test/location
   excludes
-exclude${accumulo-top}/**/walkers.txt/exclude
-exclude${accumulo-top}/**/ingesters.txt/exclude
-exclude${accumulo-top}/**/continuous-env.sh/exclude
-exclude${accumulo-top}/**/*.pyc/exclude
+excludesrc/**/exclude
+excludetarget/**/exclude
+exclude**/walkers.txt/exclude
+exclude**/ingesters.txt/exclude
+exclude**/continuous-env.sh/exclude
+exclude.*/**/exclude
+exclude**/*.pyc/exclude
+exclude**/*.pyo/exclude
+excludepom.xml/exclude
   /excludes
 /source
   /sources
@@ -231,19 +229,24 @@
 /mapping
 mapping
   
directory/opt/accumulo/accumulo-${project.version}/lib/directory
-  dependency/dependency
   sources
 source
   location${accumulo-top}/lib/location
+  includes
+include*.jar/include
+  /includes
 /source
   /sources
 /mapping
+mapping
+  
directory/opt/accumulo/accumulo-${project.version}/lib/ext

svn commit: r1467108 - in /accumulo/branches/1.5: ./ server/src/main/java/org/apache/accumulo/server/monitor/servlets/ server/src/main/java/org/apache/accumulo/server/security/ start/src/main/java/org

2013-04-11 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 11 21:56:57 2013
New Revision: 1467108

URL: http://svn.apache.org/r1467108
Log:
ACCUMULO-971 Fix broken javadocs

Modified:
accumulo/branches/1.5/pom.xml

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

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java

accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java

accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1467108r1=1467107r2=1467108view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Thu Apr 11 21:56:57 2013
@@ -386,7 +386,6 @@
   configuration
 encodingUTF-8/encoding
 quiettrue/quiet
-jarOutputDirectorylib/jarOutputDirectory
 reportOutputDirectorydocs/reportOutputDirectory
 javadocVersion1.6/javadocVersion
 additionalJOption-J-Xmx512m/additionalJOption

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java?rev=1467108r1=1467107r2=1467108view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
 Thu Apr 11 21:56:57 2013
@@ -227,7 +227,6 @@ abstract public class BasicServlet exten
* Allow the concrete servlet implementation to provide attributes on the 
body HTML tag,
* such as 'onload', which can be used to call Javascript methods on page 
load.
* By default, nothing is specified.
-   * @return
*/
   protected String getBodyAttributes() {
 return ;

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java?rev=1467108r1=1467107r2=1467108view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
 Thu Apr 11 21:56:57 2013
@@ -94,7 +94,7 @@ public class SecurityOperation {
   
   /**
* 
-   * @Deprecated not for client use
+   * @deprecated not for client use
*/
   public SecurityOperation(String instanceId) {
 ZKUserPath = Constants.ZROOT + / + instanceId + /users;

Modified: 
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java?rev=1467108r1=1467107r2=1467108view=diff
==
--- 
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
 (original)
+++ 
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
 Thu Apr 11 21:56:57 2013
@@ -58,8 +58,7 @@ public class HdfsFileProvider extends Ab
 }
 
 /**
- * @see org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider#
- *  doCreateFileSystem(org.apache.commons.vfs2.FileName, 
org.apache.commons.vfs2.FileSystemOptions)
+ * @see 
org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider#doCreateFileSystem(org.apache.commons.vfs2.FileName,
 org.apache.commons.vfs2.FileSystemOptions)
  */
 @Override
 protected FileSystem doCreateFileSystem(final FileName rootName, final 
FileSystemOptions fileSystemOptions)

Modified: 
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java?rev=1467108r1=1467107r2=1467108view=diff
==
--- 
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
 (original)
+++ 
accumulo/branches/1.5/start

svn commit: r1467112 - 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-04-11 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 11 22:00:45 2013
New Revision: 1467112

URL: http://svn.apache.org/r1467112
Log:
ACCUMULO-971 merge javadoc fixes 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/pom.xml
accumulo/trunk/server/   (props changed)

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
accumulo/trunk/src/   (props changed)

accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java

accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1467095-1467109

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1467095-1467109

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1467095-1467109

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1467095-1467109

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:r1467095-1467109

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:r1467095-1467109

Modified: accumulo/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467112r1=1467111r2=1467112view=diff
==
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Thu Apr 11 22:00:45 2013
@@ -386,7 +386,6 @@
   configuration
 encodingUTF-8/encoding
 quiettrue/quiet
-jarOutputDirectorylib/jarOutputDirectory
 reportOutputDirectorydocs/reportOutputDirectory
 javadocVersion1.6/javadocVersion
 additionalJOption-J-Xmx512m/additionalJOption

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1467095-1467109

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java?rev=1467112r1=1467111r2=1467112view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
 Thu Apr 11 22:00:45 2013
@@ -227,7 +227,6 @@ abstract public class BasicServlet exten
* Allow the concrete servlet implementation to provide attributes on the 
body HTML tag,
* such as 'onload', which can be used to call Javascript methods on page 
load.
* By default, nothing is specified.
-   * @return
*/
   protected String getBodyAttributes() {
 return ;

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java?rev=1467112r1=1467111r2=1467112view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
 Thu Apr 11 22:00:45 2013
@@ -94,7 +94,7 @@ public class SecurityOperation {
   
   /**
* 
-   * @Deprecated not for client use
+   * @deprecated not for client use
*/
   public SecurityOperation(String instanceId) {
 ZKUserPath = Constants.ZROOT + / + instanceId + /users;

Propchange: accumulo/trunk/src

svn commit: r1467310 - /accumulo/branches/1.5/pom.xml

2013-04-12 Thread ctubbsii
Author: ctubbsii
Date: Fri Apr 12 15:27:27 2013
New Revision: 1467310

URL: http://svn.apache.org/r1467310
Log:
ACCUMULO-924 Fix brokenness in jar sealing profile that skipped tests

Modified:
accumulo/branches/1.5/pom.xml

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1467310r1=1467309r2=1467310view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Fri Apr 12 15:27:27 2013
@@ -842,7 +842,6 @@
   activation
 property
   nameskipTests/name
-  value!false/value
 /property
   /activation
   properties




svn commit: r1467321 - /accumulo/trunk/pom.xml

2013-04-12 Thread ctubbsii
Author: ctubbsii
Date: Fri Apr 12 15:48:53 2013
New Revision: 1467321

URL: http://svn.apache.org/r1467321
Log:
ACCUMULO-924 merge to trunk

Modified:
accumulo/trunk/pom.xml   (contents, props changed)

Modified: accumulo/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467321r1=1467320r2=1467321view=diff
==
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Fri Apr 12 15:48:53 2013
@@ -842,7 +842,6 @@
   activation
 property
   nameskipTests/name
-  value!false/value
 /property
   /activation
   properties

Propchange: accumulo/trunk/pom.xml
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 12 15:48:53 2013
@@ -0,0 +1,20 @@
+/accumulo/branches/1.3/pom.xml:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src/pom.xml:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4/pom.xml:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627
+/accumulo/branches/1.4/src/pom.xml:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627
+/accumulo/branches/1.4.2/pom.xml:1399210,1402681
+/accumulo/branches/1.4.2/src/pom.xml:1399210,1402681
+/accumulo/branches/1.5/pom.xml:1447768-1467320
+/accumulo/branches/ACCUMULO-259/pom.xml:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing/pom.xml:1449464-1451386
+/accumulo/branches/ACCUMULO-672/pom.xml:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk/src/pom.xml:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3/pom.xml:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3/src/pom.xml:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3.5rc/pom.xml:1209938
+/incubator/accumulo/branches/1.3.5rc/src/pom.xml:1209938
+/incubator/accumulo/branches/1.4/pom.xml:1201902-1305402
+/incubator/accumulo/branches/1.4/src/pom.xml:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc/pom.xml:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src/pom.xml:1304025,1305326
+/incubator/accumulo/trunk/src/pom.xml:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495




svn commit: r1467393 - /accumulo/trunk/pom.xml

2013-04-12 Thread ctubbsii
Author: ctubbsii
Date: Fri Apr 12 18:19:41 2013
New Revision: 1467393

URL: http://svn.apache.org/r1467393
Log:
ACCUMULO-1269 merge rat check to trunk

Modified:
accumulo/trunk/pom.xml   (contents, props changed)

Modified: accumulo/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467393r1=1467392r2=1467393view=diff
==
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Fri Apr 12 18:19:41 2013
@@ -691,13 +691,8 @@
 /profile
 profile
   !-- Automatically check for licenses.
-   Deactivate with -DskipLicenseCheck --
+   Activate with -P check-licenses --
   idcheck-licenses/id
-  activation
-property
-  name!skipLicenseCheck/name
-/property
-  /activation
   build
 plugins
   plugin
@@ -836,18 +831,29 @@
   /dependencyManagement
 /profile
 profile
-  !-- Seal jars when either the apache-release profile is
-   activated or when tests are skipped --
+  !-- Seal jars, skip tests, and do license checks when
+   the apache-release profile is activated. --
   idapache-release/id
-  activation
-property
-  nameskipTests/name
-/property
-  /activation
   properties
 sealJarstrue/sealJars
 skipTeststrue/skipTests
   /properties
+  build
+plugins
+  plugin
+groupIdorg.apache.rat/groupId
+artifactIdapache-rat-plugin/artifactId
+executions
+  execution
+goals
+  goalcheck/goal
+/goals
+phaseverify/phase
+  /execution
+/executions
+  /plugin
+/plugins
+  /build
 /profile
   /profiles
 /project

Propchange: accumulo/trunk/pom.xml
--
  Merged 
/accumulo/branches/1.5/pom.xml:r1467321-1467347,1467349,1467351-1467382,1467384-1467392




svn commit: r1467442 - /accumulo/tags/accumulo-1.5.0.TEST/

2013-04-12 Thread ctubbsii
Author: ctubbsii
Date: Fri Apr 12 20:12:00 2013
New Revision: 1467442

URL: http://svn.apache.org/r1467442
Log:
[maven-release-plugin]  copy for tag accumulo-1.5.0.TEST

Added:
accumulo/tags/accumulo-1.5.0.TEST/   (props changed)
  - copied from r1467441, accumulo/branches/1.5/

Propchange: accumulo/tags/accumulo-1.5.0.TEST/
--
--- svn:ignore (added)
+++ svn:ignore Fri Apr 12 20:12:00 2013
@@ -0,0 +1,8 @@
+logs
+walogs
+target
+.idea
+.project
+.settings
+.pydevproject
+accumulo.iml

Propchange: accumulo/tags/accumulo-1.5.0.TEST/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 12 20:12:00 2013
@@ -0,0 +1,20 @@
+/accumulo/branches/1.3:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627
+/accumulo/branches/1.4/src:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627
+/accumulo/branches/1.4.2:1399210,1402681
+/accumulo/branches/1.4.2/src:1399210,1402681
+/accumulo/branches/ACCUMULO-259:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing:1449464-1451386
+/accumulo/branches/ACCUMULO-672:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk:1447829,1448390,1451208,1456618,1456635,1457910,1463798
+/accumulo/trunk/src:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3/src:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3.5rc:1209938
+/incubator/accumulo/branches/1.3.5rc/src:1209938
+/incubator/accumulo/branches/1.4:1201902-1305402
+/incubator/accumulo/branches/1.4/src:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src:1304025,1305326
+/incubator/accumulo/trunk/src:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495




svn commit: r1467464 - in /accumulo: branches/1.5/ branches/1.5/assemble/ branches/1.5/core/ branches/1.5/examples/ branches/1.5/examples/simple/ branches/1.5/fate/ branches/1.5/proxy/ branches/1.5/se

2013-04-12 Thread ctubbsii
Author: ctubbsii
Date: Fri Apr 12 21:03:07 2013
New Revision: 1467464

URL: http://svn.apache.org/r1467464
Log:
ACCUMULO-970 Undo testing of maven-release-plugin

Removed:
accumulo/tags/accumulo-1.5.0.TEST/
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1467464r1=1467463r2=1467464view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Fri Apr 12 21:03:07 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1.TEST-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-assemble/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1467464r1=1467463r2=1467464view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Fri Apr 12 21:03:07 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1.TEST-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-core/artifactId
   nameCore/name

Modified: accumulo/branches/1.5/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1467464r1=1467463r2=1467464view=diff
==
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Fri Apr 12 21:03:07 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1.TEST-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1467464r1=1467463r2=1467464view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Fri Apr 12 21:03:07 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo-examples/artifactId
-version1.5.1.TEST-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples-simple/artifactId
   nameSimple Examples/name

Modified: accumulo/branches/1.5/fate/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1467464r1=1467463r2=1467464view=diff
==
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Fri Apr 12 21:03:07 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1.TEST-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-fate/artifactId
   nameFate/name

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1467464r1=1467463r2=1467464view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Fri Apr 12 21:03:07 2013
@@ -24,7 +24,7 @@
   /parent
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo/artifactId
-  version1.5.1.TEST-SNAPSHOT/version
+  version1.5.0-SNAPSHOT/version
   packagingpom/packaging
   nameApache Accumulo/name
   descriptionApache Accumulo is a sorted, distributed key/value store based 
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, 
and Thrift. It features a few novel improvements on the BigTable design in the 
form of cell-level access labels and a server-side programming mechanism that 
can modify key/value pairs at various points in the data management 
process./description
@@ -447,7 +447,7 @@
 /goals
   /pluginExecutionFilter
   action
-ignore /
+ignore/ignore
   /action
 /pluginExecution

svn commit: r1467468 - in /accumulo/trunk: ./ assemble/ core/ docs/src/user_manual/chapters/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeepe

2013-04-12 Thread ctubbsii
Author: ctubbsii
Date: Fri Apr 12 21:17:57 2013
New Revision: 1467468

URL: http://svn.apache.org/r1467468
Log:
ACCUMULO-970 update merges to trunk

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)
accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
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/pom.xml   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)
accumulo/trunk/test/system/continuous/agitator.pl

Propchange: accumulo/trunk/
--
  Merged 
/accumulo/branches/1.5:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/core/
--
  Merged 
/accumulo/branches/1.5/core:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Modified: accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex?rev=1467468r1=1467467r2=1467468view=diff
==
--- accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex 
(original)
+++ accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Fri 
Apr 12 21:17:57 2013
@@ -375,10 +375,10 @@ foo day:20080103 []1
 \normalsize
 
 Accumulo includes some useful Combiners out of the box.  To find these look in
-the\\ \textbf{org.apache.accumulo.core.iterators.user} package.
+the\\ \texttt{org.apache.accumulo.core.iterators.user} package.
 
 Additional Combiners can be added by creating a Java class that extends\\
-\textbf{org.apache.accumulo.core.iterators.Combiner} and adding a jar 
containing that
+\texttt{org.apache.accumulo.core.iterators.Combiner} and adding a jar 
containing that
 class to Accumulo's lib/ext directory.
 
 An example of a Combiner can be found under\\

Propchange: accumulo/trunk/examples/
--
  Merged 
/accumulo/branches/1.5/examples:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

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:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

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:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/pom.xml
--
  Merged /accumulo/branches/1.5/pom.xml:r1467393-1467443,1467445-1467465

Propchange: accumulo/trunk/server/
--
  Merged 
/accumulo/branches/1.5/server:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/src/
--
  Merged 
/accumulo/branches/1.5/src:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Modified: accumulo/trunk/test/system/continuous/agitator.pl
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/agitator.pl?rev=1467468r1=1467467r2=1467468view=diff
==
--- accumulo/trunk/test/system/continuous/agitator.pl (original)
+++ accumulo/trunk/test/system/continuous/agitator.pl Fri Apr 12 21:17:57 2013
@@ -133,7 +133,7 @@ while(1){
print STDERR $t Running tup\n;
system($ACCUMULO_HOME/bin/tup.sh);
print STDERR $t Running start-dfs\n;
-   system($HADOOP_PREFIX/bin/start-dfs.sh);
+   system($HADOOP_PREFIX/*bin/start-dfs.sh);
 
   $nextsleep1 = int(rand($sleep1max - $sleep1)) + $sleep1;
   sleep

svn commit: r1470620 - /accumulo/branches/1.5/pom.xml

2013-04-22 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr 22 17:11:38 2013
New Revision: 1470620

URL: http://svn.apache.org/r1470620
Log:
ACCUMULO-1315 Fix changes plugin, so it correctly queries the report at the 
command line and during site building

Modified:
accumulo/branches/1.5/pom.xml

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1470620r1=1470619r2=1470620view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Mon Apr 22 17:11:38 2013
@@ -329,6 +329,21 @@
   /configuration
 /plugin
 plugin
+  groupIdorg.apache.maven.plugins/groupId
+  artifactIdmaven-changes-plugin/artifactId
+  version2.9/version
+  configuration
+runOnlyAtExecutionRoottrue/runOnlyAtExecutionRoot
+issueManagementSystems
+  issueManagementSystemJIRA/issueManagementSystem
+/issueManagementSystems
+onlyCurrentVersiontrue/onlyCurrentVersion
+statusIdsClosed,Resolved/statusIds
+maxEntries1/maxEntries
+useJqltrue/useJql
+  /configuration
+/plugin
+plugin
   artifactIdmaven-clean-plugin/artifactId
   configuration
 filesets
@@ -383,6 +398,7 @@
   /configuration
 /plugin
 plugin
+  groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-javadoc-plugin/artifactId
   configuration
 encodingUTF-8/encoding
@@ -608,17 +624,10 @@
   /build
   reporting
 plugins
-  !--
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-changes-plugin/artifactId
 version2.9/version
-configuration
-  onlyCurrentVersiontrue/onlyCurrentVersion
-  statusIdsresolved/statusIds
-  maxEntries1/maxEntries
-  useJqltrue/useJql
-/configuration
 reportSets
   reportSet
 reports
@@ -627,7 +636,6 @@
   /reportSet
 /reportSets
   /plugin
-  --
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-javadoc-plugin/artifactId




svn commit: r1470639 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

2013-04-22 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr 22 17:55:00 2013
New Revision: 1470639

URL: http://svn.apache.org/r1470639
Log:
ACCUMULO-1315 merge 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/pom.xml   (contents, props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged 
/accumulo/branches/1.5:r1469651-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Propchange: accumulo/trunk/core/
--
  Merged 
/accumulo/branches/1.5/core:r1469651-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Propchange: accumulo/trunk/examples/
--
  Merged 
/accumulo/branches/1.5/examples:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469103,1469105-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

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:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469103,1469105-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

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:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Modified: accumulo/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1470639r1=1470638r2=1470639view=diff
==
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Mon Apr 22 17:55:00 2013
@@ -329,6 +329,20 @@
   /configuration
 /plugin
 plugin
+  groupIdorg.apache.maven.plugins/groupId
+  artifactIdmaven-changes-plugin/artifactId
+  version2.9/version
+  configuration
+issueManagementSystems
+  issueManagementSystemJIRA/issueManagementSystem
+/issueManagementSystems
+onlyCurrentVersiontrue/onlyCurrentVersion
+statusIdsClosed,Resolved/statusIds
+maxEntries1/maxEntries
+useJqltrue/useJql
+  /configuration
+/plugin
+plugin

svn commit: r1475770 - in /accumulo/branches/1.5/docs/src: developer_manual/build.sh user_manual/build.sh

2013-04-25 Thread ctubbsii
Author: ctubbsii
Date: Thu Apr 25 13:47:34 2013
New Revision: 1475770

URL: http://svn.apache.org/r1475770
Log:
ACCUMULO-1343 Make the build fail when docs fail to build

Modified:
accumulo/branches/1.5/docs/src/developer_manual/build.sh
accumulo/branches/1.5/docs/src/user_manual/build.sh

Modified: accumulo/branches/1.5/docs/src/developer_manual/build.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/src/developer_manual/build.sh?rev=1475770r1=1475769r2=1475770view=diff
==
--- accumulo/branches/1.5/docs/src/developer_manual/build.sh (original)
+++ accumulo/branches/1.5/docs/src/developer_manual/build.sh Thu Apr 25 
13:47:34 2013
@@ -24,7 +24,7 @@ if [ `which pdflatex | wc -l` -eq 0 ]; t
 echo * 12
 echo '* Missing pdflatex command. Please install. *' 12
 echo * 12
-  exit 0;
+  exit 1;
 fi
 
 if [ -f ../../accumulo_developer_manual.pdf ]

Modified: accumulo/branches/1.5/docs/src/user_manual/build.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/src/user_manual/build.sh?rev=1475770r1=1475769r2=1475770view=diff
==
--- accumulo/branches/1.5/docs/src/user_manual/build.sh (original)
+++ accumulo/branches/1.5/docs/src/user_manual/build.sh Thu Apr 25 13:47:34 2013
@@ -24,7 +24,7 @@ if [ `which pdflatex | wc -l` -eq 0 ]; t
 echo * 12
 echo '* Missing pdflatex command. Please install. *' 12
 echo * 12
-  exit 0;
+  exit 1;
 fi
 
 if [ -f ../../accumulo_user_manual.pdf ]




svn commit: r1477350 - in /accumulo/trunk: ./ assemble/ assemble/src/ assemble/src/main/ assemble/src/main/assemblies/ contrib/ core/ core/src/main/java-filtered/ core/src/main/java-filtered/org/ core

2013-04-29 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr 29 21:25:33 2013
New Revision: 1477350

URL: http://svn.apache.org/r1477350
Log:
ACCUMULO-1271, ACCUMULO-370, ACCUMULO-1343, ACCUMULO-1181 merge to trunk

Added:
accumulo/trunk/assemble/src/
  - copied from r1477345, accumulo/branches/1.5/assemble/src/
accumulo/trunk/assemble/src/main/
  - copied from r1477345, accumulo/branches/1.5/assemble/src/main/
accumulo/trunk/assemble/src/main/assemblies/
  - copied from r1477345, 
accumulo/branches/1.5/assemble/src/main/assemblies/
accumulo/trunk/assemble/src/main/assemblies/bin.xml
  - copied unchanged from r1477345, 
accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml
accumulo/trunk/contrib/dotfile-rpmmacros
  - copied unchanged from r1477345, 
accumulo/branches/1.5/contrib/dotfile-rpmmacros
accumulo/trunk/core/src/main/java-filtered/
  - copied from r1477345, accumulo/branches/1.5/core/src/main/java-filtered/
accumulo/trunk/core/src/main/java-filtered/org/
  - copied from r1477345, 
accumulo/branches/1.5/core/src/main/java-filtered/org/
accumulo/trunk/core/src/main/java-filtered/org/apache/
  - copied from r1477345, 
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/
accumulo/trunk/core/src/main/java-filtered/org/apache/accumulo/
  - copied from r1477345, 
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/
accumulo/trunk/core/src/main/java-filtered/org/apache/accumulo/core/
  - copied from r1477345, 
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/core/

accumulo/trunk/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
  - copied unchanged from r1477345, 
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
Removed:
accumulo/trunk/assemble/dist.xml
Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/README
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/assemble/build.sh
accumulo/trunk/assemble/pom.xml
accumulo/trunk/core/   (props changed)
accumulo/trunk/core/pom.xml
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/trunk/docs/src/developer_manual/build.sh
accumulo/trunk/docs/src/user_manual/build.sh
accumulo/trunk/docs/src/user_manual/chapters/administration.tex
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/pom.xml   (contents, props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1471673-1476219,1476221-1477345

Modified: accumulo/trunk/README
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1477350r1=1477349r2=1477350view=diff
==
--- accumulo/trunk/README (original)
+++ accumulo/trunk/README Mon Apr 29 21:25:33 2013
@@ -44,7 +44,7 @@ easier to install.
 
 Copy the accumulo tar file produced by mvn package from the assemble/target/
 directory to the desired destination, then untar it (e.g. 
-tar xzf apache-accumulo-1.6.0-SNAPSHOT-dist.tar.gz).
+tar xzf accumulo-assemble-1.6.0-bin.tar.gz).
 
 If you are using the RPM, install the RPM on every machine that will run
 accumulo.

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1471673-1476219,1476221-1477345

Modified: accumulo/trunk/assemble/build.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/build.sh?rev=1477350r1=1477349r2=1477350view=diff
==
--- accumulo/trunk/assemble/build.sh (original)
+++ accumulo/trunk/assemble/build.sh Mon Apr 29 21:25:33 2013
@@ -38,13 +38,48 @@ runAt() {
   ( cd $1 ; echo in `pwd`; shift ; run $@ ) || fail 
 }
 
-run mvn -U clean 
-mvn rat:check 
-COUNT=`grep '!' target/rat.txt | wc -l`
-EXPECTED=53
-if [ $COUNT -ne $EXPECTED ]
-then
-   fail expected $EXPECTED files missing licenses, but saw $COUNT
+# Allow skipping tests; This option is not possible
+# with the --create-release-candidate option
+if [[ $1 != '--skipTests' ]]; then
+  # Run all tests with Hadoop 1.0.x
+  run mvn clean
+  run mvn verify
+
+  # Run all tests with Hadoop 2.0.x
+  run mvn clean
+  run mvn verify -Dhadoop.profile=2.0
+fi
+
+# Build and stage release artifacts; dryRun is assumed, unless
+# this script is executed with --create-release-candidate flag.
+DRYRUN='-DdryRun'
+if [[ $1 = '--create-release-candidate' ]]; then
+  DRYRUN=''
+fi
+
+# make sure gpg agent has key

svn commit: r1477411 - in /accumulo/branches/1.5: ./ assemble/ docs/src/developer_manual/ docs/src/main/ docs/src/main/latex/ docs/src/main/latex/accumulo_developer_manual/ docs/src/main/latex/accumul

2013-04-29 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr 29 23:20:31 2013
New Revision: 1477411

URL: http://svn.apache.org/r1477411
Log:
ACCUMULO-1350 drop appendix from documentation; ACCUMULO-1240 build docs with 
latex-maven-plugin to avoid executing shell scripts

Added:
accumulo/branches/1.5/docs/src/main/
accumulo/branches/1.5/docs/src/main/latex/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/
  - copied from r1477384, accumulo/branches/1.5/docs/src/developer_manual/

accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex
  - copied unchanged from r1477384, 
accumulo/branches/1.5/docs/src/developer_manual/accumulo_developer_manual.tex
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/
  - copied from r1477384, accumulo/branches/1.5/docs/src/user_manual/
accumulo/branches/1.5/docs/src/main/latex/common/
accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/
  - copied from r1477384, accumulo/branches/1.5/docs/src/state_diagrams/
Removed:
accumulo/branches/1.5/docs/src/developer_manual/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/build.sh
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/appendices/
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/build.sh
accumulo/branches/1.5/docs/src/state_diagrams/
accumulo/branches/1.5/docs/src/user_manual/
Modified:
accumulo/branches/1.5/assemble/pom.xml

accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
accumulo/branches/1.5/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1477411r1=1477410r2=1477411view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Mon Apr 29 23:20:31 2013
@@ -436,36 +436,44 @@
 plugins
   plugin
 groupIdorg.codehaus.mojo/groupId
-artifactIdexec-maven-plugin/artifactId
+artifactIdlatex-maven-plugin/artifactId
 executions
   execution
-iddeveloper-manual/id
+idbuild-pdf-manuals/id
 goals
-  goalexec/goal
+  goallatex/goal
 /goals
-phaseprepare-package/phase
+phasecompile/phase
 configuration
-  executablebash/executable
-  arguments
-argument../docs/src/developer_manual/build.sh/argument
-  /arguments
-/configuration
-  /execution
-  execution
-iduser-manual/id
-goals
-  goalexec/goal
-/goals
-phaseprepare-package/phase
-configuration
-  executablebash/executable
-  arguments
-argument../docs/src/user_manual/build.sh/argument
-  /arguments
+  docsRoot../docs/src/main/latex/docsRoot
 /configuration
   /execution
 /executions
   /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-resources-plugin/artifactId
+executions
+  execution
+idcopy-pdf-manuals/id
+goals
+  goalcopy-resources/goal
+/goals
+phaseprepare-package/phase
+configuration
+  outputDirectory../docs/outputDirectory
+  resources
+resource
+  directory${project.build.directory}/directory
+  includes
+include*.pdf/include
+  /includes
+/resource
+  /resources
+/configuration
+  /execution
+/executions
+  /plugin
 /plugins
   /build
 /profile

Modified: 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex?rev=1477411r1=1477384r2=1477411view=diff
==
--- 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
 (original)
+++ 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
 Mon Apr 29 23:20:31 2013
@@ -49,6 +49,4 @@ Version 1.5}
 \include{chapters/analytics}
 \include{chapters/security}
 \include{chapters/administration}
-\appendix
-\include{appendices/shell_commands}
 \end{document}

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5

svn commit: r1477413 - /accumulo/branches/1.5/assemble/pom.xml

2013-04-29 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr 29 23:24:21 2013
New Revision: 1477413

URL: http://svn.apache.org/r1477413
Log:
ACCUMULO-1350 minor pom oversight

Modified:
accumulo/branches/1.5/assemble/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1477413r1=1477412r2=1477413view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Mon Apr 29 23:24:21 2013
@@ -435,6 +435,30 @@
   build
 plugins
   plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-resources-plugin/artifactId
+executions
+  execution
+idcopy-pdf-manuals/id
+goals
+  goalcopy-resources/goal
+/goals
+phaseprepare-package/phase
+configuration
+  outputDirectory../docs/outputDirectory
+  resources
+resource
+  directory${project.build.directory}/directory
+  includes
+include*.pdf/include
+  /includes
+/resource
+  /resources
+/configuration
+  /execution
+/executions
+  /plugin
+  plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdlatex-maven-plugin/artifactId
 executions
@@ -450,30 +474,6 @@
   /execution
 /executions
   /plugin
-  plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-resources-plugin/artifactId
-executions
-  execution
-idcopy-pdf-manuals/id
-goals
-  goalcopy-resources/goal
-/goals
-phaseprepare-package/phase
-configuration
-  outputDirectory../docs/outputDirectory
-  resources
-resource
-  directory${project.build.directory}/directory
-  includes
-include*.pdf/include
-  /includes
-/resource
-  /resources
-/configuration
-  /execution
-/executions
-  /plugin
 /plugins
   /build
 /profile




svn commit: r1477414 - in /accumulo/trunk: ./ assemble/ core/ docs/src/developer_manual/ docs/src/main/ docs/src/main/latex/ docs/src/main/latex/accumulo_developer_manual/ docs/src/main/latex/accumulo

2013-04-29 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr 29 23:32:49 2013
New Revision: 1477414

URL: http://svn.apache.org/r1477414
Log:
ACCUMULO-1350, ACCUMULO-1240 merge to trunk

Added:
accumulo/trunk/docs/src/main/
  - copied from r1477413, accumulo/branches/1.5/docs/src/main/
accumulo/trunk/docs/src/main/latex/
  - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/
accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/   (props 
changed)
  - copied from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/component_docs.odp
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/component_docs.odp
accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/
  - copied from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/component_overview.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/component_overview.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/system_blocks.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/system_blocks.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tablet_dataflow.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tablet_dataflow.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tablet_hierarchy.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tablet_hierarchy.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_config.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_config.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_maintenance.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_maintenance.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_monitor.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_monitor.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_recovery.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_recovery.jpg

accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_rw.jpg
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_rw.jpg
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/   (props changed)
  - copied from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/

accumulo/trunk/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/   (props 
changed)
  - copied from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/

accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex

accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/design.tex
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/design.tex

accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/high_speed_ingest.tex
  - copied unchanged from r1477413, 
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/high_speed_ingest.tex

accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/introduction.tex

svn commit: r1479000 - in /accumulo/branches/1.5: assemble/pom.xml pom.xml proxy/pom.xml server/pom.xml

2013-05-03 Thread ctubbsii
Author: ctubbsii
Date: Fri May  3 22:47:34 2013
New Revision: 1479000

URL: http://svn.apache.org/r1479000
Log:
ACCUMULO-1316 make separate RPM build of native libraries

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479000r1=1478999r2=1479000view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Fri May  3 22:47:34 2013
@@ -110,7 +110,7 @@
 artifactIdmaven-assembly-plugin/artifactId
 executions
   execution
-iddistro-assembly/id
+idbinary-assembly/id
 goals
   goalsingle/goal
 /goals
@@ -145,124 +145,170 @@
   keyPassphrase
 passphrasedummy/passphrase
   /keyPassphrase
-  classifierbin/classifier
   summaryApache Accumulo BigTable clone/summary
   descriptionApache Accumulo is a large distributed structured 
store based on Google's BigTable design./description
   !-- This populates the license field of the RPM. --
   copyrightApache License, Version 2.0 and others (see included 
LICENSE file)/copyright
   urlhttp://accumulo.apache.org/url
   groupUtilities/group
-  requires
-requirejdk/require
-requirehadoop/require
-requirezookeeper/require
-  /requires
   prefix/opt/accumulo/prefix
   defaultDirmode755/defaultDirmode
   defaultFilemode644/defaultFilemode
   defaultUsernameroot/defaultUsername
   defaultGroupnameroot/defaultGroupname
-  mappings
-mapping
-  
directory/opt/accumulo/accumulo-${project.version}/directory
-  sources
-source
-  location${accumulo-top}/LICENSE/location
-/source
-source
-  location${accumulo-top}/NOTICE/location
-/source
-source
-  location${accumulo-top}/README/location
-/source
-  /sources
-/mapping
-mapping
-  
directory/opt/accumulo/accumulo-${project.version}/docs/directory
-  sources
-source
-  location${accumulo-top}/docs/location
-  excludes
-excludesrc/**/exclude
-  /excludes
-/source
-  /sources
-/mapping
-mapping
-  
directory/opt/accumulo/accumulo-${project.version}/test/directory
-  sources
-source
-  location${accumulo-top}/test/location
-  excludes
-excludesrc/**/exclude
-excludetarget/**/exclude
-exclude**/walkers.txt/exclude
-exclude**/ingesters.txt/exclude
-exclude**/continuous-env.sh/exclude
-exclude.*/**/exclude
-exclude**/*.pyc/exclude
-exclude**/*.pyo/exclude
-excludepom.xml/exclude
-  /excludes
-/source
-  /sources
-/mapping
-mapping
-  
directory/opt/accumulo/accumulo-${project.version}/bin/directory
-/mapping
-mapping
-  
directory/opt/accumulo/accumulo-${project.version}/bin/directory
-  directoryIncludedfalse/directoryIncluded
-  filemode755/filemode
-  usernameroot/username
-  groupnameroot/groupname
-  sources
-source
-  location${accumulo-top}/bin/location
-/source
-  /sources
-/mapping
-mapping
-  
directory/opt/accumulo/accumulo-${project.version}/conf/directory
-  sources
-source
-  location${accumulo-top}/conf/location
-  excludes
-exclude${accumulo-top}/**/accumulo-site.xml/exclude
-exclude${accumulo-top}/**/accumulo-env.sh/exclude
-
exclude${accumulo-top}/**/accumulo-metrics.xml/exclude
-exclude

svn commit: r1479020 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ proxy/src/main/java/o

2013-05-03 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 00:56:00 2013
New Revision: 1479020

URL: http://svn.apache.org/r1479020
Log:
ACCUMULO-1316, ACCUMULO-14 merge to trunk

Added:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/
  - copied from r1479000, 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/mini/

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
  - copied unchanged from r1479000, 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloConfig.java
  - copied unchanged from r1479000, 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloConfig.java
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/
  - copied from r1479000, 
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/mini/

accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java
  - copied unchanged from r1479000, 
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java
accumulo/trunk/server/src/test/resources/FooFilter.jar
  - copied unchanged from r1479000, 
accumulo/branches/1.5/server/src/test/resources/FooFilter.jar
Removed:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/test/

accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/assemble/pom.xml
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/pom.xml   (contents, props changed)
accumulo/trunk/proxy/pom.xml
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
accumulo/trunk/server/   (props changed)
accumulo/trunk/server/pom.xml
accumulo/trunk/server/src/test/resources/log4j.properties
accumulo/trunk/src/   (props changed)

accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java

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

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

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

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

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1478902-1479000

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1478902-1479000

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1479020r1=1479019r2=1479020view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat May  4 00:56:00 2013
@@ -110,7 +110,7 @@
 artifactIdmaven-assembly-plugin/artifactId
 executions
   execution
-iddistro-assembly/id
+idbinary-assembly/id
 goals
   goalsingle/goal
 /goals
@@ -145,124 +145,170 @@
   keyPassphrase
 passphrasedummy/passphrase
   /keyPassphrase
-  classifierbin/classifier
   summaryApache Accumulo BigTable clone/summary
   descriptionApache Accumulo is a large distributed structured 
store based on Google's BigTable design./description
   !-- This populates the license field of the RPM. --
   copyrightApache License, Version 2.0 and others (see included 
LICENSE file)/copyright
   urlhttp://accumulo.apache.org/url
   groupUtilities/group
-  requires
-requirejdk/require
-requirehadoop/require
-requirezookeeper/require
-  /requires
   prefix/opt/accumulo/prefix
   defaultDirmode755/defaultDirmode
   defaultFilemode644/defaultFilemode
   defaultUsernameroot/defaultUsername
   defaultGroupnameroot/defaultGroupname
-  mappings
-mapping

svn commit: r1479038 - /accumulo/branches/1.5/assemble/pom.xml

2013-05-03 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 04:56:14 2013
New Revision: 1479038

URL: http://svn.apache.org/r1479038
Log:
ACCUMULO-1316 fix POM warnings introduced in previous rpm/deb fixes for native 
libs

Modified:
accumulo/branches/1.5/assemble/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479038r1=1479037r2=1479038view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Sat May  4 04:56:14 2013
@@ -332,7 +332,7 @@
 /goals
 phasepackage/phase
 configuration
-  deb${project.build.directory}/accumulo-${version}.deb/deb
+  
deb${project.build.directory}/accumulo-${project.version}.deb/deb
   classifierbin/classifier
   controlDirassemble/deb/accumulo/controlDir
   installDir/usr/lib/accumulo/installDir
@@ -417,7 +417,7 @@
 /goals
 phasepackage/phase
 configuration
-  
deb${project.build.directory}/accumulo-native-${version}.deb/deb
+  
deb${project.build.directory}/accumulo-native-${project.version}.deb/deb
   controlDirassemble/deb/accumulo-native/controlDir
   installDir/usr/lib/accumulo/installDir
   classifiernative/classifier
@@ -457,7 +457,7 @@
 /goals
 phasepackage/phase
 configuration
-  
deb${project.build.directory}/accumulo-test-${version}.deb/deb
+  
deb${project.build.directory}/accumulo-test-${project.version}.deb/deb
   controlDirassemble/deb/accumulo-test/controlDir
   installDir/usr/lib/accumulo/installDir
   classifiertest/classifier




svn commit: r1479039 - in /accumulo/branches/1.5/core/src: main/java/org/apache/accumulo/core/security/ test/java/org/apache/accumulo/core/security/

2013-05-03 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 05:07:35 2013
New Revision: 1479039

URL: http://svn.apache.org/r1479039
Log:
ACCUMULO-1005 Applying patch contributed by Tim Reardon to remove Charset 
options from Authorizations and ColumnVisibility, with minor edits from John 
Vines and minor documentation additions and cleanup from myself

Modified:

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

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

accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java

accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java

accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1479039r1=1479038r2=1479039view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
 Sat May  4 05:07:35 2013
@@ -17,9 +17,7 @@
 package org.apache.accumulo.core.security;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -27,6 +25,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.util.ArgumentChecker;
@@ -44,7 +43,7 @@ public class Authorizations implements I
   private static final boolean[] validAuthChars = new boolean[256];
   
   public static final String HEADER = !AUTH1:;
-
+  
   static {
 for (int i = 0; i  256; i++) {
   validAuthChars[i] = false;
@@ -84,6 +83,11 @@ public class Authorizations implements I
 }
   }
   
+  /**
+   * A convenience constructor that accepts a collection of string 
authorizations that have each already been encoded as UTF-8 bytes.
+   * 
+   * @see #Authorizations(String...)
+   */
   public Authorizations(Collectionbyte[] authorizations) {
 ArgumentChecker.notNull(authorizations);
 for (byte[] auth : authorizations)
@@ -91,6 +95,11 @@ public class Authorizations implements I
 checkAuths();
   }
   
+  /**
+   * A convenience constructor that accepts a collection of string 
authorizations that have each already been encoded as UTF-8 bytes.
+   * 
+   * @see #Authorizations(String...)
+   */
   public Authorizations(ListByteBuffer authorizations) {
 ArgumentChecker.notNull(authorizations);
 for (ByteBuffer buffer : authorizations) {
@@ -100,102 +109,124 @@ public class Authorizations implements I
   }
   
   /**
+   * Constructs an authorizations object a serialized form. This is NOT a 
constructor for a set of authorizations of size one.
+   * 
* @param authorizations
-   *  a serialized authorizations string produced by {@link 
#getAuthorizationsArray()} or {@link #serialize()}
+   *  a serialized authorizations string produced by {@link 
#getAuthorizationsArray()} or {@link #serialize()} (converted to UTF-8 bytes)
*/
-
   public Authorizations(byte[] authorizations) {
 
 ArgumentChecker.notNull(authorizations);
-
-String authsString = new String(authorizations);
+
+String authsString = new String(authorizations, Constants.UTF8);
 if (authsString.startsWith(HEADER)) {
-  // its the new format
+  // it's the new format
   authsString = authsString.substring(HEADER.length());
   if (authsString.length()  0) {
 for (String encAuth : authsString.split(,)) {
-  byte[] auth = Base64.decodeBase64(encAuth.getBytes());
+  byte[] auth = Base64.decodeBase64(encAuth.getBytes(Constants.UTF8));
   auths.add(new ArrayByteSequence(auth));
 }
 checkAuths();
   }
 } else {
-  // its the old format
+  // it's the old format
   ArgumentChecker.notNull(authorizations);
   if (authorizations.length  0)
 setAuthorizations(authsString.split(,));
 }
   }
   
+  /**
+   * Constructs an empty set of authorizations.
+   * 
+   * @see #Authorizations(String...)
+   */
   public Authorizations() {}
   
   /**
+   * Constructs an authorizations object from a set of human-readable 
authorizations.
* 
-   * @param charset
-   *  used to convert each authorization to a byte array
* @param

svn commit: r1479040 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/security/ core/src/test/java/org/apache/accumulo/core/security/ examples/ fate/src/main/java/o

2013-05-03 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 05:19:57 2013
New Revision: 1479040

URL: http://svn.apache.org/r1479040
Log:
ACCUMULO-1005, ACCUMULO-1316 merge to trunk

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/assemble/pom.xml
accumulo/trunk/core/   (props changed)

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.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/pom.xml   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1479001-1479039

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1479001-1479039

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1479040r1=1479039r2=1479040view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat May  4 05:19:57 2013
@@ -332,7 +332,7 @@
 /goals
 phasepackage/phase
 configuration
-  deb${project.build.directory}/accumulo-${version}.deb/deb
+  
deb${project.build.directory}/accumulo-${project.version}.deb/deb
   classifierbin/classifier
   controlDirassemble/deb/accumulo/controlDir
   installDir/usr/lib/accumulo/installDir
@@ -417,7 +417,7 @@
 /goals
 phasepackage/phase
 configuration
-  
deb${project.build.directory}/accumulo-native-${version}.deb/deb
+  
deb${project.build.directory}/accumulo-native-${project.version}.deb/deb
   controlDirassemble/deb/accumulo-native/controlDir
   installDir/usr/lib/accumulo/installDir
   classifiernative/classifier
@@ -457,7 +457,7 @@
 /goals
 phasepackage/phase
 configuration
-  
deb${project.build.directory}/accumulo-test-${version}.deb/deb
+  
deb${project.build.directory}/accumulo-test-${project.version}.deb/deb
   controlDirassemble/deb/accumulo-test/controlDir
   installDir/usr/lib/accumulo/installDir
   classifiertest/classifier

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1479001-1479039

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1479040r1=1479039r2=1479040view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
 Sat May  4 05:19:57 2013
@@ -17,9 +17,7 @@
 package org.apache.accumulo.core.security;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -29,6 +27,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.util.ArgumentChecker;
@@ -46,7 +45,7 @@ public class Authorizations implements I
   private static final boolean[] validAuthChars = new boolean[256];
   
   public static final String HEADER = !AUTH1:;
-
+  
   static {
 for (int i = 0; i  256; i++) {
   validAuthChars[i] = false;
@@ -87,6 +86,11 @@ public class Authorizations implements I
 }
   }
   
+  /**
+   * A convenience constructor that accepts a collection of string 
authorizations

svn commit: r1479123 - /accumulo/file

2013-05-04 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 15:13:37 2013
New Revision: 1479123

URL: http://svn.apache.org/r1479123
Log:
ACCUMULO-970 add dummy file to test commit, in preparation for release

Added:
accumulo/file

Added: accumulo/file
URL: http://svn.apache.org/viewvc/accumulo/file?rev=1479123view=auto
==
(empty)




svn commit: r1479127 - /accumulo/file

2013-05-04 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 15:17:57 2013
New Revision: 1479127

URL: http://svn.apache.org/r1479127
Log:
ACCUMULO-970 remove dummy file added in prev test commit

Removed:
accumulo/file



svn commit: r1479128 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.xml test/pom.xml tr

2013-05-04 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 15:34:30 2013
New Revision: 1479128

URL: http://svn.apache.org/r1479128
Log:
[maven-release-plugin] prepare release 1.5.0-RC

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479128r1=1479127r2=1479128view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Sat May  4 15:34:30 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-assemble/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479128r1=1479127r2=1479128view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Sat May  4 15:34:30 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-core/artifactId
   nameCore/name

Modified: accumulo/branches/1.5/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1479128r1=1479127r2=1479128view=diff
==
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Sat May  4 15:34:30 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-examples/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1479128r1=1479127r2=1479128view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Sat May  4 15:34:30 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo-examples/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-examples-simple/artifactId
   nameSimple Examples/name

Modified: accumulo/branches/1.5/fate/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1479128r1=1479127r2=1479128view=diff
==
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Sat May  4 15:34:30 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-fate/artifactId
   nameFate/name

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1479128r1=1479127r2=1479128view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Sat May  4 15:34:30 2013
@@ -24,7 +24,7 @@
   /parent
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo/artifactId
-  version1.5.0-SNAPSHOT/version
+  version1.5.0/version
   packagingpom/packaging
   nameApache Accumulo/name
   descriptionApache Accumulo is a sorted, distributed key/value store based 
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, 
and Thrift. It features a few novel improvements on the BigTable design in the 
form of cell-level access labels and a server-side programming mechanism that 
can modify key/value pairs at various points in the data management 
process./description
@@ -83,9 +83,9 @@
 moduletest/module
   /modules
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/accumulo/branches/1.5/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/accumulo/branches/1.5/developerConnection
-urlhttp://svn.apache.org/viewvc/accumulo/branches/1.5/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC

svn commit: r1479129 - /accumulo/tags/1.5.0-RC/

2013-05-04 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 15:35:58 2013
New Revision: 1479129

URL: http://svn.apache.org/r1479129
Log:
[maven-release-plugin]  copy for tag 1.5.0-RC

Added:
accumulo/tags/1.5.0-RC/   (props changed)
  - copied from r1479128, accumulo/branches/1.5/

Propchange: accumulo/tags/1.5.0-RC/
--
--- svn:ignore (added)
+++ svn:ignore Sat May  4 15:35:58 2013
@@ -0,0 +1,8 @@
+logs
+walogs
+target
+.idea
+.project
+.settings
+.pydevproject
+accumulo.iml

Propchange: accumulo/tags/1.5.0-RC/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May  4 15:35:58 2013
@@ -0,0 +1,20 @@
+/accumulo/branches/1.3:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627,1468531,1468958
+/accumulo/branches/1.4/src:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1468531,1468958
+/accumulo/branches/1.4.2:1399210,1402681
+/accumulo/branches/1.4.2/src:1399210,1402681
+/accumulo/branches/ACCUMULO-259:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing:1449464-1451386
+/accumulo/branches/ACCUMULO-672:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk:1447829,1448390,1451208,1456618,1456635,1457910,1463798
+/accumulo/trunk/src:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3/src:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3.5rc:1209938
+/incubator/accumulo/branches/1.3.5rc/src:1209938
+/incubator/accumulo/branches/1.4:1201902-1305402
+/incubator/accumulo/branches/1.4/src:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src:1304025,1305326
+/incubator/accumulo/trunk/src:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495




svn commit: r1479131 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.xml test/pom.xml tr

2013-05-04 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 15:37:11 2013
New Revision: 1479131

URL: http://svn.apache.org/r1479131
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479131r1=1479130r2=1479131view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Sat May  4 15:37:11 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-assemble/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479131r1=1479130r2=1479131view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Sat May  4 15:37:11 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-core/artifactId
   nameCore/name

Modified: accumulo/branches/1.5/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1479131r1=1479130r2=1479131view=diff
==
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Sat May  4 15:37:11 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1479131r1=1479130r2=1479131view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Sat May  4 15:37:11 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo-examples/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples-simple/artifactId
   nameSimple Examples/name

Modified: accumulo/branches/1.5/fate/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1479131r1=1479130r2=1479131view=diff
==
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Sat May  4 15:37:11 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-fate/artifactId
   nameFate/name

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1479131r1=1479130r2=1479131view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Sat May  4 15:37:11 2013
@@ -24,7 +24,7 @@
   /parent
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo/artifactId
-  version1.5.0/version
+  version1.5.1-SNAPSHOT/version
   packagingpom/packaging
   nameApache Accumulo/name
   descriptionApache Accumulo is a sorted, distributed key/value store based 
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, 
and Thrift. It features a few novel improvements on the BigTable design in the 
form of cell-level access labels and a server-side programming mechanism that 
can modify key/value pairs at various points in the data management 
process./description
@@ -83,9 +83,9 @@
 moduletest/module
   /modules
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC/developerConnection
-urlhttp://svn.apache.org/viewvc/accumulo/tags/1.5.0-RC/url
+
connectionscm:svn:http://svn.apache.org/repos/asf

svn commit: r1479204 - in /accumulo/branches/1.5/core: ./ src/main/java/org/apache/accumulo/core/client/mock/ src/main/java/org/apache/accumulo/core/util/shell/ src/test/java/org/apache/accumulo/core/

2013-05-04 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 22:21:14 2013
New Revision: 1479204

URL: http://svn.apache.org/r1479204
Log:
ACCUMULO-1348 Applied patch from Mike Drob to 1.5 branch

Added:
accumulo/branches/1.5/core/src/test/resources/shelltest.txt
Modified:
accumulo/branches/1.5/core/pom.xml

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

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

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

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479204r1=1479203r2=1479204view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Sat May  4 22:21:14 2013
@@ -109,6 +109,19 @@
 /dependency
   /dependencies
   build
+pluginManagement
+  plugins
+plugin
+  groupIdorg.apache.rat/groupId
+  artifactIdapache-rat-plugin/artifactId
+  configuration
+excludes
+  excludesrc/test/resources/shelltest.txt/exclude
+/excludes
+  /configuration
+/plugin
+  /plugins
+/pluginManagement
 plugins
   plugin
 groupIdorg.apache.maven.plugins/groupId

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java?rev=1479204r1=1479203r2=1479204view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
 Sat May  4 22:21:14 2013
@@ -78,8 +78,13 @@ public class MockShell extends Shell {
 
 if (execFile != null) {
   java.util.Scanner scanner = new java.util.Scanner(new File(execFile));
-  while (scanner.hasNextLine())
-execCommand(scanner.nextLine(), true, isVerbose());
+  try {
+while (scanner.hasNextLine()  !hasExited()) {
+  execCommand(scanner.nextLine(), true, isVerbose());
+}
+  } finally {
+scanner.close();
+  }
 } else if (execCommand != null) {
   for (String command : execCommand.split(\n)) {
 execCommand(command, true, isVerbose());

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=1479204r1=1479203r2=1479204view=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
 Sat May  4 22:21:14 2013
@@ -246,7 +246,7 @@ public class Shell extends ShellOptions 
 if (sysUser == null)
   sysUser = root;
 String user = cl.getOptionValue(usernameOption.getOpt(), sysUser);
-
+
 String passw = cl.getOptionValue(passwOption.getOpt(), null);
 tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());
 String[] loginOptions = cl.getOptionValues(loginOption.getOpt());
@@ -261,13 +261,13 @@ public class Shell extends ShellOptions 
   
   if (loginOptions == null  cl.hasOption(tokenOption.getOpt()))
 throw new IllegalArgumentException(Must supply '- + 
loginOption.getOpt() + ' option with '- + tokenOption.getOpt() + ' option);
-
+  
   if (passw != null  cl.hasOption(tokenOption.getOpt()))
 throw new IllegalArgumentException(Can not supply '- + 
passwOption.getOpt() + ' option with '- + tokenOption.getOpt() + ' option);
-
+  
   if (user == null)
 throw new MissingArgumentException(usernameOption);
-
+  
   if (loginOptions != null  cl.hasOption(tokenOption.getOpt())) {
 Properties props = new Properties();
 for (String loginOption : loginOptions)
@@ -279,7 +279,7 @@ public class Shell extends ShellOptions 
 this.token = 
Class.forName(cl.getOptionValue(tokenOption.getOpt())).asSubclass(AuthenticationToken.class).newInstance();
 this.token.init(props);
   }
-
+  
   if (!cl.hasOption(fakeOption.getLongOpt())) {
 DistributedTrace.enable(instance, new 
ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut()), 
shell, InetAddress.getLocalHost()
 .getHostName());
@@ -438,8 +438,13 @@ public class Shell extends ShellOptions 
 
 if (execFile != null) {
   java.util.Scanner scanner = new java.util.Scanner(new File

svn commit: r1479211 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/mock/ core/src/main/java/org/apache/accumulo/core/util/shell/ core/src/test/java/org/ap

2013-05-04 Thread ctubbsii
Author: ctubbsii
Date: Sat May  4 22:44:19 2013
New Revision: 1479211

URL: http://svn.apache.org/r1479211
Log:
ACCUMULO-1348 merged patch to trunk

Added:
accumulo/trunk/core/src/test/resources/shelltest.txt
  - copied unchanged from r1479204, 
accumulo/branches/1.5/core/src/test/resources/shelltest.txt
Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)
accumulo/trunk/core/pom.xml

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java

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

accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.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/pom.xml   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

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

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

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

Modified: accumulo/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1479211r1=1479210r2=1479211view=diff
==
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Sat May  4 22:44:19 2013
@@ -109,6 +109,19 @@
 /dependency
   /dependencies
   build
+pluginManagement
+  plugins
+plugin
+  groupIdorg.apache.rat/groupId
+  artifactIdapache-rat-plugin/artifactId
+  configuration
+excludes
+  excludesrc/test/resources/shelltest.txt/exclude
+/excludes
+  /configuration
+/plugin
+  /plugins
+/pluginManagement
 plugins
   plugin
 groupIdorg.apache.maven.plugins/groupId

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java?rev=1479211r1=1479210r2=1479211view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
 Sat May  4 22:44:19 2013
@@ -78,8 +78,13 @@ public class MockShell extends Shell {
 
 if (execFile != null) {
   java.util.Scanner scanner = new java.util.Scanner(new File(execFile));
-  while (scanner.hasNextLine())
-execCommand(scanner.nextLine(), true, isVerbose());
+  try {
+while (scanner.hasNextLine()  !hasExited()) {
+  execCommand(scanner.nextLine(), true, isVerbose());
+}
+  } finally {
+scanner.close();
+  }
 } else if (execCommand != null) {
   for (String command : execCommand.split(\n)) {
 execCommand(command, true, isVerbose());

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1479211r1=1479210r2=1479211view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
 Sat May  4 22:44:19 2013
@@ -250,7 +250,7 @@ public class Shell extends ShellOptions 
 if (sysUser == null)
   sysUser = root;
 String user = cl.getOptionValue(usernameOption.getOpt(), sysUser);
-
+
 String passw = cl.getOptionValue(passwOption.getOpt(), null);
 tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());
 String[] loginOptions = cl.getOptionValues(loginOption.getOpt());
@@ -265,13 +265,13 @@ public class Shell extends ShellOptions 
   
   if (loginOptions == null  cl.hasOption(tokenOption.getOpt()))
 throw new IllegalArgumentException(Must supply '- + 
loginOption.getOpt() + ' option with '- + tokenOption.getOpt() + ' option);
-
+  
   if (passw != null  cl.hasOption(tokenOption.getOpt()))
 throw new IllegalArgumentException(Can not supply '- + 
passwOption.getOpt() + ' option

svn commit: r1479973 - in /accumulo: branches/1.5/ branches/1.5/assemble/ branches/1.5/bin/ branches/1.5/core/ branches/1.5/examples/ branches/1.5/examples/simple/ branches/1.5/fate/ branches/1.5/prox

2013-05-07 Thread ctubbsii
Author: ctubbsii
Date: Tue May  7 16:36:19 2013
New Revision: 1479973

URL: http://svn.apache.org/r1479973
Log:
ACCUMULO-970 revert 1.5.0-RC1

Removed:
accumulo/tags/1.5.0-RC/
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/bin/config.sh
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml
accumulo/contrib/wikisearch/trunk/   (props changed)

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479973r1=1479972r2=1479973view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Tue May  7 16:36:19 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-assemble/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/bin/config.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/config.sh?rev=1479973r1=1479972r2=1479973view=diff
==
--- accumulo/branches/1.5/bin/config.sh (original)
+++ accumulo/branches/1.5/bin/config.sh Tue May  7 16:36:19 2013
@@ -53,7 +53,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2/dev/null
 export ACCUMULO_LOG_DIR
 
 if [ -z ${ACCUMULO_VERSION} ]; then
-   ACCUMULO_VERSION=1.5.1-SNAPSHOT
+   ACCUMULO_VERSION=1.5.0-SNAPSHOT
 fi
 
 if [ -z $HADOOP_PREFIX ]

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479973r1=1479972r2=1479973view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Tue May  7 16:36:19 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-core/artifactId
   nameCore/name

Modified: accumulo/branches/1.5/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1479973r1=1479972r2=1479973view=diff
==
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Tue May  7 16:36:19 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1479973r1=1479972r2=1479973view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Tue May  7 16:36:19 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo-examples/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples-simple/artifactId
   nameSimple Examples/name

Modified: accumulo/branches/1.5/fate/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1479973r1=1479972r2=1479973view=diff
==
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Tue May  7 16:36:19 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-fate/artifactId
   nameFate/name

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1479973r1=1479972r2=1479973view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Tue May  7 16:36:19 2013
@@ -24,7 +24,7 @@
   /parent
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo/artifactId
-  version1.5.1-SNAPSHOT/version
+  version1.5.0-SNAPSHOT/version
   packagingpom/packaging
   nameApache Accumulo/name
   descriptionApache Accumulo is a sorted, distributed

svn commit: r1480091 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

2013-05-07 Thread ctubbsii
Author: ctubbsii
Date: Tue May  7 21:30:58 2013
New Revision: 1480091

URL: http://svn.apache.org/r1480091
Log:
ACCUMULO-970 record merge from superficial changes due to rolling back release 
candidate

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/pom.xml   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1479128-1479129,1479131,1479673

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1479128-1479129,1479131,1479673

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1479128-1479129,1479131,1479673

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1479128-1479129,1479131,1479673

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:r1479128-1479129,1479131,1479673

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:r1479128-1479129,1479131,1479673

Propchange: accumulo/trunk/pom.xml
--
  Merged /accumulo/branches/1.5/pom.xml:r1479128-1479129,1479131,1479673

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1479128-1479129,1479131,1479673

Propchange: accumulo/trunk/src/
--
  Merged /accumulo/branches/1.5/src:r1479128-1479129,1479131,1479673




svn commit: r1480094 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

2013-05-07 Thread ctubbsii
Author: ctubbsii
Date: Tue May  7 21:35:05 2013
New Revision: 1480094

URL: http://svn.apache.org/r1480094
Log:
ACCUMULO-970 record merge from superficial changes due to rolling back release 
candidate (missed one)

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/pom.xml   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

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

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

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

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

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:r1479973

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:r1479973

Propchange: accumulo/trunk/pom.xml
--
  Merged /accumulo/branches/1.5/pom.xml:r1479973

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

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




svn commit: r1480096 - in /accumulo/trunk: ./ .gitignore assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSe

2013-05-07 Thread ctubbsii
Author: ctubbsii
Date: Tue May  7 21:37:56 2013
New Revision: 1480096

URL: http://svn.apache.org/r1480096
Log:
ACCUMULO-970 ensure all 1.5 branch changes have been merged to trunk

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/.gitignore
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/pom.xml   (props changed)
accumulo/trunk/proxy/README   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged 
/accumulo/branches/1.5:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095

Modified: accumulo/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/.gitignore?rev=1480096r1=1480095r2=1480096view=diff
==
--- accumulo/trunk/.gitignore (original)
+++ accumulo/trunk/.gitignore Tue May  7 21:37:56 2013
@@ -108,6 +108,12 @@
 /fate/.classpath
 /fate/.project
 
+# /proxy/
+/proxy/target
+/proxy/.settings
+/proxy/.classpath
+/proxy/.project
+
 # /server/
 /server/target
 /server/.project

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095

Propchange: accumulo/trunk/core/
--
  Merged 
/accumulo/branches/1.5/core:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095

Propchange: accumulo/trunk/examples/
--
  Merged 
/accumulo/branches/1.5/examples:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095

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:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095

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:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095

Propchange: accumulo/trunk/pom.xml
--
  Merged 
/accumulo/branches/1.5/pom.xml:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095

Propchange: accumulo/trunk/proxy/README
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May  7 21:37:56 2013
@@ -0,0 +1,21 @@
+/accumulo/branches/1.3/proxy/README:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src/proxy/README:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4/proxy/README:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627,1468531,1468958,1480033
+/accumulo/branches/1.4/src/proxy/README:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1467288-1479121,1480033
+/accumulo/branches/1.4.2/proxy/README:1399210,1402681
+/accumulo/branches/1.4.2/src/proxy/README:1399210,1402681
+/accumulo/branches/1.5/proxy/README:1447769-1480095
+/accumulo/branches/ACCUMULO-259/proxy/README:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing/proxy/README:1449464-1451386
+/accumulo/branches/ACCUMULO-672/proxy/README

svn commit: r1480475 - /accumulo/branches/1.5/assemble/pom.xml

2013-05-08 Thread ctubbsii
Author: ctubbsii
Date: Wed May  8 21:42:50 2013
New Revision: 1480475

URL: http://svn.apache.org/r1480475
Log:
ACCUMULO-1389 change rpm dependency to jre instead of jdk

Modified:
accumulo/branches/1.5/assemble/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1480475r1=1480474r2=1480475view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Wed May  8 21:42:50 2013
@@ -179,7 +179,7 @@
 provideaccumulo-trace/provide
   /provides
   requires
-requirejdk/require
+requirejre/require
 requirehadoop/require
 requirezookeeper/require
   /requires




svn commit: r1480505 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.xml test/pom.xml tr

2013-05-08 Thread ctubbsii
Author: ctubbsii
Date: Thu May  9 00:19:41 2013
New Revision: 1480505

URL: http://svn.apache.org/r1480505
Log:
[maven-release-plugin] prepare release 1.5.0-RC2

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1480505r1=1480504r2=1480505view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Thu May  9 00:19:41 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-assemble/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1480505r1=1480504r2=1480505view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Thu May  9 00:19:41 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-core/artifactId
   nameCore/name

Modified: accumulo/branches/1.5/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1480505r1=1480504r2=1480505view=diff
==
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Thu May  9 00:19:41 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-examples/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1480505r1=1480504r2=1480505view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Thu May  9 00:19:41 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo-examples/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-examples-simple/artifactId
   nameSimple Examples/name

Modified: accumulo/branches/1.5/fate/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1480505r1=1480504r2=1480505view=diff
==
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Thu May  9 00:19:41 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0-SNAPSHOT/version
+version1.5.0/version
   /parent
   artifactIdaccumulo-fate/artifactId
   nameFate/name

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1480505r1=1480504r2=1480505view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Thu May  9 00:19:41 2013
@@ -24,7 +24,7 @@
   /parent
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo/artifactId
-  version1.5.0-SNAPSHOT/version
+  version1.5.0/version
   packagingpom/packaging
   nameApache Accumulo/name
   descriptionApache Accumulo is a sorted, distributed key/value store based 
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, 
and Thrift. It features a few novel improvements on the BigTable design in the 
form of cell-level access labels and a server-side programming mechanism that 
can modify key/value pairs at various points in the data management 
process./description
@@ -83,9 +83,9 @@
 moduletest/module
   /modules
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/accumulo/branches/1.5/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/accumulo/branches/1.5/developerConnection
-urlhttp://svn.apache.org/viewvc/accumulo/branches/1.5/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC2

svn commit: r1480506 - /accumulo/tags/1.5.0-RC2/

2013-05-08 Thread ctubbsii
Author: ctubbsii
Date: Thu May  9 00:19:46 2013
New Revision: 1480506

URL: http://svn.apache.org/r1480506
Log:
[maven-release-plugin]  copy for tag 1.5.0-RC2

Added:
accumulo/tags/1.5.0-RC2/   (props changed)
  - copied from r1480505, accumulo/branches/1.5/

Propchange: accumulo/tags/1.5.0-RC2/
--
--- svn:ignore (added)
+++ svn:ignore Thu May  9 00:19:46 2013
@@ -0,0 +1,8 @@
+logs
+walogs
+target
+.idea
+.project
+.settings
+.pydevproject
+accumulo.iml

Propchange: accumulo/tags/1.5.0-RC2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu May  9 00:19:46 2013
@@ -0,0 +1,20 @@
+/accumulo/branches/1.3:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627,1468531,1468958,1480033
+/accumulo/branches/1.4/src:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1468531,1468958,1480033
+/accumulo/branches/1.4.2:1399210,1402681
+/accumulo/branches/1.4.2/src:1399210,1402681
+/accumulo/branches/ACCUMULO-259:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing:1449464-1451386
+/accumulo/branches/ACCUMULO-672:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk:1447829,1448390,1451208,1456618,1456635,1457910,1463798
+/accumulo/trunk/src:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3/src:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3.5rc:1209938
+/incubator/accumulo/branches/1.3.5rc/src:1209938
+/incubator/accumulo/branches/1.4:1201902-1305402
+/incubator/accumulo/branches/1.4/src:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src:1304025,1305326
+/incubator/accumulo/trunk/src:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495




svn commit: r1480507 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.xml test/pom.xml tr

2013-05-08 Thread ctubbsii
Author: ctubbsii
Date: Thu May  9 00:19:52 2013
New Revision: 1480507

URL: http://svn.apache.org/r1480507
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1480507r1=1480506r2=1480507view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Thu May  9 00:19:52 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-assemble/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1480507r1=1480506r2=1480507view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Thu May  9 00:19:52 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-core/artifactId
   nameCore/name

Modified: accumulo/branches/1.5/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1480507r1=1480506r2=1480507view=diff
==
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Thu May  9 00:19:52 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1480507r1=1480506r2=1480507view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Thu May  9 00:19:52 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo-examples/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples-simple/artifactId
   nameSimple Examples/name

Modified: accumulo/branches/1.5/fate/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1480507r1=1480506r2=1480507view=diff
==
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Thu May  9 00:19:52 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.0/version
+version1.5.1-SNAPSHOT/version
   /parent
   artifactIdaccumulo-fate/artifactId
   nameFate/name

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1480507r1=1480506r2=1480507view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Thu May  9 00:19:52 2013
@@ -24,7 +24,7 @@
   /parent
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo/artifactId
-  version1.5.0/version
+  version1.5.1-SNAPSHOT/version
   packagingpom/packaging
   nameApache Accumulo/name
   descriptionApache Accumulo is a sorted, distributed key/value store based 
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, 
and Thrift. It features a few novel improvements on the BigTable design in the 
form of cell-level access labels and a server-side programming mechanism that 
can modify key/value pairs at various points in the data management 
process./description
@@ -83,9 +83,9 @@
 moduletest/module
   /modules
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC2/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC2/developerConnection
-urlhttp://svn.apache.org/viewvc/accumulo/tags/1.5.0-RC2/url
+
connectionscm:svn:http://svn.apache.org/repos/asf

svn commit: r1480864 - in /accumulo: branches/1.5/ branches/1.5/assemble/ branches/1.5/core/ branches/1.5/examples/ branches/1.5/examples/simple/ branches/1.5/fate/ branches/1.5/proxy/ branches/1.5/se

2013-05-09 Thread ctubbsii
Author: ctubbsii
Date: Fri May 10 02:48:47 2013
New Revision: 1480864

URL: http://svn.apache.org/r1480864
Log:
ACCUMULO-970 roll back 1.5.0-RC2

Removed:
accumulo/tags/1.5.0-RC2/
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1480864r1=1480863r2=1480864view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Fri May 10 02:48:47 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-assemble/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1480864r1=1480863r2=1480864view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Fri May 10 02:48:47 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-core/artifactId
   nameCore/name

Modified: accumulo/branches/1.5/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1480864r1=1480863r2=1480864view=diff
==
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Fri May 10 02:48:47 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples/artifactId
   packagingpom/packaging

Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1480864r1=1480863r2=1480864view=diff
==
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Fri May 10 02:48:47 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo-examples/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-examples-simple/artifactId
   nameSimple Examples/name

Modified: accumulo/branches/1.5/fate/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1480864r1=1480863r2=1480864view=diff
==
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Fri May 10 02:48:47 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.accumulo/groupId
 artifactIdaccumulo/artifactId
-version1.5.1-SNAPSHOT/version
+version1.5.0-SNAPSHOT/version
   /parent
   artifactIdaccumulo-fate/artifactId
   nameFate/name

Modified: accumulo/branches/1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1480864r1=1480863r2=1480864view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Fri May 10 02:48:47 2013
@@ -24,7 +24,7 @@
   /parent
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo/artifactId
-  version1.5.1-SNAPSHOT/version
+  version1.5.0-SNAPSHOT/version
   packagingpom/packaging
   nameApache Accumulo/name
   descriptionApache Accumulo is a sorted, distributed key/value store based 
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, 
and Thrift. It features a few novel improvements on the BigTable design in the 
form of cell-level access labels and a server-side programming mechanism that 
can modify key/value pairs at various points in the data management 
process./description
@@ -502,7 +502,7 @@
 /goals
   /pluginExecutionFilter
   action
-ignore /
+ignore/ignore
   /action
 /pluginExecution
 pluginExecution
@@ -515,7 +515,7 @@
 /goals

svn commit: r1480865 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

2013-05-09 Thread ctubbsii
Author: ctubbsii
Date: Fri May 10 02:51:36 2013
New Revision: 1480865

URL: http://svn.apache.org/r1480865
Log:
ACCUMULO-970 Update svn merge info from 1.5.0-RC2 changes, so 1.5 to trunk 
merges go smoothly

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/pom.xml   (props changed)
accumulo/trunk/proxy/README   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1480505-1480507,1480864

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1480505-1480507,1480864

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1480505-1480507,1480864

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1480505-1480507,1480864

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:r1480505-1480507,1480864

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:r1480505-1480507,1480864

Propchange: accumulo/trunk/pom.xml
--
  Merged /accumulo/branches/1.5/pom.xml:r1480505-1480507,1480864

Propchange: accumulo/trunk/proxy/README
--
  Merged /accumulo/branches/1.5/proxy/README:r1480505-1480507,1480864

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1480505-1480507,1480864

Propchange: accumulo/trunk/src/
--
  Merged /accumulo/branches/1.5/src:r1480505-1480507,1480864




svn commit: r1481249 - in /accumulo/branches/1.5: assemble/pom.xml assemble/src/main/assemblies/bin.xml assemble/src/main/assemblies/binary-release.xml pom.xml

2013-05-10 Thread ctubbsii
Author: ctubbsii
Date: Sat May 11 01:45:45 2013
New Revision: 1481249

URL: http://svn.apache.org/r1481249
Log:
ACCUMULO-1404 make maven-release-plugin include the proper files for binary 
release artifacts, and rename binary-release tarball to more explicitly 
describe what it is and to adjust the baseDirectory to match user expectations 
from prior releases

Added:
accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml
  - copied, changed from r1481244, 
accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml
Removed:
accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1481249r1=1481248r2=1481249view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Sat May 11 01:45:45 2013
@@ -117,7 +117,7 @@
 phasepackage/phase
 configuration
   descriptors
-descriptorsrc/main/assemblies/bin.xml/descriptor
+
descriptorsrc/main/assemblies/binary-release.xml/descriptor
   /descriptors
 /configuration
   /execution
@@ -169,14 +169,6 @@
   classifierbin/classifier
   provides
 provideaccumulo/provide
-provideaccumulo-core/provide
-provideaccumulo-examples/provide
-provideaccumulo-fate/provide
-provideaccumulo-proxy/provide
-provideaccumulo-server/provide
-provideaccumulo-start/provide
-provideaccumulo-test/provide
-provideaccumulo-trace/provide
   /provides
   requires
 requirejre/require
@@ -188,6 +180,9 @@
   
directory/opt/accumulo/accumulo-${project.version}/directory
   sources
 source
+  location${accumulo-top}/CHANGES/location
+/source
+source
   location${accumulo-top}/LICENSE/location
 /source
 source
@@ -210,25 +205,6 @@
   /sources
 /mapping
 mapping
-  
directory/opt/accumulo/accumulo-${project.version}/test/directory
-  sources
-source
-  location${accumulo-top}/test/location
-  excludes
-excludesrc/**/exclude
-excludetarget/**/exclude
-exclude**/walkers.txt/exclude
-exclude**/ingesters.txt/exclude
-exclude**/continuous-env.sh/exclude
-exclude.*/**/exclude
-exclude**/*.pyc/exclude
-exclude**/*.pyo/exclude
-excludepom.xml/exclude
-  /excludes
-/source
-  /sources
-/mapping
-mapping
   
directory/opt/accumulo/accumulo-${project.version}/bin/directory
 /mapping
 mapping
@@ -245,25 +221,21 @@
 /mapping
 mapping
   
directory/opt/accumulo/accumulo-${project.version}/conf/directory
+  recurseDirectoriestrue/recurseDirectories
   sources
 source
   location${accumulo-top}/conf/location
-  excludes
-
exclude${accumulo-top}/**/accumulo-site.xml/exclude
-
exclude${accumulo-top}/**/accumulo-env.sh/exclude
-
exclude${accumulo-top}/**/accumulo-metrics.xml/exclude
-exclude${accumulo-top}/**/test-*/exclude
-exclude${accumulo-top}/**/slaves/exclude
-exclude${accumulo-top}/**/masters/exclude
-exclude${accumulo-top}/**/tracers/exclude
-exclude${accumulo-top}/**/gc/exclude
-exclude${accumulo-top}/**/monitor/exclude
-  /excludes
+  includes
+includeaccumulo.policy.example/include
+includeexamples/**/*/include
+includeexamples

svn commit: r1481250 - in /accumulo/trunk: ./ assemble/ assemble/pom.xml assemble/src/main/assemblies/bin.xml assemble/src/main/assemblies/binary-release.xml bin/tool.sh pom.xml

2013-05-10 Thread ctubbsii
Author: ctubbsii
Date: Sat May 11 02:08:39 2013
New Revision: 1481250

URL: http://svn.apache.org/r1481250
Log:
ACCUMULO-1404, ACCUMULO-1384 merge to trunk

Added:
accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
  - copied unchanged from r1481249, 
accumulo/branches/1.5/assemble/src/main/assemblies/binary-release.xml
Removed:
accumulo/trunk/assemble/src/main/assemblies/bin.xml
Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/assemble/pom.xml
accumulo/trunk/bin/tool.sh
accumulo/trunk/pom.xml   (contents, props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1480478-1480504,1480508-1480863,1480865-1481249

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1480478-1480504,1480508-1480863,1480865-1481249

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1481250r1=1481249r2=1481250view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat May 11 02:08:39 2013
@@ -117,7 +117,7 @@
 phasepackage/phase
 configuration
   descriptors
-descriptorsrc/main/assemblies/bin.xml/descriptor
+
descriptorsrc/main/assemblies/binary-release.xml/descriptor
   /descriptors
 /configuration
   /execution
@@ -169,14 +169,6 @@
   classifierbin/classifier
   provides
 provideaccumulo/provide
-provideaccumulo-core/provide
-provideaccumulo-examples/provide
-provideaccumulo-fate/provide
-provideaccumulo-proxy/provide
-provideaccumulo-server/provide
-provideaccumulo-start/provide
-provideaccumulo-test/provide
-provideaccumulo-trace/provide
   /provides
   requires
 requirejre/require
@@ -188,6 +180,9 @@
   
directory/opt/accumulo/accumulo-${project.version}/directory
   sources
 source
+  location${accumulo-top}/CHANGES/location
+/source
+source
   location${accumulo-top}/LICENSE/location
 /source
 source
@@ -210,25 +205,6 @@
   /sources
 /mapping
 mapping
-  
directory/opt/accumulo/accumulo-${project.version}/test/directory
-  sources
-source
-  location${accumulo-top}/test/location
-  excludes
-excludesrc/**/exclude
-excludetarget/**/exclude
-exclude**/walkers.txt/exclude
-exclude**/ingesters.txt/exclude
-exclude**/continuous-env.sh/exclude
-exclude.*/**/exclude
-exclude**/*.pyc/exclude
-exclude**/*.pyo/exclude
-excludepom.xml/exclude
-  /excludes
-/source
-  /sources
-/mapping
-mapping
   
directory/opt/accumulo/accumulo-${project.version}/bin/directory
 /mapping
 mapping
@@ -245,25 +221,21 @@
 /mapping
 mapping
   
directory/opt/accumulo/accumulo-${project.version}/conf/directory
+  recurseDirectoriestrue/recurseDirectories
   sources
 source
   location${accumulo-top}/conf/location
-  excludes
-
exclude${accumulo-top}/**/accumulo-site.xml/exclude
-
exclude${accumulo-top}/**/accumulo-env.sh/exclude
-
exclude${accumulo-top}/**/accumulo-metrics.xml/exclude
-exclude${accumulo-top}/**/test-*/exclude
-exclude${accumulo-top}/**/slaves/exclude
-exclude${accumulo-top}/**/masters/exclude
-exclude${accumulo-top}/**/tracers/exclude
-exclude${accumulo-top}/**/gc/exclude

  1   2   3   4   5   6   7   8   9   10   >