accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1489980 [1/2] - in /accumulo/branches/ACCUMULO-118: ./ assemble/ assemble/src/main/assemblies/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examp...
Date Wed, 05 Jun 2013 17:36:21 GMT
Author: ecn
Date: Wed Jun  5 17:36:20 2013
New Revision: 1489980

URL: http://svn.apache.org/r1489980
Log:
ACCUMULO-118 merge trunk into sandbox

Added:
    accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/auditLog.xml   (with props)
    accumulo/branches/ACCUMULO-118/docs/pom.xml   (with props)
    accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/AuditMessageTest.java   (with props)
Removed:
    accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/security/AuditLevel.java
    accumulo/branches/ACCUMULO-118/test/src/main/resources/log4j.properties
Modified:
    accumulo/branches/ACCUMULO-118/   (props changed)
    accumulo/branches/ACCUMULO-118/README
    accumulo/branches/ACCUMULO-118/assemble/   (props changed)
    accumulo/branches/ACCUMULO-118/assemble/pom.xml
    accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-118/core/   (props changed)
    accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java
    accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
    accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/branches/ACCUMULO-118/core/src/test/resources/shelltest.txt
    accumulo/branches/ACCUMULO-118/examples/   (props changed)
    accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java   (props changed)
    accumulo/branches/ACCUMULO-118/fate/src/test/resources/log4j.properties
    accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
    accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
    accumulo/branches/ACCUMULO-118/pom.xml   (contents, props changed)
    accumulo/branches/ACCUMULO-118/proxy/README   (props changed)
    accumulo/branches/ACCUMULO-118/server/   (props changed)
    accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java
    accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
    accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
    accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/branches/ACCUMULO-118/src/   (props changed)
    accumulo/branches/ACCUMULO-118/test/src/test/resources/log4j.properties

Propchange: accumulo/branches/ACCUMULO-118/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1489581-1489975

Modified: accumulo/branches/ACCUMULO-118/README
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/README?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/README (original)
+++ accumulo/branches/ACCUMULO-118/README Wed Jun  5 17:36:20 2013
@@ -15,30 +15,43 @@ ready to go on x86 GNU/Linux: there is n
 
 However, if you only have source code, or you wish to make changes, you need to
 have maven configured to get Accumulo prerequisites from repositories.  See
-the pom.xml file for the necessary components. Activate the 'docs' profile to build
-the Accumulo developer and user manual.
+the pom.xml file for the necessary components. 
 
-Run "mvn package -P assemble" to build a distribution, or run 
-"mvn package -P assemble,docs" to also build the documentation. By default, 
-Accumulo compiles against Hadoop 1.0.4.  To compile against a different version
-that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
-e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0".  To compile 
-against Hadoop 2.0, specify "-Dhadoop.profile=2.0".  By default this uses
+You can build an Accumulo binary distribution, which is created in the 
+assemble/target directory, using the following command. Note that maven 3
+is required starting with Accumulo v1.5.0. By default, Accumulo compiles
+against Hadoop 1.0.4.
+
+  mvn package -P assemble
+
+To compile against a different version that is compatible with Hadoop 1.0, 
+specify hadoop.version on the command line,
+e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0".  
+
+To compile against Hadoop 2.0, specify "-Dhadoop.profile=2.0".  By default this uses
 2.0.4-alpha.  To compile against a different 2.0-compatible version, specify
 the profile and version, e.g. "-Dhadoop.profile=2.0 -Dhadoop.version=0.23.5".
 
 If you are running on another Unix-like operating system (OSX, etc) then
 you may wish to build the native libraries.  They are not strictly necessary
-but having them available suppresses a runtime warning:
+but having them available suppresses a runtime warning and enables Accumulo
+to run faster:
 
   $ ( cd ./server/src/main/c++ ; make )
 
-If you want to build the debian release, use the command "mvn install -Pdeb" to 
+If you want to build the debian release, use the command "mvn package -Pdeb" to 
 generate the .deb files in the target/ directory. Please follow the steps at 
 https://cwiki.apache.org/BIGTOP/how-to-install-hadoop-distribution-from-bigtop.html
 to add bigtop to your debian sources list. This will make it substantially
 easier to install.
 
