You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2011/10/28 17:19:27 UTC

svn commit: r1190395 - in /incubator/accumulo: branches/1.3/ branches/1.3/conf/ branches/1.3/contrib/ branches/1.3/docs/examples/ branches/1.3/test/scale/ branches/1.3/test/system/continuous/ branches/1.3/test/system/randomwalk/conf/ branches/1.3/test/...

Author: billie
Date: Fri Oct 28 15:19:25 2011
New Revision: 1190395

URL: http://svn.apache.org/viewvc?rev=1190395&view=rev
Log:
ACCUMULO-86 added a bunch of licenses, renamed Accumulo.README to README

Added:
    incubator/accumulo/branches/1.3/DISCLAIMER
    incubator/accumulo/branches/1.3/README   (with props)
    incubator/accumulo/trunk/DISCLAIMER
    incubator/accumulo/trunk/README
Modified:
    incubator/accumulo/branches/1.3/conf/accumulo-env.sh.example
    incubator/accumulo/branches/1.3/conf/accumulo-metrics.xml.example
    incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example
    incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Codestyle.xml
    incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Template.xml
    incubator/accumulo/branches/1.3/docs/examples/README.mapred
    incubator/accumulo/branches/1.3/pom.xml
    incubator/accumulo/branches/1.3/test/scale/agitator.txt
    incubator/accumulo/branches/1.3/test/scale/catastrophic.txt
    incubator/accumulo/branches/1.3/test/scale/deleteLargeTable.txt
    incubator/accumulo/branches/1.3/test/scale/restart.txt
    incubator/accumulo/branches/1.3/test/system/continuous/continuous-env.sh.example
    incubator/accumulo/branches/1.3/test/system/randomwalk/conf/randomwalk.conf.example
    incubator/accumulo/branches/1.3/test/system/scalability/conf/Ingest.conf.example
    incubator/accumulo/branches/1.3/test/system/scalability/conf/site.conf.example
    incubator/accumulo/trunk/conf/accumulo-env.sh.example
    incubator/accumulo/trunk/conf/accumulo-metrics.xml.example
    incubator/accumulo/trunk/conf/accumulo-site.xml.example
    incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml
    incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml
    incubator/accumulo/trunk/docs/examples/README.dirlist
    incubator/accumulo/trunk/docs/examples/README.mapred
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/test/scale/agitator.txt
    incubator/accumulo/trunk/test/scale/catastrophic.txt
    incubator/accumulo/trunk/test/scale/deleteLargeTable.txt
    incubator/accumulo/trunk/test/scale/restart.txt
    incubator/accumulo/trunk/test/system/auto/simple/examples.py
    incubator/accumulo/trunk/test/system/auto/stress/   (props changed)
    incubator/accumulo/trunk/test/system/continuous/continuous-env.sh.example
    incubator/accumulo/trunk/test/system/randomwalk/conf/randomwalk.conf.example
    incubator/accumulo/trunk/test/system/scalability/conf/Ingest.conf.example
    incubator/accumulo/trunk/test/system/scalability/conf/site.conf.example

Added: incubator/accumulo/branches/1.3/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/DISCLAIMER?rev=1190395&view=auto
==============================================================================
--- incubator/accumulo/branches/1.3/DISCLAIMER (added)
+++ incubator/accumulo/branches/1.3/DISCLAIMER Fri Oct 28 15:19:25 2011
@@ -0,0 +1,15 @@
+Apache Accumulo is an effort undergoing incubation at the Apache Software 
+Foundation (ASF), sponsored by the Apache Incubator PMC. 
+
+Incubation is required of all newly accepted projects until a further review 
+indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness 
+or stability of the code, it does indicate that the project has yet to be 
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Accumulo project you
+can go to the following page:
+
+http://incubator.apache.org/accumulo/

