accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1190592 [1/2] - in /incubator/accumulo: branches/1.3/ branches/1.3/src/core/ branches/1.3/src/examples/ branches/1.3/src/server/ branches/1.3/src/start/ branches/1.3/src/trace/ trunk/ trunk/contrib/accumulo_sample/ trunk/contrib/accumulo_s...
Date Fri, 28 Oct 2011 21:33:00 GMT
Author: billie
Date: Fri Oct 28 21:32:55 2011
New Revision: 1190592

URL: http://svn.apache.org/viewvc?rev=1190592&view=rev
Log:
ACCUMULO-41 formatted xml files with 2 space indents

Modified:
    incubator/accumulo/branches/1.3/pom.xml
    incubator/accumulo/branches/1.3/src/core/pom.xml
    incubator/accumulo/branches/1.3/src/examples/pom.xml
    incubator/accumulo/branches/1.3/src/server/pom.xml
    incubator/accumulo/branches/1.3/src/start/pom.xml
    incubator/accumulo/branches/1.3/src/trace/pom.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/ingest/conf/wikipedia.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/query-war/pom.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/jboss-web.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/web.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/query/src/assembly/dist.xml
    incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/resources/META-INF/ejb-jar.xml
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/src/core/pom.xml
    incubator/accumulo/trunk/src/examples/pom.xml
    incubator/accumulo/trunk/src/server/pom.xml
    incubator/accumulo/trunk/src/start/pom.xml
    incubator/accumulo/trunk/src/trace/pom.xml

Modified: incubator/accumulo/branches/1.3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/pom.xml (original)
+++ incubator/accumulo/branches/1.3/pom.xml Fri Oct 28 21:32:55 2011
@@ -16,601 +16,601 @@
   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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.accumulo</groupId>