+Building Documentation
+
+Use the following command to build the User Manual (docs/target/accumulo_user_manual.pdf)
+and the configuration HTML page (docs/target/config.html)
+
+  mvn package -P docs -DskipTests
+
 ******************************************************************************
 2. Deployment
 
@@ -49,6 +62,39 @@ tar xzf accumulo-1.6.0-bin.tar.gz).
 If you are using the RPM, install the RPM on every machine that will run
 accumulo.
 
+Another option is to package Accumulo directly to a working directory. For example,
+
+  mvn package -DskipTests -DDEV_ACCUMULO_HOME=/var/tmp
+
+The above command would create a directory with a name similar to
+/var/tmp/accumulo-1.6.0-dev/accumulo-1.6.0/, containing all the contents
+that are normally contained in accumulo-1.6.0-bin.tar.gz, but already unpacked.
+If the DEV_ACCUMULO_HOME parameter is not specified, this directory would
+normally be created in assemble/target, but that is subject to deletion by
+the 'mvn clean' command. Specifying an external directory would not be subject
+to 'mvn clean'. When executed more than once, newer files overwrite older files,
+and files a user adds (such as configuration files in conf/) will be left alone.
+
+If HDFS and Zookeeper are running, you can run Accumulo directly from this
+working directory. See the 'Running Apache Accumulo' section later in this document.
+
+You can avoid specifying the working directory each time you compile by adding
+a profile to maven's settings.xml file. Below is an example of $HOME/.m2/settings.xml
+
+ <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+   <profiles>
+     <profile>
+       <id>inject-accumulo-home</id>
+       <properties>
+         <DEV_ACCUMULO_HOME>/var/tmp</DEV_ACCUMULO_HOME>
+       </properties>
+     </profile>
+   </profiles>
+   <activeProfiles>
+     <activeProfile>inject-accumulo-home</activeProfile>
+   </activeProfiles>
+ </settings>
+
 ******************************************************************************
 3. Upgrading from 1.4 to 1.5
 
@@ -64,10 +110,10 @@ accumulo.
 4. Configuring
 
 Apache 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 too low.  Add the following to the 
-$ZOOKEEPER_HOME/conf/zoo.cfg file:
+at least version 3.3.0. Both of these must be installed and configured. Some
+versions of Zookeeper may only allow 10 connections from one computer by default.
+On a single-host install, this number is a little too low. Add the following to
+the $ZOOKEEPER_HOME/conf/zoo.cfg file:
 
    maxClientCnxns=100
 

Propchange: accumulo/branches/ACCUMULO-118/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/assemble:r1489581-1489975

Modified: accumulo/branches/ACCUMULO-118/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/assemble/pom.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/assemble/pom.xml (original)
+++ accumulo/branches/ACCUMULO-118/assemble/pom.xml Wed Jun  5 17:36:20 2013
@@ -636,50 +636,14 @@
     </profile>
     <profile>
       <id>docs</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-pdf-manuals</id>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <phase>prepare-package</phase>
-                <configuration>
-                  <outputDirectory>../docs</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>${project.build.directory}</directory>
-                      <includes>
-                        <include>*.pdf</include>
-                      </includes>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>latex-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>build-pdf-manuals</id>
-                <goals>
-                  <goal>latex</goal>
-                </goals>
-                <phase>compile</phase>
-                <configuration>
-                  <docsRoot>../docs/src/main/latex</docsRoot>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.accumulo</groupId>
+          <artifactId>accumulo-docs</artifactId>
+          <classifier>user-manual</classifier>
+          <type>pdf</type>
+        </dependency>
+      </dependencies>
     </profile>
   </profiles>
 </project>

