You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/04/05 04:54:03 UTC
svn commit: r1464817 [2/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...
Modified: accumulo/branches/1.5/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/examples/simple/pom.xml (original)
+++ accumulo/branches/1.5/examples/simple/pom.xml Fri Apr 5 02:54:02 2013
@@ -16,21 +16,69 @@
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-examples</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
<artifactId>accumulo-examples-simple</artifactId>
<name>Simple Examples</name>
-
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../../lib</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <!-- this is just an example. Leave it out. -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../../lib</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
- <!-- profile for building against Hadoop 1.0.x
- Activate by not specifying hadoop.profile -->
<profile>
+ <!-- profile for building against Hadoop 1.0.x
+ Activate by not specifying hadoop.profile -->
<id>hadoop-1.0</id>
<activation>
<property>
@@ -41,12 +89,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>
@@ -56,69 +105,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-core</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
- </manifestEntries>
- </archive>
- <includes>
- <include>org/apache/accumulo**/**</include>
- <include>**/META-INF/*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: accumulo/branches/1.5/examples/simple/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/src/test/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/examples/simple/src/test/resources/log4j.properties (original)
+++ accumulo/branches/1.5/examples/simple/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/fate/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/fate/pom.xml (original)
+++ accumulo/branches/1.5/fate/pom.xml Fri Apr 5 02:54:02 2013
@@ -16,44 +16,32 @@
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-fate</artifactId>
<name>Fate</name>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../lib</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
-
</project>
Modified: accumulo/branches/1.5/fate/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/src/test/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/fate/src/test/resources/log4j.properties (original)
+++ accumulo/branches/1.5/fate/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/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Fri Apr 5 02:54:02 2013
@@ -16,35 +16,61 @@
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</groupId>
<artifactId>apache</artifactId>
- <version>11</version>
+ <version>13</version>
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <packaging>pom</packaging>
<version>1.5.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<name>Apache Accumulo</name>
- <prerequisites>
- <maven>2.2.0</maven>
- </prerequisites>
-
+ <description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
+ <!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site -->
+ <url>http://accumulo.apache.org/maven-site/</url>
<organization>
<name>Apache Accumulo Project</name>
<url>http://accumulo.apache.org/</url>
</organization>
-
- <distributionManagement>
- <site>
- <id>accumulo.mvn.website</id>
- <name>Accumulo Maven Site</name>
- <url>scp://people.apache.org/x1/home/bimargulies/public_html/accumulo-site-stage</url>
- </site>
- </distributionManagement>
-
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <mailingLists>
+ <mailingList>
+ <name>User</name>
+ <subscribe>user-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>user@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Dev</name>
+ <subscribe>dev-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>dev@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits</name>
+ <subscribe>commits-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-commits</archive>
+ </mailingList>
+ <mailingList>
+ <name>Notifications</name>
+ <subscribe>notifications-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>notifications-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-notifications</archive>
+ </mailingList>
+ </mailingLists>
+ <prerequisites>
+ <maven>${maven.min-version}</maven>
+ </prerequisites>
<modules>
<module>trace</module>
<module>core</module>
@@ -56,206 +82,344 @@
<module>proxy</module>
<module>test</module>
</modules>
-
- <build>
- <extensions>
- <!-- enable ssh deployment of site with maven 3 -->
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/branches/1.5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/accumulo/branches/1.5</developerConnection>
+ <url>http://svn.apache.org/viewvc/accumulo/branches/1.5</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Apache Jenkins</system>
+ <url>https://builds.apache.org/view/A-F/view/Accumulo/</url>
+ </ciManagement>
+ <distributionManagement>
+ <site>
+ <id>accumulo.mvn.website</id>
+ <name>Accumulo Maven Site</name>
+ <!-- this is not likely to be what we really want, but it's good enough for a test -->
+ <url>scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <maven.min-version>3.0.3</maven.min-version>
+ <powermock.version>1.5</powermock.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <sealJars>false</sealJars>
+ <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures 3.3.x compatibility. -->
+ <zookeeper.version>3.3.6</zookeeper.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>1.30</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-fam</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
<version>2.2</version>
- </extension>
- </extensions>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-mvn</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.2.0,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileset>
- <fileset>
- <directory>docs/apidocs</directory>
- </fileset>
- <fileset>
- <directory>test</directory>
- <includes>
- <include>**/*.so</include>
- </includes>
- </fileset>
- <fileset>
- <directory>./</directory>
- <includes>
- <include>**/*.pyc</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>../lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-logging,commons-logging-api,commons-vfs2,gson,jcommander,guava</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <quiet>true</quiet>
- <jarOutputDirectory>lib</jarOutputDirectory>
- <reportOutputDirectory>docs</reportOutputDirectory>
- <javadocVersion>1.6</javadocVersion>
- <additionalJOption>-J-Xmx512m</additionalJOption>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <attach>true</attach>
- <outputDirectory>../lib</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar-no-fork</goal>
- <goal>test-jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
-
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>[6.1,7.0)</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <version>2.1.0</version>
<configuration>
- <formats>
- <format>xml</format>
- <format>html</format>
- </formats>
+ <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <lineSeparator>\n</lineSeparator>
+ <nrOfIndentSpace>2</nrOfIndentSpace>
+ <sortDependencies>scope,groupId,artifactId</sortDependencies>
+ <sortProperties>true</sortProperties>
+ <verifyFail>Stop</verifyFail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>docs/apidocs</directory>
+ </fileset>
+ <fileset>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.so</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- should be in the Apache parent, but isn't -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
<manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Branch>${scmBranch}</Implementation-Branch>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ <Sealed>${sealJars}</Sealed>
</manifestEntries>
</archive>
+ <outputDirectory>../lib</outputDirectory>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <quiet>true</quiet>
+ <jarOutputDirectory>lib</jarOutputDirectory>
+ <reportOutputDirectory>docs</reportOutputDirectory>
+ <javadocVersion>1.6</javadocVersion>
+ <additionalJOption>-J-Xmx512m</additionalJOption>
+ </configuration>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <formats>
+ <format>xml</format>
+ <format>html</format>
+ </formats>
+ <instrumentation>
+ <excludes>
+ <exclude>**/thrift/*.class</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -263,9 +427,9 @@
<version>1.2.1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-2</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -284,7 +448,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -297,20 +461,20 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <versionRange>[1.1.1,)</versionRange>
+ <versionRange>[1.0,)</versionRange>
<goals>
<goal>exec</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -323,82 +487,143 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <versionRange>[2.1.0,)</versionRange>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.2</version>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
- </build>
-
- <reporting>
<plugins>
<plugin>
+ <!-- verify only; 'mvn clean -P sortpom' sorts -->
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>verify-sorted-pom</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <onlyCurrentVersion>true</onlyCurrentVersion>
- <statusIds>closed,resolved</statusIds>
- <maxEntries>10000</maxEntries>
- <useJql>true</useJql>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
+ <!-- just grab the non-provided runtime dependencies -->
+ <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-logging,commons-logging-api,commons-vfs2,gson,jcommander,guava</includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.0</version>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-mvn</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[${maven.min-version},)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ <phase>site-deploy</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
<configuration>
- <format>html</format>
- <includeTests>true</includeTests>
- <targetJdk>1.6</targetJdk>
+ <attach>true</attach>
+ <outputDirectory>../lib</outputDirectory>
</configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ <goal>test-jar-no-fork</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <!-- enable ssh deployment of site with maven 3 -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.4</version>
+ </extension>
+ </extensions>
+ </build>
+ <reporting>
+ <plugins>
+ <!--
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
<configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
- <xmlOutput>true</xmlOutput>
- <effort>Max</effort>
- <threshold>Medium</threshold>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <statusIds>resolved</statusIds>
+ <maxEntries>10000</maxEntries>
+ <useJql>true</useJql>
</configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -413,6 +638,21 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <format>html</format>
+ <includeTests>true</includeTests>
+ <targetJdk>1.6</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.6</version>
<configuration>
@@ -430,58 +670,71 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+ <xmlOutput>true</xmlOutput>
+ <effort>Max</effort>
+ <threshold>Medium</threshold>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
-
-
<profiles>
<profile>
- <id>release</id>
+ <!-- 'mvn clean -P sortpom' sorts -->
+ <id>sortpom</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sort-pom</id>
+ <goals>
+ <goal>sort</goal>
+ </goals>
+ <phase>clean</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- Automatically check for licenses.
+ Deactivate with -DskipLicenseCheck -->
+ <id>check-licenses</id>
+ <activation>
+ <property>
+ <name>!skipLicenseCheck</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.9-SNAPSHOT</version>
- <inherited>false</inherited>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/flot/**.js</exclude>
- <exclude>CHANGES</exclude>
- <exclude>**/*.rf</exclude>
- <exclude>conf/slaves*</exclude>
- <exclude>conf/masters*</exclude>
- <exclude>conf/monitor*</exclude>
- <exclude>conf/tracers*</exclude>
- <exclude>conf/gc*</exclude>
- <exclude>logs/*</exclude>
- <exclude>walogs/*</exclude>
- <exclude>contrib/accumulo_sample/*/src/test/resources/enwiki-20110901-001.xml</exclude>
- <exclude>**/MANIFEST.MF</exclude>
- <exclude>**/__init__.py</exclude>
- <exclude>test/system/bench/lib/*splits</exclude>
- <exclude>test/system/continuous/*.txt.example</exclude>
- <exclude>test/system/randomwalk/conf/walkers.example</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
+ <!-- Generate cobertura reports with site.
+ Activate with -P cobertura -->
<id>cobertura</id>
<reporting>
<plugins>
@@ -499,9 +752,9 @@
</plugins>
</reporting>
</profile>
- <!-- profile for building against Hadoop 1.0.x
- Activate by not specifying hadoop.profile -->
<profile>
+ <!-- profile for building against Hadoop 1.0.x
+ Activate by not specifying hadoop.profile -->
<id>hadoop-1.0</id>
<activation>
<property>
@@ -510,7 +763,7 @@
</activation>
<properties>
<hadoop.version>1.0.4</hadoop.version>
- <slf4j.version>1.4.3</slf4j.version>
+ <slf4j.version>1.5.8</slf4j.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -518,20 +771,23 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-tools</artifactId>
<version>${hadoop.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
</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>
@@ -540,246 +796,68 @@
</property>
</activation>
<properties>
- <slf4j.version>1.6.1</slf4j.version>
- <hadoop.version>2.0.2-alpha</hadoop.version>
<avro.version>1.5.3</avro.version>
+ <hadoop.version>2.0.3-alpha</hadoop.version>
<httpclient.version>3.1</httpclient.version>
+ <slf4j.version>1.6.1</slf4j.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
<version>${hadoop.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>${avro.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${httpclient.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
+ <profile>
+ <id>release</id>
+ <properties>
+ <sealJars>true</sealJars>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
-
- <dependencyManagement>
- <dependencies>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
- <!-- provided dependencies needed at runtime -->
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>[6.1,7.0)</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- accumulo dependency jars that we will provide -->
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-server</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-test</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-proxy</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-examples-simple</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
-
- <!-- additional dependencies we need to provide -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>6.1.14</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.0</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-core</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-fam</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- <version>1.30</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.2.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- dependencies inherited by all sub-modules -->
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/accumulo/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/accumulo</url>
- </scm>
-
- <ciManagement>
- <url>https://builds.apache.org/view/A-F/view/Accumulo/</url>
- <system>Apache Jenkins</system>
- </ciManagement>
- <!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site -->
- <url>http://accumulo.apache.org/maven/</url>
-
- <description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
- </issueManagement>
-
- <properties>
- <targetJdk>1.6</targetJdk>
- <zookeeper.version>3.3.1</zookeeper.version>
- </properties>
-
</project>
Modified: accumulo/branches/1.5/proxy/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/pom.xml (original)
+++ accumulo/branches/1.5/proxy/pom.xml Fri Apr 5 02:54:02 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -15,101 +15,91 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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-proxy</artifactId>
<name>Proxy</name>
- <url>http://maven.apache.org</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <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>
- </plugins>
- </build>
<dependencies>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- <scope>compile</scope>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <scope>compile</scope>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <scope>compile</scope>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>13.0.1</version>
- <scope>compile</scope>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <scope>compile</scope>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
</dependency>
<dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-examples-simple</artifactId>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-test</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</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>
@@ -120,12 +110,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>
@@ -135,12 +126,19 @@
</activation>
<dependencies>
<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.avro</groupId>
- <artifactId>avro</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
Modified: accumulo/branches/1.5/proxy/proxy.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/proxy.properties?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/proxy.properties (original)
+++ accumulo/branches/1.5/proxy/proxy.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.
+
org.apache.accumulo.proxy.ProxyServer.useMockInstance=false
org.apache.accumulo.proxy.ProxyServer.useMiniAccumulo=true
org.apache.accumulo.proxy.ProxyServer.protocolFactory=org.apache.thrift.protocol.TCompactProtocol$Factory
Modified: accumulo/branches/1.5/proxy/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/test/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/src/test/resources/log4j.properties (original)
+++ accumulo/branches/1.5/proxy/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/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/server/pom.xml (original)
+++ accumulo/branches/1.5/server/pom.xml Fri Apr 5 02:54:02 2013
@@ -1,120 +1,122 @@
<?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">
+<!--
+ 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</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
<artifactId>accumulo-server</artifactId>
<name>Server</name>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../lib</outputDirectory>
- <archive>
- <manifestSections>
- <manifestSection>
- <name>accumulo/server/</name>
- <manifestEntries>
- <Sealed>true</Sealed>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
<dependencies>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/web/flot/**/*.js</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
<profile>
<id>dist</id>
@@ -126,10 +128,10 @@
<executions>
<execution>
<id>generate-native-in-memory-map</id>
- <phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
+ <phase>package</phase>
<configuration>
<executable>make</executable>
<workingDirectory>${basedir}/src/main/c++</workingDirectory>
@@ -140,9 +142,9 @@
</plugins>
</build>
</profile>
- <!-- profile for building against Hadoop 1.0.x
- Activate by not specifying hadoop.profile -->
<profile>
+ <!-- profile for building against Hadoop 1.0.x
+ Activate by not specifying hadoop.profile -->
<id>hadoop-1.0</id>
<activation>
<property>
@@ -153,12 +155,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>
@@ -168,15 +171,31 @@
</activation>
<dependencies>
<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.avro</groupId>
- <artifactId>avro</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
-
</project>
Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java Fri Apr 5 02:54:02 2013
@@ -18,8 +18,8 @@ package org.apache.accumulo.server.monit
import java.util.Date;
import java.util.Map;
-import java.util.Properties;
import java.util.Map.Entry;
+import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
@@ -66,20 +66,24 @@ abstract class Basic extends BasicServle
return TraceFormatter.formatDate(new Date(millis));
}
- @SuppressWarnings("deprecation")
protected Scanner getScanner(StringBuilder sb) throws AccumuloException, AccumuloSecurityException {
AccumuloConfiguration conf = Monitor.getSystemConfiguration();
String principal = conf.get(Property.TRACE_PRINCIPAL);
- if (principal == null)
- principal = conf.get(Property.TRACE_USER);
+ if (principal == null) {
+ @SuppressWarnings("deprecation")
+ Property p = Property.TRACE_USER;
+ principal = conf.get(p);
+ }
AuthenticationToken at;
- Map<String, String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_LOGIN_PROPERTIES);
- if (loginMap.isEmpty())
- at = new PasswordToken(conf.get(Property.TRACE_PASSWORD).getBytes());
- else{
+ Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_LOGIN_PROPERTIES);
+ if (loginMap.isEmpty()) {
+ @SuppressWarnings("deprecation")
+ Property p = Property.TRACE_PASSWORD;
+ at = new PasswordToken(conf.get(p).getBytes());
+ } else {
Properties props = new Properties();
- int prefixLength = Property.TRACE_LOGIN_PROPERTIES.getKey().length()+1;
- for (Entry<String, String> entry : loginMap.entrySet()) {
+ int prefixLength = Property.TRACE_LOGIN_PROPERTIES.getKey().length() + 1;
+ for (Entry<String,String> entry : loginMap.entrySet()) {
props.put(entry.getKey().substring(prefixLength), entry.getValue());
}
if (!props.containsKey("principal"))
Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java Fri Apr 5 02:54:02 2013
@@ -20,14 +20,10 @@ import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.nio.channels.ServerSocketChannel;
import java.util.Map;
-import java.util.Properties;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.accumulo.trace.thrift.SpanReceiver.Iface;
-import org.apache.accumulo.trace.thrift.SpanReceiver.Processor;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -53,6 +49,10 @@ import org.apache.accumulo.server.client
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.trace.instrument.Span;
+import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.accumulo.trace.thrift.SpanReceiver.Iface;
+import org.apache.accumulo.trace.thrift.SpanReceiver.Processor;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
@@ -70,7 +70,6 @@ import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.Watcher.Event.KeeperState;
-
public class TraceServer implements Watcher {
final private static Logger log = Logger.getLogger(TraceServer.class);
@@ -79,7 +78,7 @@ public class TraceServer implements Watc
private BatchWriter writer = null;
private Connector connector;
final String table;
-
+
private static void put(Mutation m, String cf, String cq, byte[] bytes, int len) {
m.put(new Text(cf), new Text(cq), new Value(bytes, 0, len));
}
@@ -155,7 +154,6 @@ public class TraceServer implements Watc
}
- @SuppressWarnings("deprecation")
public TraceServer(ServerConfiguration serverConfiguration, String hostname) throws Exception {
this.serverConfiguration = serverConfiguration;
AccumuloConfiguration conf = serverConfiguration.getConfiguration();
@@ -163,16 +161,21 @@ public class TraceServer implements Watc
while (true) {
try {
String principal = conf.get(Property.TRACE_PRINCIPAL);
- if (principal == null)
- principal = conf.get(Property.TRACE_USER);
+ if (principal == null) {
+ @SuppressWarnings("deprecation")
+ Property p = Property.TRACE_USER;
+ principal = conf.get(p);
+ }
AuthenticationToken at;
- Map<String, String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_LOGIN_PROPERTIES);
- if (loginMap == null)
- at = new PasswordToken(conf.get(Property.TRACE_PASSWORD).getBytes());
- else{
+ Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_LOGIN_PROPERTIES);
+ if (loginMap == null) {
+ @SuppressWarnings("deprecation")
+ Property p = Property.TRACE_PASSWORD;
+ at = new PasswordToken(conf.get(p).getBytes());
+ } else {
Properties props = new Properties();
- int prefixLength = Property.TRACE_LOGIN_PROPERTIES.getKey().length()+1;
- for (Entry<String, String> entry : loginMap.entrySet()) {
+ int prefixLength = Property.TRACE_LOGIN_PROPERTIES.getKey().length() + 1;
+ for (Entry<String,String> entry : loginMap.entrySet()) {
props.put(entry.getKey().substring(prefixLength), entry.getValue());
}
at = serverConfiguration.getInstance().getAuthenticator().login(principal, props);
Modified: accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java (original)
+++ accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java Fri Apr 5 02:54:02 2013
@@ -297,18 +297,18 @@ public class InMemoryMapTest extends Tes
}
private static final Logger log = Logger.getLogger(InMemoryMapTest.class);
-
+
static long sum(long[] counts) {
long result = 0;
- for (int i = 0; i < counts.length; i++)
- result += counts[i];
+ for (int i = 0; i < counts.length; i++)
+ result += counts[i];
return result;
}
// @Test - hard to get this timing test to run well on apache build machines
public void parallelWriteSpeed() throws InterruptedException {
List<Double> timings = new ArrayList<Double>();
- for (int threads: new int[]{1, 2, 16, /* 64, 256*/} ) {
+ for (int threads : new int[] {1, 2, 16, /* 64, 256 */}) {
final long now = System.currentTimeMillis();
final long counts[] = new long[threads];
final InMemoryMap imm = new InMemoryMap(false, "/tmp");
@@ -333,16 +333,16 @@ public class InMemoryMapTest extends Tes
e.shutdown();
e.awaitTermination(10, TimeUnit.SECONDS);
imm.delete(10000);
- double mutationsPerSecond = sum(counts)/((System.currentTimeMillis() - now)/1000.);
+ double mutationsPerSecond = sum(counts) / ((System.currentTimeMillis() - now) / 1000.);
timings.add(mutationsPerSecond);
log.info(String.format("%.1f mutations per second with %d threads", mutationsPerSecond, threads));
}
// verify that more threads doesn't go a lot faster, or a lot slower than one thread
for (int i = 0; i < timings.size(); i++) {
- double ratioFirst = timings.get(0) / timings.get(i);
+ double ratioFirst = timings.get(0) / timings.get(i);
assertTrue(ratioFirst < 3);
assertTrue(ratioFirst > 0.3);
}
}
-
+
}
Modified: accumulo/branches/1.5/server/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/test/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/test/resources/log4j.properties (original)
+++ accumulo/branches/1.5/server/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