Added: incubator/accumulo/branches/1.3/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/README?rev=1190395&view=auto
==============================================================================
--- incubator/accumulo/branches/1.3/README (added)
+++ incubator/accumulo/branches/1.3/README Fri Oct 28 15:19:25 2011
@@ -0,0 +1,186 @@
+******************************************************************************
+1. Building
+
+In the normal tarball or RPM release of accumulo, everything is built and
+ready to go: there is no build step.
+
+However, if you only have source code, or you wish to make changes, you need to
+have maven configured to get Accumulo pre-requisites from repositories.  See
+the pom.xml file for the necessary components.
+
+Run "mvn package && mvn assembly:single"
+
+******************************************************************************
+2. Deployment
+
+Copy the accumulo tar file produced by "mvn package && mvn assembly:single" from the target/
+directory to the desired destination, then untar it (e.g. 
+tar xvzf accumulo-1.3.5-incubating-SNAPSHOT-dist.tar.gz).
+
+If you are using the RPM, install the RPM on every machine that will run
+accumulo.
+
+******************************************************************************
+3. Configuring
+
+Accumulo has two prerequisites, hadoop and zookeeper. Zookeeper must be at
+least version 3.3.0. Both of these must be installed and configured.    
+
+Ensure you (or the some special hadoop user account) have accounts on all of
+the machines in the cluster and that hadoop and accumulo install files can be
+found in the same location on every machine in the cluster.  You will need to
+have password-less ssh set up as described in the hadoop documentation. 
+
+You will need to have hadoop installed and configured on your system.
+Accumulo 1.3.5-incubating-SNAPSHOT has been tested with hadoop version 0.20.1 and 0.20.2.
+
+Create a "slaves" file in $ACCUMULO_HOME/conf/.  This is a list of machines
+where tablet servers and loggers will run.
+
+Create a "masters" file in $ACCUMULO_HOME/conf/.  This is a list of
+machines where the master server will run. 
+
+Create conf/accumulo-env.sh following the template of
+conf/accumulo-env.sh.example.  Set JAVA_HOME, HADOOP_HOME, and ZOOKEEPER_HOME.
+These directories must be at the same location on every node in the cluster.
+Note that zookeeper must be installed on every machine, but it should not be 
+run on every machine.
+
+* Note that you will be specifying the Java heap space in accumulo-env.sh.  
+You should make sure that the total heap space used for the accumulo tserver,
+logger and the hadoop datanode and tasktracker is less than the available
+memory on each slave node in the cluster.  On large clusters, it is recommended
+that the accumulo master, hadoop namenode, secondary namenode, and hadoop
+jobtracker all be run on separate machines to allow them to use more heap
+space.  If you are running these on the same machine on a small cluster, make
+sure their heap space settings fit within the available memory.  The zookeeper
+instances are also time sensitive and should be on machines that will not be
+heavily loaded, or over-subscribed for memory.
+
+Create conf/accumulo-site.xml.  You must set the zookeeper servers in this
+file (instance.zookeeper.host).  Look at docs/config.html to see what
+additional variables you can modify and what the defaults are.
+
+* Some recommended modifications for the accumulo site are:
+
+logger.dir.walog
+	- a local directory that will be used to log updates which will be used in the event of
+	  tablet server failure
+
+Synchronize your accumulo conf directory across the cluster.  As a precaution
+against mis-configured systems, servers using different configuration files
+will not communicate with the rest of the cluster.
+
+******************************************************************************
+4. Running Accumulo
+
+Make sure hadoop is configured on all of the machines in the cluster, including
+access to a shared hdfs instance.  Make sure hdfs is running.
+
+Make sure zookeeper is configured and running on at least one machine in the
+cluster.
+
+Run "bin/accumulo init" to create the hdfs directory structure
+(hdfs:///accumulo/*) and initial zookeeper settings. This will also allow you
+to also configure the initial root password. Only do this once. 
+
+Start accumulo using the bin/start-all.sh script.
+
+Use the "bin/accumulo shell -u <username>" command to run a accumulo shell
+interpreter.  Within this interpreter, run "createtable <tablename>" to create
+a table, and run "table <tablename>" followed by "scan" to scan a table.
+
+In the example below a table is created, data is inserted, and the table is
+scanned.
+
+    $ ./bin/accumulo shell -u root
+    Enter current password for 'root'@'acu13': ******
+
+    Shell - Accumulo Interactive Shell
+    - 
+    - version: 1.3.5-incubating-SNAPSHOT
+    - instance name: acu13
+    - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
+    - 
+    - type 'help' for a list of available commands
+    - 
+    root@ac> createtable foo
+    root@ac foo> insert row1 colf1 colq1 val1
+    root@ac foo> insert row1 colf1 colq2 val2
+    root@ac foo> scan
+    row1 colf1:colq1 []    val1
+    row1 colf1:colq2 []    val2
+
+The example below start the shell, switches to table foo, and scans for a
+certain column.
+
+    $ ./bin/accumulo shell -u root
+    Enter current password for 'root'@'acu13': ******
+
+    Shell - Accumulo Interactive Shell
+    - 
+    - version: 1.3.5-incubating-SNAPSHOT
+    - instance name: acu13
+    - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
+    - 
+    - type 'help' for a list of available commands
+    - 
+    root@ac> table foo
+    root@ac foo> scan -c colf1:colq2
+    row1 colf1:colq2 []    val2
+
+
+
+
+******************************************************************************
+5. Monitoring Accumulo
+
+You can point your browser to the master host, on port 50095 to see the status
+of accumulo across the cluster.  You can even do this with the text-based
+browser "elinks":
+
+ $ links http://localhost:50095
+
+From this GUI, you can ensure that tablets are assigned, tables are online,
+tablet servers are up. You can monitor query and ingest rates across the
+cluster.
+
+******************************************************************************
+6. Stopping Accumulo
+
+Do not kill the tabletservers or run bin/tdown.sh unless absolutely necessary.
+Recovery from a catastrophic loss of servers can take a long time. To shutdown
+cleanly, run "bin/stop-all.sh" and the master will orchestrate the shutdown of
+all the tablet servers.  Shutdown waits for all writes to finish, so it may
+take some time for particular configurations.  
+
+******************************************************************************
+7. Logging
+
+DEBUG and above are logged to the logs/ dir.  To modify this behavior change
+the scripts in conf/.  To change the logging dir, set ACCUMULO_LOG_DIR in
+conf/accumulo-env.sh.  Stdout and stderr of each accumulo process is
+redirected to the log dir.
+
+******************************************************************************
+8. API
+
+The public accumulo API is composed of everything in the org.apache.accumulo.core.client
+package (excluding the org.apache.accumulo.core.client.impl package) and the following
+classes from org.apache.accumulo.core.data : Key, Mutation, Value, and Range.  To get
+started using accumulo review the example and the javadoc for the packages and
+classes mentioned above. 
+
+******************************************************************************
+9. Performance Tuning
+
+Accumulo has exposed several configuration properties that can be changed. 
+These properties and configuration management are described in detail in 
+docs/config.html.  While the default value is usually optimal, there are cases 
+where a change can increase query and ingest performance.
+
+Before changing a property from its default in a production system, you should 
+develop a good understanding of the property and consider creating a test to 
+prove the increased performance.
+
+******************************************************************************

Propchange: incubator/accumulo/branches/1.3/README
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/accumulo/branches/1.3/conf/accumulo-env.sh.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/conf/accumulo-env.sh.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/conf/accumulo-env.sh.example (original)
+++ incubator/accumulo/branches/1.3/conf/accumulo-env.sh.example Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 #! /usr/bin/env bash
+
+# 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.
+
 test -z "$JAVA_HOME"              && export JAVA_HOME=$JAVA_HOME
 test -z "$HADOOP_HOME"            && export HADOOP_HOME=$HADOOP_LOCATION
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs

Modified: incubator/accumulo/branches/1.3/conf/accumulo-metrics.xml.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/conf/accumulo-metrics.xml.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/conf/accumulo-metrics.xml.example (original)
+++ incubator/accumulo/branches/1.3/conf/accumulo-metrics.xml.example Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 <!--
+  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.
+-->
+<!--
   This file follows the conventions for XMLConfiguration files specified in the Apache Commons Configuration 1.5 Library. Changes to this file will be noticed
   at runtime (see the FileChangedReloadingStrategy class in Commons Configuration).
 -->

Modified: incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example (original)
+++ incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example Fri Oct 28 15:19:25 2011
@@ -1,4 +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.
+-->
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 
 <configuration>

Modified: incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Codestyle.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Codestyle.xml?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Codestyle.xml (original)
+++ incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Codestyle.xml Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  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.
+-->
 <profiles version="12">
 <profile kind="CodeFormatterProfile" name="Accumulo" version="12">
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>

Modified: incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Template.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Template.xml?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Template.xml (original)
+++ incubator/accumulo/branches/1.3/contrib/Eclipse-Accumulo-Template.xml Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  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.
+-->
 <templates>
 <template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
  * @return the ${bare_field_name}
@@ -43,4 +59,4 @@ ${exception_var}.printStackTrace();</tem
 ${body_statement}</template><template 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 constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};
 </template>