Added: accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml (added)
+++ accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,221 @@
+<?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.
+-->
+<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <useStrictFiltering>true</useStrictFiltering>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>${groupId}:${artifactId}-*</include>
+        <include>org.apache.commons:commons-vfs2</include>
+        <include>com.beust:jcommander</include>
+        <include>com.google.code.gson:gson</include>
+        <include>com.google.guava:guava</include>
+        <include>jline:jline</include>
+        <include>org.apache.thrift:libthrift</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>../bin</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../examples/simple</directory>
+      <outputDirectory>/examples/simple</outputDirectory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>src/main/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../lib/native</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>**/*.so</include>
+        <include>**/*.jnilib</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../server/src/main/c++</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <excludes>
+        <exclude>**/*.so</exclude>
+        <exclude>**/*.jnilib</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../lib/ext</directory>
+      <outputDirectory>/lib/ext</outputDirectory>
+      <directoryMode>0755</directoryMode>
+      <excludes>
+        <exclude>*/**</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../logs</directory>
+      <outputDirectory>/logs</outputDirectory>
+      <directoryMode>0700</directoryMode>
+      <excludes>
+        <exclude>*/**</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../docs</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <excludes>
+        <exclude>src/**</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../conf</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+      <includes>
+        <include>examples/**/*.sh</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../conf</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>accumulo.policy.example</include>
+        <include>examples/**</include>
+      </includes>
+      <excludes>
+        <exclude>examples/**/*.sh</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../test</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+      <includes>
+        <include>**/*.sh</include>
+        <include>**/*.py</include>
+        <include>**/*.pl</include>
+      </includes>
+      <excludes>
+        <exclude>src/**</exclude>
+        <exclude>target/**</exclude>
+        <exclude>**/continuous-env.sh</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../test</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <excludes>
+        <exclude>**/.*/**</exclude>
+        <exclude>pom.xml</exclude>
+        <exclude>src/**</exclude>
+        <exclude>target/**</exclude>
+        <exclude>**/*.sh</exclude>
+        <exclude>**/*.py</exclude>
+        <exclude>**/*.pl</exclude>
+        <exclude>**/*.pyc</exclude>
+        <exclude>**/*.pyo</exclude>
+        <exclude>**/walkers.txt</exclude>
+        <exclude>**/ingesters.txt</exclude>
+        <exclude>**/randomwalk/conf/logger.xml</exclude>
+        <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
+        <exclude>**/randomwalk/conf/walkers</exclude>
+      </excludes>
+    </fileSet>
+    <!-- Lift generated thrift proxy code into its own directory -->
+    <fileSet>
+      <directory>../proxy/target</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <outputDirectory>proxy/thrift</outputDirectory>
+      <includes>
+        <include>gen-cpp/**</include>
+        <include>gen-py/**</include>
+        <include>gen-rb/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../proxy</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>README</include>
+        <include>proxy.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../proxy/examples</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+      <includes>
+        <include>**/*.py</include>
+        <include>**/*.rb</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../proxy/examples</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <excludes>
+        <exclude>**/*.py</exclude>
+        <exclude>**/*.rb</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../proxy/src/main/thrift</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <outputDirectory>proxy/thrift</outputDirectory>
+      <includes>
+        <include>*.thrift</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>scripts</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+    </fileSet>
+  </fileSets>
+  <files>
+    <file>
+      <source>../CHANGES</source>
+    </file>
+    <file>
+      <source>../LICENSE</source>
+    </file>
+    <file>
+      <source>../NOTICE</source>
+    </file>
+    <file>
+      <source>../README</source>
+    </file>
+  </files>
+</component>

Propchange: accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Added: accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Added: accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Added: accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Added: accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Added: accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Added: accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Added: accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/auditLog.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/auditLog.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/auditLog.xml (added)
+++ accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/auditLog.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,41 @@
+<?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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+
+    <!--  Write out Audit info to an Audit file -->
+    <appender name="Audit" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File"           value="${org.apache.accumulo.core.dir.log}/${org.apache.accumulo.core.ip.localhost.hostname}.audit"/>
+        <param name="MaxBackupIndex" value="10"/>
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS/Z} [%c{2}] %-5p: %m%n"/>
+        </layout>
+    </appender>
+    <logger name="Audit"  additivity="false">
+        <appender-ref ref="Audit" />
+        <level value="OFF"/>
+    </logger>
+
+
+
+
+
+</log4j:configuration>

Propchange: accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/auditLog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/generic_logger.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/generic_logger.xml Wed Jun  5 17:36:20 2013
@@ -61,10 +61,6 @@
      <appender-ref ref="ASYNC" />
   </logger>
 
-  <logger name="org.apache.accumulo.server.security.Auditor">
-     <level value="WARN"/> <!-- change to INFO for authorization events -->
-  </logger>
-
   <logger name="org.apache.accumulo.core.file.rfile.bcfile">
      <level value="INFO"/>
   </logger>

Propchange: accumulo/branches/ACCUMULO-118/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1489581-1489975

Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java Wed Jun  5 17:36:20 2013
@@ -197,6 +197,7 @@ public class Constants {
   public static String getRootTabletDir(final AccumuloConfiguration conf) {
     return getMetadataTableDir(conf) + ZROOT_TABLET;
   }
+
   
   /**
    * @param conf
@@ -205,4 +206,6 @@ public class Constants {
   public static String getWalDirectory(final AccumuloConfiguration conf) {
     return getBaseDir(conf) + "/wal";
   }
+
+    public static final String AUDITLOG = "Audit";
 }

Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/Translator.java Wed Jun  5 17:36:20 2013
@@ -64,6 +64,13 @@ public abstract class Translator<IT,OT> 
       return input.toThrift();
     }
   }
+
+  public static class TColumnTranslator extends Translator<TColumn,Column> {
+    @Override
+    public Column translate(TColumn input) {
+      return new Column(input);
+    }
+  }
   
   public static class ColumnTranslator extends Translator<Column,TColumn> {
     @Override

Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Wed Jun  5 17:36:20 2013
@@ -54,7 +54,6 @@ import org.apache.accumulo.core.conf.Pro
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.data.thrift.TConstraintViolationSummary;
-import org.apache.accumulo.core.security.AuditLevel;
 import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
 import org.apache.accumulo.core.trace.DistributedTrace;
 import org.apache.accumulo.core.util.BadArgumentException;
@@ -525,7 +524,7 @@ public class Shell extends ShellOptions 
   }
   
   public void execCommand(String input, boolean ignoreAuthTimeout, boolean echoPrompt) throws IOException {
-    audit.log(AuditLevel.AUDIT, getDefaultPrompt() + input);
+    audit.log(Level.INFO, getDefaultPrompt() + input);
     if (echoPrompt) {
       reader.printString(getDefaultPrompt());
       reader.printString(input);

Modified: accumulo/branches/ACCUMULO-118/core/src/test/resources/shelltest.txt
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/test/resources/shelltest.txt?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/test/resources/shelltest.txt (original)
+++ accumulo/branches/ACCUMULO-118/core/src/test/resources/shelltest.txt Wed Jun  5 17:36:20 2013
@@ -1,2 +1,16 @@
+# 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.
 exit
 foo

Added: accumulo/branches/ACCUMULO-118/docs/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/docs/pom.xml?rev=1489980&view=auto
==============================================================================
--- accumulo/branches/ACCUMULO-118/docs/pom.xml (added)
+++ accumulo/branches/ACCUMULO-118/docs/pom.xml Wed Jun  5 17:36:20 2013
@@ -0,0 +1,92 @@
+<?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.
+-->
+<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-project</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>accumulo-docs</artifactId>
+  <packaging>pom</packaging>
+  <name>Documentation</name>
+  <dependencies>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <profiles>
+    <profile>
+      <id>docs</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>config-webpage</id>
+                <goals>
+                  <goal>java</goal>
+                </goals>
+                <phase>prepare-package</phase>
+                <configuration>
+                  <mainClass>org.apache.accumulo.core.conf.DefaultConfiguration</mainClass>
+                  <classpathScope>test</classpathScope>
+                  <arguments>
+                    <argument>--generate-doc</argument>
+                    <argument>${project.build.directory}/config.html</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>latex-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>build-pdf-manuals</id>
+                <goals>
+                  <goal>latex</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

Propchange: accumulo/branches/ACCUMULO-118/docs/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/branches/ACCUMULO-118/examples/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/examples:r1489581-1489975

Propchange: accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1489581-1489975

Propchange: accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1489581-1489975

Modified: accumulo/branches/ACCUMULO-118/fate/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/fate/src/test/resources/log4j.properties?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/fate/src/test/resources/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-118/fate/src/test/resources/log4j.properties Wed Jun  5 17:36:20 2013
@@ -21,5 +21,4 @@ log4j.appender.CA.layout.ConversionPatte
 log4j.logger.org.apache.zookeeper=ERROR,CA
 log4j.logger.org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock=WARN
 log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR
-log4j.logger.org.apache.accumulo.server.security.Auditor=off
 

Modified: accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java (original)
+++ accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Wed Jun  5 17:36:20 2013
@@ -49,8 +49,8 @@ import org.apache.zookeeper.server.ZooKe
  * @since 1.5.0
  */
 public class MiniAccumuloCluster {
-
-  private static class LogWriter extends Thread {
+  
+  public static class LogWriter extends Thread {
     private BufferedReader in;
     private BufferedWriter out;
 
@@ -107,6 +107,11 @@ public class MiniAccumuloCluster {
 
   private File zooCfgFile;
 
+  public List<LogWriter> getLogWriters() {
+    return logWriters;
+  }
+
+
   private List<LogWriter> logWriters = new ArrayList<MiniAccumuloCluster.LogWriter>();
 
   private MiniAccumuloConfig config;

Modified: accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java (original)
+++ accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java Wed Jun  5 17:36:20 2013
@@ -252,7 +252,7 @@ public class MiniAccumuloConfig {
     return accumuloDir;
   }
   
-  File getLogDir() {
+  public File getLogDir() {
     return logDir;
   }
   

Modified: accumulo/branches/ACCUMULO-118/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/pom.xml?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/pom.xml (original)
+++ accumulo/branches/ACCUMULO-118/pom.xml Wed Jun  5 17:36:20 2013
@@ -210,6 +210,13 @@
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-docs</artifactId>
+        <version>${project.version}</version>
+        <classifier>user-manual</classifier>
+        <type>pdf</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-examples-simple</artifactId>
         <version>${project.version}</version>
       </dependency>

Propchange: accumulo/branches/ACCUMULO-118/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/trunk/pom.xml:r1489581-1489975

Propchange: accumulo/branches/ACCUMULO-118/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/trunk/proxy/README:r1489581-1489975

Propchange: accumulo/branches/ACCUMULO-118/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/server:r1489581-1489975

Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java Wed Jun  5 17:36:20 2013
@@ -105,11 +105,18 @@ public class Accumulo {
     }
     // Turn off messages about not being able to reach the remote logger... we protect against that.
     LogLog.setQuietMode(true);
-    
-    // Configure logging
+
+      // Configure logging
     DOMConfigurator.configureAndWatch(logConfig, 5000);
-    
-    log.info(application + " starting");
+
+    // Read the auditing config
+    String auditConfig = String.format("%s/conf/auditLog.xml", System.getenv("ACCUMULO_HOME"), application);
+
+     DOMConfigurator.configureAndWatch(auditConfig, 5000);
+
+
+
+      log.info(application + " starting");
     log.info("Instance " + config.getInstance().getInstanceID());
     int dataVersion = Accumulo.getAccumuloPersistentVersion(fs);
     log.info("Data Version " + dataVersion);

Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1489980&r1=1489979&r2=1489980&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java Wed Jun  5 17:36:20 2013
@@ -821,7 +821,7 @@ public class Master implements LiveTServ
       switch (op) {
         case CREATE: {
           String tableName = ByteBufferUtil.toString(arguments.get(0));
-          if (!security.canCreateTable(c))
+          if (!security.canCreateTable(c, tableName))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           checkNotMetadataTable(tableName, TableOperation.CREATE);
           checkTableName(tableName, TableOperation.CREATE);
@@ -840,7 +840,7 @@ public class Master implements LiveTServ
           checkNotMetadataTable(oldTableName, TableOperation.RENAME);
           checkNotMetadataTable(newTableName, TableOperation.RENAME);
           checkTableName(newTableName, TableOperation.RENAME);
-          if (!security.canRenameTable(c, tableId))
+          if (!security.canRenameTable(c, tableId, oldTableName, newTableName))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           fate.seedTransaction(opid, new TraceRepo<Master>(new RenameTable(tableId, oldTableName, newTableName)), autoCleanup);
@@ -850,10 +850,9 @@ public class Master implements LiveTServ
         case CLONE: {
           String srcTableId = ByteBufferUtil.toString(arguments.get(0));
           String tableName = ByteBufferUtil.toString(arguments.get(1));
-          
           checkNotMetadataTable(tableName, TableOperation.CLONE);
           checkTableName(tableName, TableOperation.CLONE);
-          if (!security.canCloneTable(c, srcTableId))
+          if (!security.canCloneTable(c, srcTableId, tableName))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           Map<String,String> propertiesToSet = new HashMap<String,String>();
@@ -893,7 +892,7 @@ public class Master implements LiveTServ
           final String tableId = checkTableId(tableName, TableOperation.ONLINE);
           checkNotMetadataTable(tableName, TableOperation.ONLINE);
           
-          if (!security.canOnlineOfflineTable(c, tableId))
+          if (!security.canOnlineOfflineTable(c, tableId, op))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, TableOperation.ONLINE)), autoCleanup);
@@ -904,7 +903,7 @@ public class Master implements LiveTServ
           final String tableId = checkTableId(tableName, TableOperation.OFFLINE);
           checkNotMetadataTable(tableName, TableOperation.OFFLINE);
           
-          if (!security.canOnlineOfflineTable(c, tableId))
+          if (!security.canOnlineOfflineTable(c, tableId, op))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           fate.seedTransaction(opid, new TraceRepo<Master>(new ChangeTableState(tableId, TableOperation.OFFLINE)), autoCleanup);
@@ -939,7 +938,7 @@ public class Master implements LiveTServ
           final String tableId = checkTableId(tableName, TableOperation.DELETE_RANGE);
           checkNotMetadataTable(tableName, TableOperation.DELETE_RANGE);
           
-          if (!security.canDeleteRange(c, tableId))
+          if (!security.canDeleteRange(c, tableId, tableName, startRow, endRow))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           fate.seedTransaction(opid, new TraceRepo<Master>(new TableRangeOp(MergeInfo.Operation.DELETE, tableId, startRow, endRow)), autoCleanup);
@@ -954,7 +953,7 @@ public class Master implements LiveTServ
           final String tableId = checkTableId(tableName, TableOperation.BULK_IMPORT);
           checkNotMetadataTable(tableName, TableOperation.BULK_IMPORT);
           
-          if (!security.canBulkImport(c, tableId))
+          if (!security.canBulkImport(c, tableId, tableName, dir, failDir))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           fate.seedTransaction(opid, new TraceRepo<Master>(new BulkImport(tableId, dir, failDir, setTime)), autoCleanup);
@@ -985,7 +984,7 @@ public class Master implements LiveTServ
           String tableName = ByteBufferUtil.toString(arguments.get(0));
           String exportDir = ByteBufferUtil.toString(arguments.get(1));
           
-          if (!security.canImport(c))
+          if (!security.canImport(c, tableName, exportDir))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           checkNotMetadataTable(tableName, TableOperation.CREATE);
@@ -1000,7 +999,7 @@ public class Master implements LiveTServ
           
           String tableId = checkTableId(tableName, TableOperation.EXPORT);
           
-          if (!security.canExport(c, tableId))
+          if (!security.canExport(c, tableId, tableName, exportDir))
             throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
           
           checkNotMetadataTable(tableName, TableOperation.EXPORT);



Mime
View raw message