accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1464817 [1/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/examples/2GB/standalone/ conf/examples/3GB/native-s...
Date Fri, 05 Apr 2013 02:54:03 GMT
Author: ctubbsii
Date: Fri Apr  5 02:54:02 2013
New Revision: 1464817

URL: http://svn.apache.org/r1464817
Log:
ACCUMULO-924 Updated plugin versions for build,
  applied latest apache parent pom,
  applied dependency pedantics based on dependency:analyze,
  add sorting/style standards to POM,
  simplified checking for licenses,
  fix brokenness with sealed jars,
  eliminated snapshot dependencies,
  used properties to support release plugin better
ACCUMULO-1063 verified previous fix on dependency conflicts
ACCUMULO-1122 incorporated Benson's changes to trunk for site
  plugin (to make it easier to merge back to trunk... site
  isn't currently being published anyway)
ACCUMULO-1201 incorporate David's changes to trunk to make merge
  back to trunk easier
ACCUMULO-1191 incorporate David's changes to trunk to make merge
  back to trunk easier

Modified:
    accumulo/branches/1.5/CHANGES
    accumulo/branches/1.5/assemble/deb/accumulo/conffile
    accumulo/branches/1.5/assemble/pom.xml
    accumulo/branches/1.5/conf/examples/1GB/native-standalone/gc
    accumulo/branches/1.5/conf/examples/1GB/native-standalone/masters
    accumulo/branches/1.5/conf/examples/1GB/native-standalone/monitor
    accumulo/branches/1.5/conf/examples/1GB/native-standalone/slaves
    accumulo/branches/1.5/conf/examples/1GB/native-standalone/tracers
    accumulo/branches/1.5/conf/examples/1GB/standalone/gc
    accumulo/branches/1.5/conf/examples/1GB/standalone/masters
    accumulo/branches/1.5/conf/examples/1GB/standalone/monitor
    accumulo/branches/1.5/conf/examples/1GB/standalone/slaves
    accumulo/branches/1.5/conf/examples/1GB/standalone/tracers
    accumulo/branches/1.5/conf/examples/2GB/native-standalone/gc
    accumulo/branches/1.5/conf/examples/2GB/native-standalone/masters
    accumulo/branches/1.5/conf/examples/2GB/native-standalone/monitor
    accumulo/branches/1.5/conf/examples/2GB/native-standalone/slaves
    accumulo/branches/1.5/conf/examples/2GB/native-standalone/tracers
    accumulo/branches/1.5/conf/examples/2GB/standalone/gc
    accumulo/branches/1.5/conf/examples/2GB/standalone/masters
    accumulo/branches/1.5/conf/examples/2GB/standalone/monitor
    accumulo/branches/1.5/conf/examples/2GB/standalone/slaves
    accumulo/branches/1.5/conf/examples/2GB/standalone/tracers
    accumulo/branches/1.5/conf/examples/3GB/native-standalone/gc
    accumulo/branches/1.5/conf/examples/3GB/native-standalone/masters
    accumulo/branches/1.5/conf/examples/3GB/native-standalone/monitor
    accumulo/branches/1.5/conf/examples/3GB/native-standalone/slaves
    accumulo/branches/1.5/conf/examples/3GB/native-standalone/tracers
    accumulo/branches/1.5/conf/examples/3GB/standalone/gc
    accumulo/branches/1.5/conf/examples/3GB/standalone/masters
    accumulo/branches/1.5/conf/examples/3GB/standalone/monitor
    accumulo/branches/1.5/conf/examples/3GB/standalone/slaves
    accumulo/branches/1.5/conf/examples/3GB/standalone/tracers
    accumulo/branches/1.5/conf/examples/512MB/native-standalone/gc
    accumulo/branches/1.5/conf/examples/512MB/native-standalone/masters
    accumulo/branches/1.5/conf/examples/512MB/native-standalone/monitor
    accumulo/branches/1.5/conf/examples/512MB/native-standalone/slaves
    accumulo/branches/1.5/conf/examples/512MB/native-standalone/tracers
    accumulo/branches/1.5/conf/examples/512MB/standalone/gc
    accumulo/branches/1.5/conf/examples/512MB/standalone/masters
    accumulo/branches/1.5/conf/examples/512MB/standalone/monitor
    accumulo/branches/1.5/conf/examples/512MB/standalone/slaves
    accumulo/branches/1.5/conf/examples/512MB/standalone/tracers
    accumulo/branches/1.5/conf/examples/vfs-classloader/accumulo-site.xml
    accumulo/branches/1.5/core/pom.xml
    accumulo/branches/1.5/core/src/test/resources/log4j.properties
    accumulo/branches/1.5/docs/README_UBUNTU
    accumulo/branches/1.5/examples/pom.xml
    accumulo/branches/1.5/examples/simple/pom.xml
    accumulo/branches/1.5/examples/simple/src/test/resources/log4j.properties
    accumulo/branches/1.5/fate/pom.xml
    accumulo/branches/1.5/fate/src/test/resources/log4j.properties
    accumulo/branches/1.5/pom.xml
    accumulo/branches/1.5/proxy/pom.xml
    accumulo/branches/1.5/proxy/proxy.properties
    accumulo/branches/1.5/proxy/src/test/resources/log4j.properties
    accumulo/branches/1.5/server/pom.xml
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
    accumulo/branches/1.5/server/src/test/resources/log4j.properties
    accumulo/branches/1.5/start/pom.xml
    accumulo/branches/1.5/start/src/test/resources/log4j.properties
    accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.4.xml
    accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.5.xml
    accumulo/branches/1.5/test/pom.xml
    accumulo/branches/1.5/test/src/main/resources/log4j.properties
    accumulo/branches/1.5/test/src/test/resources/log4j.properties
    accumulo/branches/1.5/test/system/auto/simple/__init__.py
    accumulo/branches/1.5/test/system/auto/stress/__init__.py
    accumulo/branches/1.5/test/system/continuous/batch_walkers.txt.example
    accumulo/branches/1.5/test/system/continuous/ingesters.txt.example
    accumulo/branches/1.5/test/system/continuous/scanners.txt.example
    accumulo/branches/1.5/test/system/continuous/walkers.txt.example
    accumulo/branches/1.5/test/system/randomwalk/conf/walkers.example
    accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/CHANGES
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/CHANGES?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/CHANGES (original)
+++ accumulo/branches/1.5/CHANGES Fri Apr  5 02:54:02 2013
@@ -1 +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.
+-->
 Release notes for Apache Accumulo 1.5.0

Modified: accumulo/branches/1.5/assemble/deb/accumulo/conffile
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/deb/accumulo/conffile?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/deb/accumulo/conffile (original)
+++ accumulo/branches/1.5/assemble/deb/accumulo/conffile Fri Apr  5 02:54:02 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.
+
 /etc/accumulo/conf/accumulo-site.xml
 /etc/accumulo/conf/accumulo-env.sh
 /etc/accumulo/conf/slaves

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Fri Apr  5 02:54:02 2013
@@ -15,50 +15,55 @@
   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">
-
-	<parent>
-		<groupId>org.apache.accumulo</groupId>
-		<artifactId>accumulo</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-	</parent>
-
+<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">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+  </parent>
   <artifactId>accumulo-assemble</artifactId>
-  <name>Assemble</name>
-
   <packaging>pom</packaging>
-
-  <!-- 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 child1 
-    module in our assembly, we only need to ensure this distribution project builds AFTER that one... -->
+  <name>Assemble</name>
+  <properties>
+    <accumulo-top>..</accumulo-top>
+    <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>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-server</artifactId>
+      <artifactId>accumulo-examples-simple</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-start</artifactId>
+      <artifactId>accumulo-proxy</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-examples-simple</artifactId>
+      <artifactId>accumulo-server</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-trace</artifactId>
+      <artifactId>accumulo-start</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-proxy</artifactId>
+      <artifactId>accumulo-trace</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -66,11 +71,11 @@
         <artifactId>exec-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>config webpage</id>
-            <phase>package</phase>
+            <id>config-webpage</id>
             <goals>
               <goal>exec</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <executable>bash</executable>
               <arguments>
@@ -82,45 +87,38 @@
       </plugin>
     </plugins>
   </build>
-
-  <properties>
-    <so>**/*.so</so>
-    <jnilib>**/*.jnilib</jnilib>
-    <accumulo-top>..</accumulo-top>
-  </properties>
-
   <profiles>
     <profile>
       <id>assemble</id>
       <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <configuration>
-            <finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
-            <descriptors>
-              <descriptor>dist.xml</descriptor>
-            </descriptors>
-            <tarLongFileMode>gnu</tarLongFileMode>
-          </configuration>
-          <executions>
-            <execution>
-              <id>distro-assembly</id>
-              <phase>package</phase>
-              <goals>
-                <goal>single</goal>
-              </goals>
-            </execution>
-          </executions>
-      </plugin>
-      </plugins>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <configuration>
+              <finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
+              <descriptors>
+                <descriptor>dist.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+            <executions>
+              <execution>
+                <id>distro-assembly</id>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
       </build>
     </profile>
     <profile>
       <id>dist</id>
       <properties>
-        <so></so>
         <jnilib></jnilib>
+        <so></so>
       </properties>
     </profile>
     <profile>
@@ -131,22 +129,12 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>rpm-maven-plugin</artifactId>
             <inherited>false</inherited>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>rpm</goal>
-                </goals>
-              </execution>
-            </executions>
             <configuration>
               <name>accumulo</name>
               <projversion>${project.version}</projversion>
               <summary>Apache Accumulo BigTable clone</summary>
-              <description>
-                Apache Accumulo is a large distributed structured store based on
-                Google's BigTable design.
-              </description>
+              <description>Apache Accumulo is a large distributed structured store based on
+                Google's BigTable design.</description>
               <copyright>2011 The Apache Software Foundation.</copyright>
               <url>http://accumulo.apache.org</url>
               <needarch>true</needarch>
@@ -228,7 +216,7 @@
                 </mapping>
                 <mapping>
                   <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
-                  <dependency />
+                  <dependency></dependency>
                   <sources>
                     <source>
                       <location>${accumulo-top}/lib</location>
@@ -237,6 +225,14 @@
                 </mapping>
               </mappings>
             </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>
@@ -246,17 +242,17 @@
       <build>
         <plugins>
           <plugin>
-            <artifactId>jdeb</artifactId>
             <groupId>org.vafer</groupId>
+            <artifactId>jdeb</artifactId>
             <version>0.10</version>
             <inherited>false</inherited>
             <executions>
               <execution>
                 <id>accumulo</id>
-                <phase>install</phase>
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
+                <phase>install</phase>
                 <configuration>
                   <deb>${project.build.directory}/${project.artifactId}_${project.version}.deb</deb>
                   <attach>false</attach>
@@ -277,7 +273,7 @@
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
-                      <prefix>/usr/lib/accumulo</prefix>
+                        <prefix>/usr/lib/accumulo</prefix>
                       </mapper>
                     </data>
                     <data>
@@ -285,7 +281,7 @@
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
-                      <prefix>/usr/lib/accumulo</prefix>
+                        <prefix>/usr/lib/accumulo</prefix>
                       </mapper>
                     </data>
                     <data>
@@ -293,7 +289,7 @@
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
-                      <prefix>/usr/lib/accumulo</prefix>
+                        <prefix>/usr/lib/accumulo</prefix>
                       </mapper>
                     </data>
                     <data>
@@ -338,10 +334,10 @@
               </execution>
               <execution>
                 <id>accumulo-native</id>
-                <phase>install</phase>
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
+                <phase>install</phase>
                 <configuration>
                   <attach>false</attach>
                   <controlDir>assemble/deb/accumulo-native</controlDir>
@@ -378,10 +374,10 @@
               </execution>
               <execution>
                 <id>accumulo-test</id>
-                <phase>install</phase>
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
+                <phase>install</phase>
                 <configuration>
                   <attach>false</attach>
                   <controlDir>assemble/deb/accumulo-test</controlDir>
@@ -415,10 +411,10 @@
             <executions>
               <execution>
                 <id>developer-manual</id>
-                <phase>prepare-package</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>prepare-package</phase>
                 <configuration>
                   <executable>bash</executable>
                   <arguments>
@@ -428,10 +424,10 @@
               </execution>
               <execution>
                 <id>user-manual</id>
-                <phase>prepare-package</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>prepare-package</phase>
                 <configuration>
                   <executable>bash</executable>
                   <arguments>

Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/native-standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/native-standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/native-standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/native-standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/native-standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/1GB/standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/1GB/standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/1GB/standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/1GB/standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/1GB/standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/native-standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/native-standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/native-standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/native-standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/native-standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/2GB/standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/2GB/standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/2GB/standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/2GB/standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/2GB/standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/2GB/standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/native-standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/3GB/native-standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/native-standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/3GB/native-standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/native-standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/3GB/native-standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/native-standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/3GB/native-standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/native-standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/3GB/native-standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/3GB/standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/3GB/standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/3GB/standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/3GB/standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/3GB/standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/3GB/standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/native-standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/native-standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/native-standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/512MB/native-standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/native-standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/native-standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/native-standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/512MB/native-standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/native-standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/native-standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/native-standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/512MB/native-standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/native-standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/native-standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/native-standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/512MB/native-standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/native-standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/native-standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/native-standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/512MB/native-standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/standalone/gc
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/standalone/gc?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/standalone/gc (original)
+++ accumulo/branches/1.5/conf/examples/512MB/standalone/gc Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/standalone/masters
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/standalone/masters?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/standalone/masters (original)
+++ accumulo/branches/1.5/conf/examples/512MB/standalone/masters Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/standalone/monitor
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/standalone/monitor?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/standalone/monitor (original)
+++ accumulo/branches/1.5/conf/examples/512MB/standalone/monitor Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/standalone/slaves
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/standalone/slaves?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/standalone/slaves (original)
+++ accumulo/branches/1.5/conf/examples/512MB/standalone/slaves Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/512MB/standalone/tracers
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/standalone/tracers?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/standalone/tracers (original)
+++ accumulo/branches/1.5/conf/examples/512MB/standalone/tracers Fri Apr  5 02:54:02 2013
@@ -1 +1,16 @@
+# 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.
+
 localhost

Modified: accumulo/branches/1.5/conf/examples/vfs-classloader/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/vfs-classloader/accumulo-site.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/vfs-classloader/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/vfs-classloader/accumulo-site.xml Fri Apr  5 02:54:02 2013
@@ -1,9 +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.
+-->
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 
 <configuration>

Modified: accumulo/branches/1.5/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Fri Apr  5 02:54:02 2013
@@ -16,68 +16,114 @@
   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">
-
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
     <version>1.5.0-SNAPSHOT</version>
   </parent>
-
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>accumulo-core</artifactId>
   <name>Core</name>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <configuration>
-            <outputDirectory>../lib</outputDirectory>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-thrift</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestSections>
-              <manifestSection>
-                <name>accumulo/core/</name>
-                <manifestEntries>
-                  <Sealed>true</Sealed>
-                </manifestEntries>
-              </manifestSection>
-            </manifestSections>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
+  <dependencies>
+    <dependency>
+      <groupId>com.beust</groupId>
+      <artifactId>jcommander</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-fate</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-start</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-trace</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   <profiles>
-    <!-- profile for building against Hadoop 1.0.x
-    Activate by not specifying hadoop.profile -->
     <profile>
+      <id>thrift</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>generate-thrift</id>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <!-- profile for building against Hadoop 1.0.x
+      Activate by not specifying hadoop.profile -->
       <id>hadoop-1.0</id>
       <activation>
         <property>
@@ -88,12 +134,13 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-core</artifactId>
+          <scope>provided</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 -->
       <id>hadoop-2.0</id>
       <activation>
         <property>
@@ -103,78 +150,31 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-client</artifactId>
-        </dependency>
-        <dependency>
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
+          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.apache.avro</groupId>
           <artifactId>avro</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-common</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-core</artifactId>
+          <scope>provided</scope>
         </dependency>
       </dependencies>
     </profile>
   </profiles>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-start</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-fate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-trace</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-    	<groupId>com.beust</groupId>
-    	<artifactId>jcommander</artifactId>
-    </dependency>
-  </dependencies>
-
 </project>

Modified: accumulo/branches/1.5/core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/test/resources/log4j.properties (original)
+++ accumulo/branches/1.5/core/src/test/resources/log4j.properties Fri Apr  5 02:54:02 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

Modified: accumulo/branches/1.5/docs/README_UBUNTU
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/README_UBUNTU?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/docs/README_UBUNTU (original)
+++ accumulo/branches/1.5/docs/README_UBUNTU Fri Apr  5 02:54:02 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.
+-->
 When compiling Accumulo on Ubuntu, you might need to install several dependencies. The 
 following notes are not guaranteed since there are so many different server configurations.
 Please let us know if anything is wrong or could be improved.

Modified: accumulo/branches/1.5/examples/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/examples/pom.xml (original)
+++ accumulo/branches/1.5/examples/pom.xml Fri Apr  5 02:54:02 2013
@@ -1,13 +1,13 @@
 <?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
+  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
+  the License.  You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+      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,
@@ -15,58 +15,17 @@
   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/xsd/maven-4.0.0.xsd">
+<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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>accumulo</artifactId>
     <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
     <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>accumulo-examples</artifactId>
   <packaging>pom</packaging>
   <name>Examples</name>
-
   <modules>
     <module>simple</module>
   </modules>
-
-  <repositories>
-    <repository>
-      <id>central</id>
-      <name>Maven Repository Switchboard</name>
-      <layout>default</layout>
-      <url>http://repo1.maven.org/maven2</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>java.net</id>
-      <name>java.net</name>
-      <layout>default</layout>
-      <url>https://maven.java.net/content/groups/public</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <build>
-    <defaultGoal>package</defaultGoal>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-mvn</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>



Mime
View raw message