-</templates>
\ No newline at end of file
+</templates>

Modified: incubator/accumulo/branches/1.3/docs/examples/README.mapred
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/docs/examples/README.mapred?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/docs/examples/README.mapred (original)
+++ incubator/accumulo/branches/1.3/docs/examples/README.mapred Fri Oct 28 15:19:25 2011
@@ -5,7 +5,7 @@ accumulo table with aggregators.
 To run this example you will need a directory in HDFS containing text files.
 The accumulo readme will be used to show how to run this example.
 
-  [user1@localhost accumulo]$ hadoop fs -copyFromLocal $ACCUMULO_HOME/Accumulo.README /user/user1/wc/Accumulo.README
+  [user1@localhost accumulo]$ hadoop fs -copyFromLocal $ACCUMULO_HOME/README /user/user1/wc/Accumulo.README
   [user1@localhost accumulo]$ hadoop fs -ls /user/user1/wc
   Found 1 items
   -rw-r--r--   2 user1 supergroup       9359 2009-07-15 17:54 /user/user1/wc/Accumulo.README

Modified: incubator/accumulo/branches/1.3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/pom.xml?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/pom.xml (original)
+++ incubator/accumulo/branches/1.3/pom.xml Fri Oct 28 15:19:25 2011
@@ -202,7 +202,7 @@
 							<directory>/opt/accumulo/accumulo-${project.version}</directory>
 							<sources>
 								<source>