-	<artifactId>accumulo</artifactId>
-	<packaging>pom</packaging>
-	<version>1.3.5-incubating-SNAPSHOT</version>
-	<name>accumulo</name>
-
-	<modules>
-		<module>src/trace</module>
-		<module>src/core</module>
-		<module>src/server</module>
-		<module>src/start</module>
-		<module>src/examples</module>
-	</modules>
-
-	<build>
-		<defaultGoal>package</defaultGoal>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.0-beta-1</version>
-				<executions>
-					<execution>
-						<id>enforce-mvn</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireMavenVersion>
-									<version>[2.0.9,)</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-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
-							<excludeGroupIds>org.apache.accumulo</excludeGroupIds>
-							<excludeTransitive>true</excludeTransitive>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<outputDirectory>../../lib</outputDirectory>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-Build>${buildNumber}</Implementation-Build>
-							<Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
-						</manifestEntries>
-					</archive>
-					<includes>
-						<include>cloudtrace/**</include>
-						<include>org/apache/accumulo**/**</include>
-						<include>web/**</include>
-						<include>randomwalk/**</include>
-						<include>*.*</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assemble/dist.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<optimize>true</optimize>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</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>
-				<configuration>
-					<environmentVariables>
-						<ACCUMULO_HOME>../..</ACCUMULO_HOME>
-					</environmentVariables>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>rpm-maven-plugin</artifactId>
-				<version>2.0-beta-2</version>
-				<inherited>false</inherited>
-				<configuration>
-					<name>accumulo</name>
-					<projversion>${project.version}</projversion>
-					<summary>Accumulo BigTable clone</summary>
-					<description>
-						Accumulo is a large distributed structured store based
-						on Google's
-						BigTable design.
-					</description>
-					<copyright>FIXME</copyright>
-					<url>http://incubator.apache.org/accumulo</url>
-					<group>Utilities</group>
-					<requires>
-						<require>jdk</require>
-						<require>hadoop</require>
-						<require>zookeeper</require>
-					</requires>
-					<prefix>/opt/accumulo</prefix>
-					<defaultDirmode>755</defaultDirmode>
-					<defaultFilemode>644</defaultFilemode>
-					<defaultUsername>root</defaultUsername>
-					<defaultGroupname>root</defaultGroupname>
-					<mappings>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}</directory>
-							<sources>
-								<source>
-									<location>README</location>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
-							<sources>
-								<source>
-									<location>docs</location>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/test</directory>
-							<sources>
-								<source>
-									<location>test</location>
-									<excludes>
-										<exclude>**/walkers.txt</exclude>
-										<exclude>**/ingesters.txt</exclude>
-										<exclude>**/continuous-env.sh</exclude>
-										<exclude>**/*.pyc</exclude>
-									</excludes>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-							<directoryIncluded>false</directoryIncluded>
-							<filemode>755</filemode>
-							<username>root</username>
-							<groupname>root</groupname>
-							<sources>
-								<source>
-									<location>bin</location>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
-							<sources>
-								<source>
-									<location>conf</location>
-									<excludes>
-										<exclude>**/accumulo-site.xml</exclude>
-										<exclude>**/accumulo-env.sh</exclude>
-										<exclude>**/accumulo-metrics.xml</exclude>
-										<exclude>**/test-*</exclude>
-										<exclude>**/slaves</exclude>
-										<exclude>**/masters</exclude>
-										<exclude>**/tracers</exclude>
-										<exclude>**/gc</exclude>
-										<exclude>**/monitor</exclude>
-									</excludes>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
-							<dependency />
-							<sources>
-								<source>
-									<location>lib</location>
-								</source>
-							</sources>
-						</mapping>
-					</mappings>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<inherited>false</inherited>
-				<version>1.2</version>
-				<configuration>
-					<executable>/bin/bash</executable>
-					<arguments>
-						<argument>docs/src/user_manual/build.sh</argument>
-					</arguments>
-				</configuration>
-				<executions>
-					<execution>
-						<id>user-manual</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[2.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.codehaus.mojo</groupId>
-										<artifactId>exec-maven-plugin</artifactId>
-										<versionRange>[1.1.1,)</versionRange>
-										<goals>
-											<goal>exec</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<format>html</format>
-					<includeTests>true</includeTests>
-					<targetJdk>1.6</targetJdk>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.3</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>2.0.1</version>
-				<configuration>
-					<effort>Max</effort>
-					<threshold>Medium</threshold>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<profiles>
-		<profile>
-			<id>distclean</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clean-plugin</artifactId>
-						<configuration>
-							<filesets>
-								<fileset>
-									<directory>conf</directory>
-									<includes>
-										<include>gc</include>
-										<include>monitor</include>
-										<include>slaves</include>
-										<include>masters</include>
-										<include>accumulo-site.xml</include>
-										<include>accumulo-env.sh</include>
-										<include>accumulo-metrics.xml</include>
-										<include>test-*</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>docs/apidocs</directory>
-								</fileset>
-								<fileset>
-									<directory>logs</directory>
-								</fileset>
-								<fileset>
-									<directory>walogs</directory>
-								</fileset>
-								<fileset>
-									<directory>lib</directory>
-									<includes>
-										<include>*.jar</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>test</directory>
-									<includes>
-										<include>**/*.so</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>./</directory>
-									<includes>
-										<include>**/*.pyc</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>test/system/continuous</directory>
-									<includes>
-										<include>walkers.txt</include>
-										<include>ingesters.txt</include>
-										<include>continuous-env.sh</include>
-									</includes>
-								</fileset>
-							</filesets>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-	<dependencyManagement>
-		<dependencies>
-			<!-- test dependencies -->
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.4</version>
-				<scope>test</scope>
-			</dependency>
-
-			<!-- provided dependencies needed at runtime -->
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>hadoop-core</artifactId>
-				<version>0.20.2</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>zookeeper</artifactId>
-				<version>3.3.1</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.26</version>
-				<scope>provided</scope>
-			</dependency>
-
-			<!-- accumulo dependency jars that we will provide -->
-			<dependency>
-				<groupId>org.apache.accumulo</groupId>
-				<artifactId>cloudtrace</artifactId>
-				<version>1.3.5-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.accumulo</groupId>
-				<artifactId>accumulo-start</artifactId>
-				<version>1.3.5-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.accumulo</groupId>
-				<artifactId>accumulo-core</artifactId>
-				<version>1.3.5-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.accumulo</groupId>
-				<artifactId>accumulo-server</artifactId>
-				<version>1.3.5-incubating-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>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-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>3.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.thrift</groupId>
-				<artifactId>libthrift</artifactId>
-				<version>0.3</version>
-				<scope>system</scope>
-				<systemPath>${basedir}/${project.parent.relativePath}/contrib/libthrift-0.3.jar</systemPath>
-			</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-net</groupId>
-				<artifactId>commons-net</artifactId>
-				<version>1.4.1</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>1.4.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.4.3</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>
-		</dependencies>
-	</dependencyManagement>
-
-	<!-- dependencies inherited by all sub-modules -->
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-	</dependencies>
-
-	<distributionManagement>
-		<repository>
-			<id>accumulo-releases-repo</id>
-			<url>http://incubator.apache.org/accumulo</url>
-		</repository>
-		<snapshotRepository>
-			<id>accumulo-snapshots-repo</id>
-			<url>http://incubator.apache.org/accumulo</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<scm>
-		<connection>https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.3</connection>
-		<developerConnection>https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.3</developerConnection>
-		<url>https://svn.apache.org/repos/asf/incubator/accumulo/</url>
-	</scm>
-
-	<url>http://incubator.apache.org/accumulo/</url>
-	<description>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>
-		<url>https://issues.apache.org/jira/browse/ACCUMULO</url>
-		<system>Apache's JIRA issue tracker</system>
-	</issueManagement>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.accumulo</groupId>
+  <artifactId>accumulo</artifactId>
+  <packaging>pom</packaging>
+  <version>1.3.5-incubating-SNAPSHOT</version>
+  <name>accumulo</name>
+
+  <modules>
+    <module>src/trace</module>
+    <module>src/core</module>
+    <module>src/server</module>
+    <module>src/start</module>
+    <module>src/examples</module>
+  </modules>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>enforce-mvn</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[2.0.9,)</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-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
+              <excludeGroupIds>org.apache.accumulo</excludeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <outputDirectory>../../lib</outputDirectory>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Implementation-Build>${buildNumber}</Implementation-Build>
+              <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+            </manifestEntries>
+          </archive>
+          <includes>
+            <include>cloudtrace/**</include>
+            <include>org/apache/accumulo**/**</include>
+            <include>web/**</include>
+            <include>randomwalk/**</include>
+            <include>*.*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assemble/dist.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <optimize>true</optimize>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</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>
+        <configuration>
+          <environmentVariables>
+            <ACCUMULO_HOME>../..</ACCUMULO_HOME>
+          </environmentVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rpm-maven-plugin</artifactId>
+        <version>2.0-beta-2</version>
+        <inherited>false</inherited>
+        <configuration>
+          <name>accumulo</name>
+          <projversion>${project.version}</projversion>
+          <summary>Accumulo BigTable clone</summary>
+          <description>
+            Accumulo is a large distributed structured store based
+            on Google's
+            BigTable design.
+          </description>
+          <copyright>FIXME</copyright>
+          <url>http://incubator.apache.org/accumulo</url>
+          <group>Utilities</group>
+          <requires>
+            <require>jdk</require>
+            <require>hadoop</require>
+            <require>zookeeper</require>
+          </requires>
+          <prefix>/opt/accumulo</prefix>
+          <defaultDirmode>755</defaultDirmode>
+          <defaultFilemode>644</defaultFilemode>
+          <defaultUsername>root</defaultUsername>
+          <defaultGroupname>root</defaultGroupname>
+          <mappings>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}</directory>
+              <sources>
+                <source>
+                  <location>README</location>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
+              <sources>
+                <source>
+                  <location>docs</location>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
+              <sources>
+                <source>
+                  <location>test</location>
+                  <excludes>
+                    <exclude>**/walkers.txt</exclude>
+                    <exclude>**/ingesters.txt</exclude>
+                    <exclude>**/continuous-env.sh</exclude>
+                    <exclude>**/*.pyc</exclude>
+                  </excludes>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+              <directoryIncluded>false</directoryIncluded>
+              <filemode>755</filemode>
+              <username>root</username>
+              <groupname>root</groupname>
+              <sources>
+                <source>
+                  <location>bin</location>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+              <sources>
+                <source>
+                  <location>conf</location>
+                  <excludes>
+                    <exclude>**/accumulo-site.xml</exclude>
+                    <exclude>**/accumulo-env.sh</exclude>
+                    <exclude>**/accumulo-metrics.xml</exclude>
+                    <exclude>**/test-*</exclude>
+                    <exclude>**/slaves</exclude>
+                    <exclude>**/masters</exclude>
+                    <exclude>**/tracers</exclude>
+                    <exclude>**/gc</exclude>
+                    <exclude>**/monitor</exclude>
+                  </excludes>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+              <dependency/>
+              <sources>
+                <source>
+                  <location>lib</location>
+                </source>
+              </sources>
+            </mapping>
+          </mappings>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <inherited>false</inherited>
+        <version>1.2</version>
+        <configuration>
+          <executable>/bin/bash</executable>
+          <arguments>
+            <argument>docs/src/user_manual/build.sh</argument>
+          </arguments>
+        </configuration>
+        <executions>
+          <execution>
+            <id>user-manual</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[2.0,)</versionRange>
+                    <goals>
+                      <goal>copy-dependencies</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <versionRange>[1.1.1,)</versionRange>
+                    <goals>
+                      <goal>exec</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <format>html</format>
+          <includeTests>true</includeTests>
+          <targetJdk>1.6</targetJdk>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.3</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.0.1</version>
+        <configuration>
+          <effort>Max</effort>
+          <threshold>Medium</threshold>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>distclean</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-clean-plugin</artifactId>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>conf</directory>
+                  <includes>
+                    <include>gc</include>
+                    <include>monitor</include>
+                    <include>slaves</include>
+                    <include>masters</include>
+                    <include>accumulo-site.xml</include>
+                    <include>accumulo-env.sh</include>
+                    <include>accumulo-metrics.xml</include>
+                    <include>test-*</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>docs/apidocs</directory>
+                </fileset>
+                <fileset>
+                  <directory>logs</directory>
+                </fileset>
+                <fileset>
+                  <directory>walogs</directory>
+                </fileset>
+                <fileset>
+                  <directory>lib</directory>
+                  <includes>
+                    <include>*.jar</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>test</directory>
+                  <includes>
+                    <include>**/*.so</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>./</directory>
+                  <includes>
+                    <include>**/*.pyc</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>test/system/continuous</directory>
+                  <includes>
+                    <include>walkers.txt</include>
+                    <include>ingesters.txt</include>
+                    <include>continuous-env.sh</include>
+                  </includes>
+                </fileset>
+              </filesets>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- test dependencies -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.4</version>
+        <scope>test</scope>
+      </dependency>
+
+      <!-- provided dependencies needed at runtime -->
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-core</artifactId>
+        <version>0.20.2</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>3.3.1</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.26</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <!-- accumulo dependency jars that we will provide -->
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>cloudtrace</artifactId>
+        <version>1.3.5-incubating-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-start</artifactId>
+        <version>1.3.5-incubating-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-core</artifactId>
+        <version>1.3.5-incubating-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-server</artifactId>
+        <version>1.3.5-incubating-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>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-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.thrift</groupId>
+        <artifactId>libthrift</artifactId>
+        <version>0.3</version>
+        <scope>system</scope>
+        <systemPath>${basedir}/${project.parent.relativePath}/contrib/libthrift-0.3.jar</systemPath>
+      </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-net</groupId>
+        <artifactId>commons-net</artifactId>
+        <version>1.4.1</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>1.4.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.4.3</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>
+    </dependencies>
+  </dependencyManagement>
+
+  <!-- dependencies inherited by all sub-modules -->
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
+
+  <distributionManagement>
+    <repository>
+      <id>accumulo-releases-repo</id>
+      <url>http://incubator.apache.org/accumulo</url>
+    </repository>
+    <snapshotRepository>
+      <id>accumulo-snapshots-repo</id>
+      <url>http://incubator.apache.org/accumulo</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <scm>
+    <connection>https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.3</connection>
+    <developerConnection>https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.3</developerConnection>
+    <url>https://svn.apache.org/repos/asf/incubator/accumulo/</url>
+  </scm>
+
+  <url>http://incubator.apache.org/accumulo/</url>
+  <description>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>
+    <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+    <system>Apache's JIRA issue tracker</system>
+  </issueManagement>
 </project>

Modified: incubator/accumulo/branches/1.3/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/core/pom.xml Fri Oct 28 21:32:55 2011
@@ -15,15 +15,14 @@
   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"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-	<groupId>org.apache.accumulo</groupId>
-	<artifactId>accumulo</artifactId>
-	<version>1.3.5-incubating-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.3.5-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -104,8 +103,8 @@
       <artifactId>jline</artifactId>
     </dependency>
     <dependency>
-    	<groupId>commons-lang</groupId>
-    	<artifactId>commons-lang</artifactId>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
     </dependency>
   </dependencies>
 

Modified: incubator/accumulo/branches/1.3/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/examples/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/examples/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/examples/pom.xml Fri Oct 28 21:32:55 2011
@@ -15,15 +15,14 @@
   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"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-	<groupId>org.apache.accumulo</groupId>
-	<artifactId>accumulo</artifactId>
-	<version>1.3.5-incubating-SNAPSHOT</version>
-	<relativePath>../../</relativePath>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.3.5-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/branches/1.3/src/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/server/pom.xml Fri Oct 28 21:32:55 2011
@@ -15,15 +15,14 @@
   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"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-	<groupId>org.apache.accumulo</groupId>
-	<artifactId>accumulo</artifactId>
-	<version>1.3.5-incubating-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.3.5-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -40,8 +39,8 @@
       <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.accumulo</groupId>
-        <artifactId>cloudtrace</artifactId>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>cloudtrace</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
@@ -68,16 +67,16 @@
       <artifactId>jline</artifactId>
     </dependency>
     <dependency>
-    	<groupId>commons-configuration</groupId>
-    	<artifactId>commons-configuration</artifactId>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
     </dependency>
     <dependency>
-    	<groupId>commons-io</groupId>
-    	<artifactId>commons-io</artifactId>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
-    	<groupId>commons-lang</groupId>
-    	<artifactId>commons-lang</artifactId>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
     </dependency>
   </dependencies>
 

Modified: incubator/accumulo/branches/1.3/src/start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/start/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/start/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/start/pom.xml Fri Oct 28 21:32:55 2011
@@ -15,15 +15,14 @@
   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"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-	<groupId>org.apache.accumulo</groupId>
-	<artifactId>accumulo</artifactId>
-	<version>1.3.5-incubating-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.3.5-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -31,30 +30,30 @@
   <name>accumulo-start</name>
 
   <dependencies>
-  	<dependency>
-  		<groupId>log4j</groupId>
-  		<artifactId>log4j</artifactId>
-  	</dependency>
-   	<dependency>
-  		<groupId>commons-logging</groupId>
-  		<artifactId>commons-logging-api</artifactId>
-  	</dependency> 	
-   	<dependency>
-  		<groupId>commons-logging</groupId>
-  		<artifactId>commons-logging</artifactId>
-  	</dependency> 	
-  	<dependency>
-  		<groupId>org.apache.commons</groupId>
-  		<artifactId>commons-jci-core</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.commons</groupId>
-  		<artifactId>commons-jci-fam</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>commons-io</groupId>
-  		<artifactId>commons-io</artifactId>
-  	</dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-jci-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-jci-fam</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

Modified: incubator/accumulo/branches/1.3/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/trace/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/trace/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/trace/pom.xml Fri Oct 28 21:32:55 2011
@@ -15,36 +15,35 @@
   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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.apache.accumulo</groupId>
-		<artifactId>accumulo</artifactId>
-		<version>1.3.5-incubating-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
+  <parent>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.3.5-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.accumulo</groupId>
-	<artifactId>cloudtrace</artifactId>
-	<name>cloudtrace</name>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.accumulo</groupId>
+  <artifactId>cloudtrace</artifactId>
+  <name>cloudtrace</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>zookeeper</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>zookeeper</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+  </dependencies>
 
 </project>

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/conf/wikipedia.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/ingest/conf/wikipedia.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/ingest/conf/wikipedia.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/ingest/conf/wikipedia.xml Fri Oct 28 21:32:55 2011
@@ -16,28 +16,28 @@
   limitations under the License.
 -->
 <configuration>
-<property>
-  <name>wikipedia.accumulo.zookeepers</name>
-  <value><!--zookeeper servers--></value>
-</property>
-	<property>
-	<name>wikipedia.accumulo.instance_name</name>
-   <value><!--instance name--></value>
-</property>
-	<property>
-	<name>wikipedia.accumulo.user</name>
-   <value><!--user name--></value>
-</property>
-	<property>
-	<name>wikipedia.accumulo.password</name>
-   <value><!-- password --></value>
-</property>
- <property>
-   <name>wikipedia.accumulo.table</name>
-   <value><!--table name--></value>
-</property>
-<property>
-  <name>wikipedia.ingest.partitions</name>
-  <value><!--number of partitions--></value>
-</property>
+  <property>
+    <name>wikipedia.accumulo.zookeepers</name>
+    <value><!--zookeeper servers --></value>
+  </property>
+  <property>
+    <name>wikipedia.accumulo.instance_name</name>
+    <value><!--instance name --></value>
+  </property>
+  <property>
+    <name>wikipedia.accumulo.user</name>
+    <value><!--user name --></value>
+  </property>
+  <property>
+    <name>wikipedia.accumulo.password</name>
+    <value><!-- password --></value>
+  </property>
+  <property>
+    <name>wikipedia.accumulo.table</name>
+    <value><!--table name --></value>
+  </property>
+  <property>
+    <name>wikipedia.ingest.partitions</name>
+    <value><!--number of partitions --></value>
+  </property>
 </configuration>

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/ingest/pom.xml Fri Oct 28 21:32:55 2011
@@ -25,7 +25,7 @@
 
   <artifactId>accumulo-sample-ingest</artifactId>
   <name>accumulo-sample-ingest</name>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -55,64 +55,64 @@
       <groupId>com.google.collections</groupId>
       <artifactId>google-collections</artifactId>
     </dependency>
-	<dependency>
+    <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-   	</dependency>
-	<dependency>
+    </dependency>
+    <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers</artifactId>
-   	</dependency>   	
-	<dependency>
-	  <groupId>org.apache.lucene</groupId>
-	  <artifactId>lucene-wikipedia</artifactId>
-	</dependency>	   	   	
-	<dependency>
-		<groupId>com.google.protobuf</groupId>
-		<artifactId>protobuf-java</artifactId>
-	</dependency>
-	<dependency>
-	  <groupId>org.jboss</groupId>
-	  <artifactId>jboss-common-core</artifactId>
-	</dependency>	
-	<dependency>
-	  <groupId>org.jboss.logging</groupId>
-	  <artifactId>jboss-logging-spi</artifactId>
-	  <scope>runtime</scope>
-	</dependency>	
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-wikipedia</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
-		<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-lang,google-collections,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,jboss-common-core,jboss-logging-spi</includeArtifactIds>
-						<excludeTransitive>true</excludeTransitive>
-					</configuration>
-				</execution>
-			</executions>
-		</plugin>
-		<plugin>
-			<artifactId>maven-assembly-plugin</artifactId>
-			<configuration>
-				<descriptors>
-					<descriptor>src/assembly/dist.xml</descriptor>
-				</descriptors>
-				<tarLongFileMode>gnu</tarLongFileMode>
-			</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-lang,google-collections,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,jboss-common-core,jboss-logging-spi</includeArtifactIds>
+              <excludeTransitive>true</excludeTransitive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/dist.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
-  
+
 </project>

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml Fri Oct 28 21:32:55 2011
@@ -15,9 +15,8 @@
   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">
+<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>
 
@@ -35,246 +34,246 @@
   <packaging>pom</packaging>
 
   <modules>
-  	<module>query</module>
-  	<module>ingest</module>
+    <module>query</module>
+    <module>ingest</module>
     <module>query-war</module>
   </modules>
-  
-  	<build>
-		<defaultGoal>package</defaultGoal>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.0-beta-1</version>
-				<executions>
-					<execution>
-						<id>enforce-mvn</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireMavenVersion>
-									<version>[2.0.9,)</version>
-								</requireMavenVersion>
-							</rules>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>lib</directory>
-							<directory>target</directory>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<outputDirectory>lib</outputDirectory>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-Build>${buildNumber}</Implementation-Build>
-							<Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
-						</manifestEntries>
-					</archive>
-					<includes>
-						<include>**/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.4</version>
-				<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>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</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-source-plugin</artifactId>
-				<version>2.0.4</version>
-				<configuration>
-					<outputDirectory>lib</outputDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<inherited>false</inherited>
-				<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-jci-core,commons-jci-fam,commons-logging,commons-logging-api,cloudtrace</includeArtifactIds>
-							<excludeGroupIds>accumulo</excludeGroupIds>
-							<excludeTransitive>true</excludeTransitive>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>			
-		</plugins>
-	</build>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>enforce-mvn</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[2.0.9,)</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>lib</directory>
+              <directory>target</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <outputDirectory>lib</outputDirectory>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Implementation-Build>${buildNumber}</Implementation-Build>
+              <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+            </manifestEntries>
+          </archive>
+          <includes>
+            <include>**/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.4</version>
+        <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>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</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-source-plugin</artifactId>
+        <version>2.0.4</version>
+        <configuration>
+          <outputDirectory>lib</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <inherited>false</inherited>
+        <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-jci-core,commons-jci-fam,commons-logging,commons-logging-api,cloudtrace</includeArtifactIds>
+              <excludeGroupIds>accumulo</excludeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.commons-lang>2.4</version.commons-lang>
     <version.accumulo>${project.version}</version.accumulo>
-   	<version.commons-jexl>2.0.1</version.commons-jexl>
-   	<version.commons-codec>1.5</version.commons-codec>
-   	<version.ejb-spec-api>1.0.1.Final</version.ejb-spec-api>
-   	<version.jaxrs>2.1.0.GA</version.jaxrs>
-   	<version.jboss-common-core>2.2.17.GA</version.jboss-common-core>
-   	<version.jboss-logging>2.0.5.GA</version.jboss-logging>
-   	<version.kryo>1.04</version.kryo>
-   	<version.log4j>1.2.16</version.log4j>
-   	<version.log4j-extras>1.0</version.log4j-extras>
-   	<version.lucene>3.0.2</version.lucene>
-   	<version.lucene-analyzers>3.0.2</version.lucene-analyzers>
-   	<version.lucene-wikipedia>3.0.2</version.lucene-wikipedia>
-   	<version.protobuf>2.3.0</version.protobuf>
-   	<version.googlecollections>1.0</version.googlecollections>
-   	<version.libthrift>0.6.1</version.libthrift>
-   	<version.zookeeper>3.3.1</version.zookeeper>
-   </properties>
-    
+    <version.commons-jexl>2.0.1</version.commons-jexl>
+    <version.commons-codec>1.5</version.commons-codec>
+    <version.ejb-spec-api>1.0.1.Final</version.ejb-spec-api>
+    <version.jaxrs>2.1.0.GA</version.jaxrs>
+    <version.jboss-common-core>2.2.17.GA</version.jboss-common-core>
+    <version.jboss-logging>2.0.5.GA</version.jboss-logging>
+    <version.kryo>1.04</version.kryo>
+    <version.log4j>1.2.16</version.log4j>
+    <version.log4j-extras>1.0</version.log4j-extras>
+    <version.lucene>3.0.2</version.lucene>
+    <version.lucene-analyzers>3.0.2</version.lucene-analyzers>
+    <version.lucene-wikipedia>3.0.2</version.lucene-wikipedia>
+    <version.protobuf>2.3.0</version.protobuf>
+    <version.googlecollections>1.0</version.googlecollections>
+    <version.libthrift>0.6.1</version.libthrift>
+    <version.zookeeper>3.3.1</version.zookeeper>
+  </properties>
+
   <dependencyManagement>
-  	<dependencies>
-<dependency>
-  <groupId>commons-codec</groupId>
-  <artifactId>commons-codec</artifactId>
-  <version>${version.commons-codec}</version>
-</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${version.commons-lang}</version>
-		</dependency>  	
-	    <dependency>
-	      <groupId>org.apache.accumulo</groupId>
-	      <artifactId>accumulo-core</artifactId>
-	      <version>${version.accumulo}</version>
-	    </dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>zookeeper</artifactId>
-			<version>${version.zookeeper}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-			<version>${version.libthrift}</version>
-		</dependency>
-		<dependency>
-		  	<groupId>org.apache.accumulo</groupId>
-		  	<artifactId>cloudtrace</artifactId>
-		  	<version>${version.accumulo}</version>
-		</dependency>
-	    <dependency>
-	      <groupId>com.google.collections</groupId>
-	      <artifactId>google-collections</artifactId>
-	      <version>${version.googlecollections}</version>
-	    </dependency>
-	    <dependency>
-	      <groupId>com.googlecode</groupId>
-	      <artifactId>kryo</artifactId>
-	      <version>${version.kryo}</version>
-	    </dependency>
-            <dependency>
-	      <groupId>org.apache.lucene</groupId>
-	      <artifactId>lucene-core</artifactId>
-	      <version>${version.lucene}</version>
-	   	</dependency>
-		<dependency>
-	      <groupId>org.apache.lucene</groupId>
-	      <artifactId>lucene-analyzers</artifactId>
-	      <version>${version.lucene-analyzers}</version>
-	   	</dependency>
-		<dependency>
-		  <groupId>org.apache.lucene</groupId>
-		  <artifactId>lucene-wikipedia</artifactId>
-		  <version>${version.lucene-wikipedia}</version>
-		</dependency>	   	
-		<dependency>
-		  <groupId>com.google.protobuf</groupId>
-		  <artifactId>protobuf-java</artifactId>
-		  <version>${version.protobuf}</version>
-		</dependency>
-		<dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-jexl</artifactId>
-          <version>${version.commons-jexl}</version>
-        </dependency>
-		<dependency>
-		  <groupId>org.jboss.resteasy</groupId>
-		  <artifactId>jaxrs-api</artifactId>
-		  <version>${version.jaxrs}</version>
-		  <scope>provided</scope>
-		</dependency>
-		<dependency>
-		  <groupId>org.jboss.resteasy</groupId>
-		  <artifactId>resteasy-jaxrs</artifactId>
-		  <version>${version.jaxrs}</version>
-		  <scope>provided</scope>
-		</dependency>
-		<dependency>
-		  <groupId>org.jboss.resteasy</groupId>
-		  <artifactId>resteasy-jaxb-provider</artifactId>
-		  <version>${version.jaxrs}</version>
-		</dependency>		
-		<dependency>
-		  <groupId>org.jboss.spec.javax.ejb</groupId>
-		  <artifactId>jboss-ejb-api_3.1_spec</artifactId>
-		  <version>${version.ejb-spec-api}</version>
-		  <scope>provided</scope>
-		</dependency>
-		<dependency>
-		  <groupId>org.jboss</groupId>
-		  <artifactId>jboss-common-core</artifactId>
-		  <version>${version.jboss-common-core}</version>
-		</dependency>
-		<dependency>
-		  <groupId>org.jboss.logging</groupId>
-		  <artifactId>jboss-logging-spi</artifactId>
-		  <version>${version.jboss-logging}</version>
-		</dependency>			
-  	</dependencies>
+    <dependencies>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>${version.commons-codec}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>${version.commons-lang}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-core</artifactId>
+        <version>${version.accumulo}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>${version.zookeeper}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.thrift</groupId>
+        <artifactId>libthrift</artifactId>
+        <version>${version.libthrift}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>cloudtrace</artifactId>
+        <version>${version.accumulo}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.collections</groupId>
+        <artifactId>google-collections</artifactId>
+        <version>${version.googlecollections}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.googlecode</groupId>
+        <artifactId>kryo</artifactId>
+        <version>${version.kryo}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-core</artifactId>
+        <version>${version.lucene}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-analyzers</artifactId>
+        <version>${version.lucene-analyzers}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-wikipedia</artifactId>
+        <version>${version.lucene-wikipedia}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${version.protobuf}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-jexl</artifactId>
+        <version>${version.commons-jexl}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>jaxrs-api</artifactId>
+        <version>${version.jaxrs}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jaxrs</artifactId>
+        <version>${version.jaxrs}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jaxb-provider</artifactId>
+        <version>${version.jaxrs}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.spec.javax.ejb</groupId>
+        <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+        <version>${version.ejb-spec-api}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-common-core</artifactId>
+        <version>${version.jboss-common-core}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging-spi</artifactId>
+        <version>${version.jboss-logging}</version>
+      </dependency>
+    </dependencies>
   </dependencyManagement>
 
   <repositories>

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query-war/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query-war/pom.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query-war/pom.xml Fri Oct 28 21:32:55 2011
@@ -18,50 +18,50 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-     <artifactId>accumulo-sample</artifactId>
-     <groupId>org.apache.accumulo</groupId>
-     <version>1.4.0-incubating-SNAPSHOT</version>
+    <artifactId>accumulo-sample</artifactId>
+    <groupId>org.apache.accumulo</groupId>
+    <version>1.4.0-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>accumulo-sample-query-war</artifactId>
   <packaging>war</packaging>
   <name>accumulo-sample-query-war</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-web-api</artifactId>
-            <version>6.0</version>
-            <scope>provided</scope>
-        </dependency>
-	    <dependency>
-	      <groupId>junit</groupId>
-	      <artifactId>junit</artifactId>
-	      <scope>test</scope>
-	    </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-web-api</artifactId>
+      <version>6.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-    </dependencies>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
-                <configuration>
-                    <failOnMissingWebXml>true</failOnMissingWebXml>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+        <configuration>
+          <failOnMissingWebXml>true</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/jboss-web.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/jboss-web.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/jboss-web.xml Fri Oct 28 21:32:55 2011
@@ -16,5 +16,5 @@
   limitations under the License.
 -->
 <jboss-web>
-	<context-root>/accumulo-sample</context-root>
+  <context-root>/accumulo-sample</context-root>
 </jboss-web>
\ No newline at end of file

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/web.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query-war/src/main/webapp/WEB-INF/web.xml Fri Oct 28 21:32:55 2011
@@ -16,43 +16,42 @@
   limitations under the License.
 -->
 <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-          http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-         version="3.0">
-         
-	<context-param>
-		<param-name>resteasy.jndi.resources</param-name>
-		<param-value>Query/local</param-value>
-	</context-param>
-	
-	<listener>
-		<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
-	</listener>
-			
-	<servlet>
-		<servlet-name>Resteasy</servlet-name>
-		<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>Resteasy</servlet-name>
-		<url-pattern>/rest/*</url-pattern>
-	</servlet-mapping>
-	
-	<context-param>
-		<param-name>resteasy.servlet.mapping.prefix</param-name>
-		<param-value>/rest</param-value>
-	</context-param>
-	
-	<servlet>
-		<servlet-name>UserInterface</servlet-name>
-		<jsp-file>/ui.jsp</jsp-file>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>UserInterface</servlet-name>
-		<url-pattern>/ui/*</url-pattern>
-	</servlet-mapping>	
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+          http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+
+  <context-param>
+    <param-name>resteasy.jndi.resources</param-name>
+    <param-value>Query/local</param-value>
+  </context-param>
+
+  <listener>
+    <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+  </listener>
+
+  <servlet>
+    <servlet-name>Resteasy</servlet-name>
+    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>Resteasy</servlet-name>
+    <url-pattern>/rest/*</url-pattern>
+  </servlet-mapping>
+
+  <context-param>
+    <param-name>resteasy.servlet.mapping.prefix</param-name>
+    <param-value>/rest</param-value>
+  </context-param>
+
+  <servlet>
+    <servlet-name>UserInterface</servlet-name>
+    <jsp-file>/ui.jsp</jsp-file>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>UserInterface</servlet-name>
+    <url-pattern>/ui/*</url-pattern>
+  </servlet-mapping>
 
 </web-app>
\ No newline at end of file

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query/src/assembly/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query/src/assembly/dist.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query/src/assembly/dist.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query/src/assembly/dist.xml Fri Oct 28 21:32:55 2011
@@ -26,7 +26,7 @@
       <directory>lib</directory>
       <outputDirectory>lib</outputDirectory>
       <excludes>
-      	<exclude>${project.name}-${project.version}.jar</exclude>
+        <exclude>${project.name}-${project.version}.jar</exclude>
       </excludes>
       <fileMode>0644</fileMode>
     </fileSet>

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/resources/META-INF/ejb-jar.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/resources/META-INF/ejb-jar.xml Fri Oct 28 21:32:55 2011
@@ -16,48 +16,47 @@
   limitations under the License.
 -->
 <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-          http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
-         version="3.1">
- 	<enterprise-beans>
-		<session>
-			<ejb-name>Query</ejb-name>
-			<env-entry>
-				<env-entry-name>instanceName</env-entry-name>
-				<env-entry-type>java.lang.String</env-entry-type>
-				<env-entry-value><!-- replace me --></env-entry-value>
-			</env-entry>
-			<env-entry>
-				<env-entry-name>zooKeepers</env-entry-name>
-				<env-entry-type>java.lang.String</env-entry-type>
-				<env-entry-value><!-- replace me --></env-entry-value>
-			</env-entry>
-			<env-entry>
-				<env-entry-name>username</env-entry-name>
-				<env-entry-type>java.lang.String</env-entry-type>
-				<env-entry-value><!-- replace me --></env-entry-value>
-			</env-entry>
-			<env-entry>
-				<env-entry-name>password</env-entry-name>
-				<env-entry-type>java.lang.String</env-entry-type>
-				<env-entry-value><!-- replace me --></env-entry-value>
-			</env-entry>
-			<env-entry>
-				<env-entry-name>tableName</env-entry-name>
-				<env-entry-type>java.lang.String</env-entry-type>
-				<env-entry-value>wiki</env-entry-value>
-			</env-entry>
-			<env-entry>
-				<env-entry-name>partitions</env-entry-name>
-				<env-entry-type>java.lang.Integer</env-entry-type>
-				<env-entry-value>100</env-entry-value>
-			</env-entry>
-			<env-entry>
-				<env-entry-name>threads</env-entry-name>
-				<env-entry-type>java.lang.Integer</env-entry-type>
-				<env-entry-value>8</env-entry-value>
-			</env-entry>
-		</session>
-	</enterprise-beans>
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+          http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" version="3.1">
+  <enterprise-beans>
+    <session>
+      <ejb-name>Query</ejb-name>
+      <env-entry>
+        <env-entry-name>instanceName</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value><!-- replace me --></env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>zooKeepers</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value><!-- replace me --></env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>username</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value><!-- replace me --></env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>password</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value><!-- replace me --></env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>tableName</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>wiki</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>partitions</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>100</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>threads</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>8</env-entry-value>
+      </env-entry>
+    </session>
+  </enterprise-beans>
 </ejb-jar>
\ No newline at end of file



Mime
View raw message