Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DB2D7DCED for ; Thu, 16 May 2013 16:12:06 +0000 (UTC) Received: (qmail 70232 invoked by uid 500); 16 May 2013 16:12:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 70178 invoked by uid 500); 16 May 2013 16:12:06 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 70158 invoked by uid 99); 16 May 2013 16:12:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 16:12:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_STOCK2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 16:12:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 903552388847; Thu, 16 May 2013 16:11:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1483431 - in /accumulo/trunk: ./ assemble/ assemble/src/main/assemblies/ core/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/core/util/ docs/src/main/latex/accumulo_user_manual/chapter... Date: Thu, 16 May 2013 16:11:42 -0000 To: commits@accumulo.apache.org From: ctubbsii@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130516161143.903552388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctubbsii Date: Thu May 16 16:11:41 2013 New Revision: 1483431 URL: http://svn.apache.org/r1483431 Log: ACCUMULO-1413,ACCUMULO-1421 merge to trunk Modified: accumulo/trunk/ (props changed) accumulo/trunk/README accumulo/trunk/assemble/ (props changed) accumulo/trunk/assemble/pom.xml accumulo/trunk/assemble/src/main/assemblies/binary-release.xml accumulo/trunk/core/ (props changed) accumulo/trunk/core/pom.xml accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex accumulo/trunk/examples/ (props changed) accumulo/trunk/examples/pom.xml accumulo/trunk/fate/pom.xml accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (contents, props changed) accumulo/trunk/proxy/README (props changed) accumulo/trunk/proxy/pom.xml accumulo/trunk/server/ (props changed) accumulo/trunk/server/pom.xml accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java accumulo/trunk/src/ (props changed) accumulo/trunk/start/pom.xml accumulo/trunk/test/pom.xml accumulo/trunk/trace/pom.xml Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1481927-1481955,1481957-1482356,1482358-1482428,1482897-1483022,1483024-1483423 Modified: accumulo/trunk/README URL: http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/README (original) +++ accumulo/trunk/README Thu May 16 16:11:41 2013 @@ -44,7 +44,7 @@ easier to install. Copy the accumulo tar file produced by mvn package from the assemble/target/ directory to the desired destination, then untar it (e.g. -tar xzf accumulo-assemble-1.6.0-bin.tar.gz). +tar xzf accumulo-1.6.0-bin.tar.gz). If you are using the RPM, install the RPM on every machine that will run accumulo. Propchange: accumulo/trunk/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/assemble:r1481250-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Modified: accumulo/trunk/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/assemble/pom.xml (original) +++ accumulo/trunk/assemble/pom.xml Thu May 16 16:11:41 2013 @@ -19,12 +19,12 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT - accumulo-assemble + accumulo pom - Assemble + Assemblies .. @@ -116,6 +116,7 @@ package + true src/main/assemblies/binary-release.xml @@ -220,6 +221,37 @@ + /opt/accumulo/accumulo-${project.version}/proxy/thrift + + + ${accumulo-top}/proxy/src/main/thrift + + *.thrift + + + + ${accumulo-top}/proxy/target + + gen-cpp/** + gen-py/** + gen-rb/** + + + + + + /opt/accumulo/accumulo-${project.version}/examples/simple + true + + + ${accumulo-top}/examples/simple + + src/main/** + + + + + /opt/accumulo/accumulo-${project.version}/conf true @@ -399,6 +431,24 @@ **/.svn/**,src/** + ${accumulo-top}/proxy/src/main/thrift + directory + + perm + /usr/lib/accumulo/proxy/thrift + + *.thrift + + + ${accumulo-top}/proxy/target + directory + + perm + /usr/lib/accumulo/proxy/thrift + + gen-cpp/**,gen-py/**,gen-rb/** + + ${accumulo-top}/bin directory @@ -409,6 +459,16 @@ **/.svn/** + ${accumulo-top}/examples/simple + directory + + perm + /usr/lib/accumulo/examples/simple + + src/main/** + **/.svn/** + + ${accumulo-top}/conf directory Modified: accumulo/trunk/assemble/src/main/assemblies/binary-release.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/binary-release.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/assemble/src/main/assemblies/binary-release.xml (original) +++ accumulo/trunk/assemble/src/main/assemblies/binary-release.xml Thu May 16 16:11:41 2013 @@ -17,11 +17,10 @@ --> - binary-release + bin tar.gz - accumulo-${project.version} ../bin @@ -37,6 +36,15 @@ + ../examples/simple + /examples/simple + 0755 + 0644 + + src/main/** + + + ../lib/native 0755 @@ -128,13 +136,18 @@ proxy/thrift gen-cpp/** - gen-java/** gen-py/** gen-rb/** - - * - + + + ../proxy/src/main/thrift + 0755 + 0644 + proxy/thrift + + *.thrift + Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1480478-1480504,1480508-1480863,1480865-1481125,1481127-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Modified: accumulo/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/core/pom.xml (original) +++ accumulo/trunk/core/pom.xml Thu May 16 16:11:41 2013 @@ -19,7 +19,7 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-core Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java Thu May 16 16:11:41 2013 @@ -65,7 +65,7 @@ public class AccumuloFileOutputFormat ex * @since 1.5.0 */ protected static AccumuloConfiguration getAccumuloConfiguration(JobContext context) { - return FileOutputConfigurator.getAccumuloConfiguration(CLASS, context.getConfiguration()); + return FileOutputConfigurator.getAccumuloConfiguration(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -141,7 +141,7 @@ public class AccumuloFileOutputFormat ex @Override public RecordWriter getRecordWriter(TaskAttemptContext context) throws IOException { // get the path of the temporary output file - final Configuration conf = context.getConfiguration(); + final Configuration conf = InputFormatBase.getConfiguration(context); final AccumuloConfiguration acuConf = getAccumuloConfiguration(context); final String extension = acuConf.get(Property.TABLE_FILE_TYPE); Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Thu May 16 16:11:41 2013 @@ -104,7 +104,7 @@ public class AccumuloOutputFormat extend * @see #setConnectorInfo(Job, String, AuthenticationToken) */ protected static Boolean isConnectorInfoSet(JobContext context) { - return OutputConfigurator.isConnectorInfoSet(CLASS, context.getConfiguration()); + return OutputConfigurator.isConnectorInfoSet(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -117,7 +117,7 @@ public class AccumuloOutputFormat extend * @see #setConnectorInfo(Job, String, AuthenticationToken) */ protected static String getPrincipal(JobContext context) { - return OutputConfigurator.getPrincipal(CLASS, context.getConfiguration()); + return OutputConfigurator.getPrincipal(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -130,7 +130,7 @@ public class AccumuloOutputFormat extend * @see #setConnectorInfo(Job, String, AuthenticationToken) */ protected static String getTokenClass(JobContext context) { - return OutputConfigurator.getTokenClass(CLASS, context.getConfiguration()); + return OutputConfigurator.getTokenClass(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -144,7 +144,7 @@ public class AccumuloOutputFormat extend * @see #setConnectorInfo(Job, String, AuthenticationToken) */ protected static byte[] getToken(JobContext context) { - return OutputConfigurator.getToken(CLASS, context.getConfiguration()); + return OutputConfigurator.getToken(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -186,7 +186,7 @@ public class AccumuloOutputFormat extend * @see #setMockInstance(Job, String) */ protected static Instance getInstance(JobContext context) { - return OutputConfigurator.getInstance(CLASS, context.getConfiguration()); + return OutputConfigurator.getInstance(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -212,7 +212,7 @@ public class AccumuloOutputFormat extend * @see #setLogLevel(Job, Level) */ protected static Level getLogLevel(JobContext context) { - return OutputConfigurator.getLogLevel(CLASS, context.getConfiguration()); + return OutputConfigurator.getLogLevel(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -239,7 +239,7 @@ public class AccumuloOutputFormat extend * @see #setDefaultTableName(Job, String) */ protected static String getDefaultTableName(JobContext context) { - return OutputConfigurator.getDefaultTableName(CLASS, context.getConfiguration()); + return OutputConfigurator.getDefaultTableName(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -266,7 +266,7 @@ public class AccumuloOutputFormat extend * @see #setBatchWriterOptions(Job, BatchWriterConfig) */ protected static BatchWriterConfig getBatchWriterOptions(JobContext context) { - return OutputConfigurator.getBatchWriterOptions(CLASS, context.getConfiguration()); + return OutputConfigurator.getBatchWriterOptions(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -295,7 +295,7 @@ public class AccumuloOutputFormat extend * @see #setCreateTables(Job, boolean) */ protected static Boolean canCreateTables(JobContext context) { - return OutputConfigurator.canCreateTables(CLASS, context.getConfiguration()); + return OutputConfigurator.canCreateTables(CLASS, InputFormatBase.getConfiguration(context)); } /** @@ -324,7 +324,7 @@ public class AccumuloOutputFormat extend * @see #setSimulationMode(Job, boolean) */ protected static Boolean getSimulationMode(JobContext context) { - return OutputConfigurator.getSimulationMode(CLASS, context.getConfiguration()); + return OutputConfigurator.getSimulationMode(CLASS, InputFormatBase.getConfiguration(context)); } /** Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Thu May 16 16:11:41 2013 @@ -20,6 +20,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.lang.reflect.Method; import java.math.BigInteger; import java.net.InetAddress; import java.net.URLDecoder; @@ -126,7 +127,7 @@ public abstract class InputFormatBase getRanges(JobContext context) throws IOException { - return InputConfigurator.getRanges(CLASS, context.getConfiguration()); + return InputConfigurator.getRanges(CLASS, getConfiguration(context)); } /** @@ -341,7 +342,7 @@ public abstract class InputFormatBase> getFetchedColumns(JobContext context) { - return InputConfigurator.getFetchedColumns(CLASS, context.getConfiguration()); + return InputConfigurator.getFetchedColumns(CLASS, getConfiguration(context)); } /** @@ -367,7 +368,7 @@ public abstract class InputFormatBase getIterators(JobContext context) { - return InputConfigurator.getIterators(CLASS, context.getConfiguration()); + return InputConfigurator.getIterators(CLASS, getConfiguration(context)); } /** @@ -398,7 +399,7 @@ public abstract class InputFormatBase4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-examples @@ -28,4 +28,29 @@ simple + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + ../../lib + + true + runtime + true + sources,test-sources + + + + + + Modified: accumulo/trunk/fate/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/fate/pom.xml (original) +++ accumulo/trunk/fate/pom.xml Thu May 16 16:11:41 2013 @@ -19,7 +19,7 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-fate Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480478-1480504,1480508-1480863,1480865-1481125,1481127-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1480478-1480504,1480508-1480863,1480865-1481125,1481127-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Modified: accumulo/trunk/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/pom.xml (original) +++ accumulo/trunk/pom.xml Thu May 16 16:11:41 2013 @@ -23,10 +23,10 @@ 13 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT pom - Apache Accumulo + Apache Accumulo Project 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. http://accumulo.apache.org/maven-site/ @@ -337,6 +337,7 @@ org.apache.maven.plugins maven-assembly-plugin + false gnu @@ -746,6 +747,35 @@ + apache-release + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-source-release-assembly + + attach-artifact + + + true + + + ${project.build.directory}/${project.artifactId}-${project.version}-source-release.tar.gz + tar.gz + src + + + + + + + + + + sortpom Propchange: accumulo/trunk/pom.xml ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/pom.xml:r1481250-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Propchange: accumulo/trunk/proxy/README ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/proxy/README:r1480478-1480504,1480508-1480863,1480865-1481125,1481127-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Modified: accumulo/trunk/proxy/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/proxy/pom.xml (original) +++ accumulo/trunk/proxy/pom.xml Thu May 16 16:11:41 2013 @@ -19,7 +19,7 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-proxy Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1480478-1480504,1480508-1480863,1480865-1481125,1481127-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Modified: accumulo/trunk/server/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/server/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/server/pom.xml (original) +++ accumulo/trunk/server/pom.xml Thu May 16 16:11:41 2013 @@ -19,7 +19,7 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-server Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java Thu May 16 16:11:41 2013 @@ -20,6 +20,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Map.Entry; @@ -199,10 +200,7 @@ public class Accumulo { long sleep = 1000; while (true) { try { - if (!(fs instanceof DistributedFileSystem)) - break; - DistributedFileSystem dfs = (DistributedFileSystem) FileSystem.get(CachedConfiguration.getInstance()); - if (!dfs.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_GET)) + if (!isInSafeMode(fs)) break; log.warn("Waiting for the NameNode to leave safemode"); } catch (IOException ex) { @@ -214,4 +212,49 @@ public class Accumulo { } log.info("Connected to HDFS"); } + + private static boolean isInSafeMode(FileSystem fs) throws IOException { + if (!(fs instanceof DistributedFileSystem)) + return false; + DistributedFileSystem dfs = (DistributedFileSystem) FileSystem.get(CachedConfiguration.getInstance()); + // So this: if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET)) + // Becomes this: + Class constantClass; + try { + // hadoop 2.0 + constantClass = Class.forName("org.apache.hadoop.hdfs.protocol.HdfsConstants"); + } catch (ClassNotFoundException ex) { + // hadoop 1.0 + try { + constantClass = Class.forName("org.apache.hadoop.hdfs.protocol.FSConstants"); + } catch (ClassNotFoundException e) { + throw new RuntimeException("Cannot figure out the right class for Constants"); + } + } + Class safeModeAction = null; + for (Class klass : constantClass.getDeclaredClasses()) { + if (klass.getSimpleName().equals("SafeModeAction")) { + safeModeAction = klass; + break; + } + } + if (safeModeAction == null) { + throw new RuntimeException("Cannot find SafeModeAction in constants class"); + } + + Object get = null; + for (Object obj : safeModeAction.getEnumConstants()) { + if (obj.toString().equals("SAFEMODE_GET")) + get = obj; + } + if (get == null) { + throw new RuntimeException("cannot find SAFEMODE_GET"); + } + try { + Method setSafeMode = dfs.getClass().getMethod("setSafeMode", safeModeAction); + return (Boolean)setSafeMode.invoke(dfs, get); + } catch (Exception ex) { + throw new RuntimeException("cannot find method setSafeMode"); + } + } } Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/src:r1480478-1480504,1480508-1480863,1480865-1481125,1481127-1481853,1481855-1481955,1481957-1482428,1482897-1483022,1483024-1483423 Modified: accumulo/trunk/start/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/start/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/start/pom.xml (original) +++ accumulo/trunk/start/pom.xml Thu May 16 16:11:41 2013 @@ -19,7 +19,7 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-start Modified: accumulo/trunk/test/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/test/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/test/pom.xml (original) +++ accumulo/trunk/test/pom.xml Thu May 16 16:11:41 2013 @@ -19,7 +19,7 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-test Modified: accumulo/trunk/trace/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/pom.xml?rev=1483431&r1=1483430&r2=1483431&view=diff ============================================================================== --- accumulo/trunk/trace/pom.xml (original) +++ accumulo/trunk/trace/pom.xml Thu May 16 16:11:41 2013 @@ -19,7 +19,7 @@ 4.0.0 org.apache.accumulo - accumulo + accumulo-project 1.6.0-SNAPSHOT accumulo-trace