-									<location>Accumulo.README</location>
+									<location>README</location>
 								</source>
 							</sources>
 						</mapping>

Modified: incubator/accumulo/branches/1.3/test/scale/agitator.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/scale/agitator.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/scale/agitator.txt (original)
+++ incubator/accumulo/branches/1.3/test/scale/agitator.txt Fri Oct 28 15:19:25 2011
@@ -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.
+
 * run continuous ingest, continuous walkers, and agitator for 24 hours
 * stop continuous ingest, walkers, and agitator
 * run verification map reduce job

Modified: incubator/accumulo/branches/1.3/test/scale/catastrophic.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/scale/catastrophic.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/scale/catastrophic.txt (original)
+++ incubator/accumulo/branches/1.3/test/scale/catastrophic.txt Fri Oct 28 15:19:25 2011
@@ -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.
+
 * run continuous ingest and continuous walkers for 24 hours
 * stop continuous ingest and walkers
 * disable idle compactions
@@ -6,4 +21,4 @@
 * restart accumulo
 * allow log recoveries to run
 * run verification map reduce job
-* compare counts from two verification runs
\ No newline at end of file
+* compare counts from two verification runs

Modified: incubator/accumulo/branches/1.3/test/scale/deleteLargeTable.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/scale/deleteLargeTable.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/scale/deleteLargeTable.txt (original)
+++ incubator/accumulo/branches/1.3/test/scale/deleteLargeTable.txt Fri Oct 28 15:19:25 2011
@@ -1 +1,16 @@
-Create and delete a large table (do this with !METADATA split alot) see #2381
\ No newline at end of file
+# 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.
+
+Create and delete a large table (do this with !METADATA split alot)

Modified: incubator/accumulo/branches/1.3/test/scale/restart.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/scale/restart.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/scale/restart.txt (original)
+++ incubator/accumulo/branches/1.3/test/scale/restart.txt Fri Oct 28 15:19:25 2011
@@ -1,4 +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.
+
  * create a continuous ingest table with 16k tablets
  * start continuous ingest
  * restart accumulo, but leave the ingesters running
- * after accumulo is up, ingest should quickly resume to pre-restart rates
\ No newline at end of file
+ * after accumulo is up, ingest should quickly resume to pre-restart rates

Modified: incubator/accumulo/branches/1.3/test/system/continuous/continuous-env.sh.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/system/continuous/continuous-env.sh.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/system/continuous/continuous-env.sh.example (original)
+++ incubator/accumulo/branches/1.3/test/system/continuous/continuous-env.sh.example Fri Oct 28 15:19:25 2011
@@ -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.
+
 #set this to an absolute path that exist on every machine
 ACCUMULO_HOME=../../..
 CONTINUOUS_LOG_DIR=$ACCUMULO_HOME/test/system/continuous/logs

Modified: incubator/accumulo/branches/1.3/test/system/randomwalk/conf/randomwalk.conf.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/system/randomwalk/conf/randomwalk.conf.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/system/randomwalk/conf/randomwalk.conf.example (original)
+++ incubator/accumulo/branches/1.3/test/system/randomwalk/conf/randomwalk.conf.example Fri Oct 28 15:19:25 2011
@@ -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.
+
 # Basic
 INSTANCE=instance
 ZOOKEEPERS=localhost

Modified: incubator/accumulo/branches/1.3/test/system/scalability/conf/Ingest.conf.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/system/scalability/conf/Ingest.conf.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/system/scalability/conf/Ingest.conf.example (original)
+++ incubator/accumulo/branches/1.3/test/system/scalability/conf/Ingest.conf.example Fri Oct 28 15:19:25 2011
@@ -1,3 +1,17 @@
+# 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.
 
 # Table to ingest into
 TABLE=ingest

Modified: incubator/accumulo/branches/1.3/test/system/scalability/conf/site.conf.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/system/scalability/conf/site.conf.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/system/scalability/conf/site.conf.example (original)
+++ incubator/accumulo/branches/1.3/test/system/scalability/conf/site.conf.example Fri Oct 28 15:19:25 2011
@@ -1,3 +1,17 @@
+# 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.
 
 # accumulo instance
 INSTANCE_NAME=a12

Added: incubator/accumulo/trunk/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/DISCLAIMER?rev=1190395&view=auto
==============================================================================
--- incubator/accumulo/trunk/DISCLAIMER (added)
+++ incubator/accumulo/trunk/DISCLAIMER Fri Oct 28 15:19:25 2011
@@ -0,0 +1,15 @@
+Apache Accumulo is an effort undergoing incubation at the Apache Software 
+Foundation (ASF), sponsored by the Apache Incubator PMC. 
+
+Incubation is required of all newly accepted projects until a further review 
+indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness 
+or stability of the code, it does indicate that the project has yet to be 
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Accumulo project you
+can go to the following page:
+
+http://incubator.apache.org/accumulo/

Added: incubator/accumulo/trunk/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/README?rev=1190395&view=auto
==============================================================================
--- incubator/accumulo/trunk/README (added)
+++ incubator/accumulo/trunk/README Fri Oct 28 15:19:25 2011
@@ -0,0 +1,196 @@
+******************************************************************************
+1. Building
+
+In the normal tarball or RPM release of accumulo, everything is built and
+ready to go: there is no build step.
+
+However, if you only have source code, or you wish to make changes, you need to
+have maven configured to get Accumulo pre-requisites from repositories.  See
+the pom.xml file for the necessary components.
+
+Run "mvn package && mvn assembly:single"
+
+******************************************************************************
+2. Deployment
+
+Copy the accumulo tar file produced by "mvn package && mvn assembly:single" 
+from the target/ directory to the desired destination, then untar it (e.g. 
+tar xvzf accumulo-1.4.0-incubating-SNAPSHOT-dist.tar.gz).
+
+If you are using the RPM, install the RPM on every machine that will run
+accumulo.
+
+******************************************************************************
+3. Upgrading from 1.3 to 1.4
+
+
+
+******************************************************************************
+4. Configuring
+
+Accumulo has two prerequisites, hadoop and zookeeper. Zookeeper must be at
+least version 3.3.0. Both of these must be installed and configured. Zookeeper 
+normally only allows for 10 connections from one computer.  On a single-host 
+install, this number is a little two low.  Add the following to the 
+$ZOOKEEPER_HOME/conf/zoo.cfg file:
+
+   maxClientCnxns=100
+
+Ensure you (or the some special hadoop user account) have accounts on all of
+the machines in the cluster and that hadoop and accumulo install files can be
+found in the same location on every machine in the cluster.  You will need to
+have password-less ssh set up as described in the hadoop documentation. 
+
+You will need to have hadoop installed and configured on your system.
+Accumulo 1.4.0-incubating-SNAPSHOT has been tested with hadoop version 0.20.2.
+
+Create a "slaves" file in $ACCUMULO_HOME/conf/.  This is a list of machines
+where tablet servers and loggers will run.
+
+Create a "masters" file in $ACCUMULO_HOME/conf/.  This is a list of
+machines where the master server will run. 
+
+Create conf/accumulo-env.sh following the template of
+conf/accumulo-env.sh.example.  Set JAVA_HOME, HADOOP_HOME, and ZOOKEEPER_HOME.
+These directories must be at the same location on every node in the cluster.
+Note that zookeeper must be installed on every machine, but it should not be 
+run on every machine.
+
+* Note that you will be specifying the Java heap space in accumulo-env.sh.  
+You should make sure that the total heap space used for the accumulo tserver,
+logger and the hadoop datanode and tasktracker is less than the available
+memory on each slave node in the cluster.  On large clusters, it is recommended
+that the accumulo master, hadoop namenode, secondary namenode, and hadoop
+jobtracker all be run on separate machines to allow them to use more heap
+space.  If you are running these on the same machine on a small cluster, make
+sure their heap space settings fit within the available memory.  The zookeeper
+instances are also time sensitive and should be on machines that will not be
+heavily loaded, or over-subscribed for memory.
+
+Create conf/accumulo-site.xml.  You must set the zookeeper servers in this
+file (instance.zookeeper.host).  Look at docs/config.html to see what
+additional variables you can modify and what the defaults are.
+
+* Some recommended modifications for the accumulo site are:
+
+logger.dir.walog
+	- a local directory that will be used to log updates which will be used in the event of
+	  tablet server failure
+
+Synchronize your accumulo conf directory across the cluster.  As a precaution
+against mis-configured systems, servers using different configuration files
+will not communicate with the rest of the cluster.
+
+******************************************************************************
+5. Running Accumulo
+
+Make sure hadoop is configured on all of the machines in the cluster, including
+access to a shared hdfs instance.  Make sure hdfs is running.
+
+Make sure zookeeper is configured and running on at least one machine in the
+cluster.
+
+Run "bin/accumulo init" to create the hdfs directory structure
+(hdfs:///accumulo/*) and initial zookeeper settings. This will also allow you
+to also configure the initial root password. Only do this once. 
+
+Start accumulo using the bin/start-all.sh script.
+
+Use the "bin/accumulo shell -u <username>" command to run a accumulo shell
+interpreter.  Within this interpreter, run "createtable <tablename>" to create
+a table, and run "table <tablename>" followed by "scan" to scan a table.
+
+In the example below a table is created, data is inserted, and the table is
+scanned.
+
+    $ ./bin/accumulo shell -u root
+    Enter current password for 'root'@'acu14': ******
+
+    Shell - Accumulo Interactive Shell
+    - 
+    - version: 1.4.0-incubating-SNAPSHOT
+    - instance name: acu14
+    - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
+    - 
+    - type 'help' for a list of available commands
+    - 
+    root@ac> createtable foo
+    root@ac foo> insert row1 colf1 colq1 val1
+    root@ac foo> insert row1 colf1 colq2 val2
+    root@ac foo> scan
+    row1 colf1:colq1 []    val1
+    row1 colf1:colq2 []    val2
+
+The example below start the shell, switches to table foo, and scans for a
+certain column.
+
+    $ ./bin/accumulo shell -u root
+    Enter current password for 'root'@'acu14': ******
+
+    Shell - Accumulo Interactive Shell
+    - 
+    - version: 1.4.0-incubating-SNAPSHOT
+    - instance name: acu14
+    - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
+    - 
+    - type 'help' for a list of available commands
+    - 
+    root@ac> table foo
+    root@ac foo> scan -c colf1:colq2
+    row1 colf1:colq2 []    val2
+
+
+
+
+******************************************************************************
+6. Monitoring Accumulo
+
+You can point your browser to the master host, on port 50095 to see the status
+of accumulo across the cluster.  You can even do this with the text-based
+browser "elinks":
+
+ $ links http://localhost:50095
+
+From this GUI, you can ensure that tablets are assigned, tables are online,
+tablet servers are up. You can monitor query and ingest rates across the
+cluster.
+
+******************************************************************************
+7. Stopping Accumulo
+
+Do not kill the tabletservers or run bin/tdown.sh unless absolutely necessary.
+Recovery from a catastrophic loss of servers can take a long time. To shutdown
+cleanly, run "bin/stop-all.sh" and the master will orchestrate the shutdown of
+all the tablet servers.  Shutdown waits for all writes to finish, so it may
+take some time for particular configurations.  
+
+******************************************************************************
+8. Logging
+
+DEBUG and above are logged to the logs/ dir.  To modify this behavior change
+the scripts in conf/.  To change the logging dir, set ACCUMULO_LOG_DIR in
+conf/accumulo-env.sh.  Stdout and stderr of each accumulo process is
+redirected to the log dir.
+
+******************************************************************************
+9. API
+
+The public accumulo API is composed of everything in the org.apache.accumulo.core.client
+package (excluding the org.apache.accumulo.core.client.impl package) and the following
+classes from org.apache.accumulo.core.data : Key, Mutation, Value, and Range.  To get
+started using accumulo review the example and the javadoc for the packages and
+classes mentioned above. 
+
+******************************************************************************
+10. Performance Tuning
+
+Accumulo has exposed several configuration properties that can be changed. 
+These properties and configuration management are described in detail in 
+docs/config.html.  While the default value is usually optimal, there are cases 
+where a change can increase query and ingest performance.
+
+Before changing a property from its default in a production system, you should 
+develop a good understanding of the property and consider creating a test to 
+prove the increased performance.
+
+******************************************************************************

Modified: incubator/accumulo/trunk/conf/accumulo-env.sh.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/accumulo-env.sh.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/accumulo-env.sh.example (original)
+++ incubator/accumulo/trunk/conf/accumulo-env.sh.example Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 #! /usr/bin/env bash
+
+# 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.
+
 test -z "$JAVA_HOME"              && export JAVA_HOME=$JAVA_HOME
 test -z "$HADOOP_HOME"            && export HADOOP_HOME=$HADOOP_LOCATION
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs

Modified: incubator/accumulo/trunk/conf/accumulo-metrics.xml.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/accumulo-metrics.xml.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/accumulo-metrics.xml.example (original)
+++ incubator/accumulo/trunk/conf/accumulo-metrics.xml.example Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 <!--
+  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.
+-->
+<!--
   This file follows the conventions for XMLConfiguration files specified in the Apache Commons Configuration 1.5 Library. Changes to this file will be noticed
   at runtime (see the FileChangedReloadingStrategy class in Commons Configuration).
 -->

Modified: incubator/accumulo/trunk/conf/accumulo-site.xml.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/accumulo-site.xml.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/accumulo-site.xml.example (original)
+++ incubator/accumulo/trunk/conf/accumulo-site.xml.example Fri Oct 28 15:19:25 2011
@@ -1,4 +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.
+-->
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 
 <configuration>

Modified: incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml (original)
+++ incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  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.
+-->
 <profiles version="12">
 <profile kind="CodeFormatterProfile" name="Accumulo" version="12">
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>

Modified: incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml (original)
+++ incubator/accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml Fri Oct 28 15:19:25 2011
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  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.
+-->
 <templates>
 <template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
  * @return the ${bare_field_name}

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml Fri Oct 28 15:19:25 2011
@@ -1,4 +1,21 @@
 <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/xsd/maven-4.0.0.xsd">
+<!--
+  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.
+-->
+
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>accumulo-sample</artifactId>
@@ -98,4 +115,4 @@
     </plugins>
   </build>
   
-</project>
\ No newline at end of file
+</project>

Modified: incubator/accumulo/trunk/docs/examples/README.dirlist
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.dirlist?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.dirlist (original)
+++ incubator/accumulo/trunk/docs/examples/README.dirlist Fri Oct 28 15:19:25 2011
@@ -72,8 +72,8 @@ Here is an illustration of what data loo
 row colf:colq [vis]
 fAccumulo.README i:002/local/Accumulo.README [visibility]
 flocal i:001/local [visibility]
-rEMDAER.esabduolC i:002/local/Accumulo.README [visibility]
-rlocal i:001/local [visibility]
+rEMDAER.olumuccA i:002/local/Accumulo.README [visibility]
+rlacol i:001/local [visibility]
 
 The values of the index table are null.  The rows are of the form "f" + filename or "r" + reverse file name.  This is to enable searches with wildcards at the beginning, middle, or end.
 

Modified: incubator/accumulo/trunk/docs/examples/README.mapred
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.mapred?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.mapred (original)
+++ incubator/accumulo/trunk/docs/examples/README.mapred Fri Oct 28 15:19:25 2011
@@ -5,7 +5,7 @@ job and a accumulo table with aggregator
 To run this example you will need a directory in HDFS containing text files.
 The accumulo readme will be used to show how to run this example.
 
-  [user1@localhost accumulo]$ hadoop fs -copyFromLocal $ACCUMULO_HOME/Accumulo.README /user/user1/wc/Accumulo.README
+  [user1@localhost accumulo]$ hadoop fs -copyFromLocal $ACCUMULO_HOME/README /user/user1/wc/Accumulo.README
   [user1@localhost accumulo]$ hadoop fs -ls /user/user1/wc
   Found 1 items
   -rw-r--r--   2 user1 supergroup       9359 2009-07-15 17:54 /user/user1/wc/Accumulo.README

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Fri Oct 28 15:19:25 2011
@@ -208,7 +208,7 @@
 							<directory>/opt/accumulo/accumulo-${project.version}</directory>
 							<sources>
 								<source>
-									<location>Accumulo.README</location>
+									<location>README</location>
 								</source>
 							</sources>
 						</mapping>

Modified: incubator/accumulo/trunk/test/scale/agitator.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/scale/agitator.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/scale/agitator.txt (original)
+++ incubator/accumulo/trunk/test/scale/agitator.txt Fri Oct 28 15:19:25 2011
@@ -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.
+
 * run continuous ingest, continuous walkers, and agitator for 24 hours
 * stop continuous ingest, walkers, and agitator
 * run verification map reduce job

Modified: incubator/accumulo/trunk/test/scale/catastrophic.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/scale/catastrophic.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/scale/catastrophic.txt (original)
+++ incubator/accumulo/trunk/test/scale/catastrophic.txt Fri Oct 28 15:19:25 2011
@@ -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.
+
 * run continuous ingest and continuous walkers for 24 hours
 * stop continuous ingest and walkers
 * disable idle compactions
@@ -6,4 +21,4 @@
 * restart accumulo
 * allow log recoveries to run
 * run verification map reduce job
-* compare counts from two verification runs
\ No newline at end of file
+* compare counts from two verification runs

Modified: incubator/accumulo/trunk/test/scale/deleteLargeTable.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/scale/deleteLargeTable.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/scale/deleteLargeTable.txt (original)
+++ incubator/accumulo/trunk/test/scale/deleteLargeTable.txt Fri Oct 28 15:19:25 2011
@@ -1 +1,16 @@
-Create and delete a large table (do this with !METADATA split alot) see #2381
\ No newline at end of file
+# 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.
+
+Create and delete a large table (do this with !METADATA split alot) see #2381

Modified: incubator/accumulo/trunk/test/scale/restart.txt
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/scale/restart.txt?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/scale/restart.txt (original)
+++ incubator/accumulo/trunk/test/scale/restart.txt Fri Oct 28 15:19:25 2011
@@ -1,4 +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.
+
  * create a continuous ingest table with 16k tablets
  * start continuous ingest
  * restart accumulo, but leave the ingesters running
- * after accumulo is up, ingest should quickly resume to pre-restart rates
\ No newline at end of file
+ * after accumulo is up, ingest should quickly resume to pre-restart rates

Modified: incubator/accumulo/trunk/test/system/auto/simple/examples.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/examples.py?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/examples.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/examples.py Fri Oct 28 15:19:25 2011
@@ -205,7 +205,7 @@ class Examples(TestUtilsMixin, unittest.
             'hadoop', 'fs', '-mkdir', "/tmp/wc"
             ]))
         self.wait(self.runOn(self.masterHost(), [
-            'hadoop', 'fs', '-copyFromLocal', ACCUMULO_HOME + "/Accumulo.README", "/tmp/wc/Accumulo.README"
+            'hadoop', 'fs', '-copyFromLocal', ACCUMULO_HOME + "/README", "/tmp/wc/Accumulo.README"
             ]))
         self.ashell('createtable wordCount -a count=org.apache.accumulo.core.iterators.aggregation.StringSummation\nquit\n')
         self.wait(self.runOn(self.masterHost(), [

Propchange: incubator/accumulo/trunk/test/system/auto/stress/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 28 15:19:25 2011
@@ -0,0 +1 @@
+*.pyc

Modified: incubator/accumulo/trunk/test/system/continuous/continuous-env.sh.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/continuous/continuous-env.sh.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/continuous/continuous-env.sh.example (original)
+++ incubator/accumulo/trunk/test/system/continuous/continuous-env.sh.example Fri Oct 28 15:19:25 2011
@@ -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.
+
 #set this to an absolute path that exist on every machine
 HADOOP_HOME=/opt/hadoop
 ACCUMULO_HOME=/opt/accumulo

Modified: incubator/accumulo/trunk/test/system/randomwalk/conf/randomwalk.conf.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/randomwalk/conf/randomwalk.conf.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/randomwalk/conf/randomwalk.conf.example (original)
+++ incubator/accumulo/trunk/test/system/randomwalk/conf/randomwalk.conf.example Fri Oct 28 15:19:25 2011
@@ -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.
+
 # Basic
 INSTANCE=instance
 ZOOKEEPERS=localhost

Modified: incubator/accumulo/trunk/test/system/scalability/conf/Ingest.conf.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/scalability/conf/Ingest.conf.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/scalability/conf/Ingest.conf.example (original)
+++ incubator/accumulo/trunk/test/system/scalability/conf/Ingest.conf.example Fri Oct 28 15:19:25 2011
@@ -1,3 +1,17 @@
+# 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.
 
 # Table to ingest into
 TABLE=ingest

Modified: incubator/accumulo/trunk/test/system/scalability/conf/site.conf.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/scalability/conf/site.conf.example?rev=1190395&r1=1190394&r2=1190395&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/scalability/conf/site.conf.example (original)
+++ incubator/accumulo/trunk/test/system/scalability/conf/site.conf.example Fri Oct 28 15:19:25 2011
@@ -1,3 +1,17 @@
+# 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.
 
 # accumulo instance
 INSTANCE_NAME=a12