git commit: ACCUMULO-2569 allow for iterator settings to propogate everywhere before testing
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT fac91d3b9 - 90377b6b8
ACCUMULO-2569 allow for iterator settings to propogate everywhere before testing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90377b6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90377b6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90377b6b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 90377b6b8937097d98dc93ba1fdcce465150ff75
Parents: fac91d3
Author: Eric C. Newton eric.new...@gmail.com
Authored: Fri Apr 25 11:26:43 2014 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Fri Apr 25 11:29:13 2014 -0400
--
.../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/90377b6b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 856f663..b400fcb 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -197,12 +197,13 @@ public class ExamplesIT extends AbstractMacIT {
assertTrue(result.contains(accumulo-site.xml));
}
- @Test(timeout = 5 * 1000)
+ @Test(timeout = 6 * 1000)
public void testAgeoffFilter() throws Exception {
c.tableOperations().create(filtertest);
is = new IteratorSetting(10, AgeOffFilter.class);
AgeOffFilter.setTTL(is, 1000L);
c.tableOperations().attachIterator(filtertest, is);
+UtilWaitThread.sleep(500); // let zookeeper updates propagate.
bw = c.createBatchWriter(filtertest, bwc);
Mutation m = new Mutation(foo);
m.put(a, b, c);
[3/4] git commit: ACCUMULO-2569 allow for iterator settings to propogate everywhere before testing
ACCUMULO-2569 allow for iterator settings to propogate everywhere before testing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90377b6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90377b6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90377b6b
Branch: refs/heads/master
Commit: 90377b6b8937097d98dc93ba1fdcce465150ff75
Parents: fac91d3
Author: Eric C. Newton eric.new...@gmail.com
Authored: Fri Apr 25 11:26:43 2014 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Fri Apr 25 11:29:13 2014 -0400
--
.../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/90377b6b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 856f663..b400fcb 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -197,12 +197,13 @@ public class ExamplesIT extends AbstractMacIT {
assertTrue(result.contains(accumulo-site.xml));
}
- @Test(timeout = 5 * 1000)
+ @Test(timeout = 6 * 1000)
public void testAgeoffFilter() throws Exception {
c.tableOperations().create(filtertest);
is = new IteratorSetting(10, AgeOffFilter.class);
AgeOffFilter.setTTL(is, 1000L);
c.tableOperations().attachIterator(filtertest, is);
+UtilWaitThread.sleep(500); // let zookeeper updates propagate.
bw = c.createBatchWriter(filtertest, bwc);
Mutation m = new Mutation(foo);
m.put(a, b, c);
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c941e13 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c941e13 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c941e13 Branch: refs/heads/master Commit: 6c941e13048094062b7dcffe1cc4bccd73f8e80e Parents: 858288b 90377b6 Author: Eric C. Newton eric.new...@gmail.com Authored: Fri Apr 25 11:29:45 2014 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Fri Apr 25 11:29:45 2014 -0400 -- --
[2/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/858288ba Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/858288ba Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/858288ba Branch: refs/heads/master Commit: 858288ba90d32033daa823c186110b16ae1336e2 Parents: e10d1a7 0309df8 Author: Eric C. Newton eric.new...@gmail.com Authored: Fri Apr 25 11:27:45 2014 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Fri Apr 25 11:27:45 2014 -0400 -- .../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[1/3] git commit: ACCUMULO-2733 adds thrift deserialization to Credentials
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 90377b6b8 - 6742627f2
refs/heads/master 6c941e130 - 1f49ff05a
ACCUMULO-2733 adds thrift deserialization to Credentials
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6742627f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6742627f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6742627f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6742627f20ad58e8e0737baddde952d9d7edba87
Parents: 90377b6
Author: Sean Busbey bus...@cloudera.com
Authored: Thu Apr 24 23:44:49 2014 -0500
Committer: Sean Busbey bus...@cloudera.com
Committed: Fri Apr 25 10:32:13 2014 -0500
--
.../accumulo/core/security/Credentials.java | 9 +++
.../accumulo/core/security/CredentialsTest.java | 8 ++
.../server/client/ClientServiceHandler.java | 8 +++---
.../server/security/SecurityOperation.java | 28 ++--
4 files changed, 28 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6742627f/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
b/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
index 5afc6e8..9f8b1be 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Credentials.java
@@ -91,6 +91,15 @@ public class Credentials {
}
/**
+ * Converts a given thrift object to our internal Credentials representation.
+ * @param serialized a Thrift encoded set of credentials
+ * @return a new Credentials instance; destroy the token when you're done.
+ */
+ public static Credentials fromThrift(TCredentials serialized) {
+return new Credentials(serialized.getPrincipal(),
AuthenticationTokenSerializer.deserialize(serialized.getTokenClassName(),
serialized.getToken()));
+ }
+
+ /**
* Converts the current object to a serialized form. The object returned
from this contains a non-destroyable version of the {@link
AuthenticationToken}, so
* references to it should be tightly controlled.
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6742627f/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
b/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
index 4f8079e..b925e4a 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java
@@ -62,6 +62,14 @@ public class CredentialsTest {
assertTrue(AccumuloSecurityException.class.cast(e.getCause()).getSecurityErrorCode().equals(SecurityErrorCode.TOKEN_EXPIRED));
}
}
+
+ @Test
+ public void roundtripThrift() throws DestroyFailedException {
+Credentials creds = new Credentials(test, new PasswordToken(testing));
+TCredentials tCreds = creds.toThrift(new MockInstance());
+Credentials roundtrip = Credentials.fromThrift(tCreds);
+assertEquals(Roundtrip through thirft changed credentials equality,
creds, roundtrip);
+ }
@Test
public void testMockConnector() throws AccumuloException,
DestroyFailedException, AccumuloSecurityException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6742627f/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index 3571d7f..e6739f8 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -46,7 +46,6 @@ import
org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
import
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-import
org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
@@ -282,8
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f49ff05 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f49ff05 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f49ff05 Branch: refs/heads/master Commit: 1f49ff05ac25b4e4ac4cbbd096d9feba2d4e8ae8 Parents: 6c941e1 6742627 Author: Sean Busbey bus...@cloudera.com Authored: Fri Apr 25 10:32:38 2014 -0500 Committer: Sean Busbey bus...@cloudera.com Committed: Fri Apr 25 10:32:38 2014 -0500 -- .../accumulo/core/security/Credentials.java | 9 +++ .../accumulo/core/security/CredentialsTest.java | 8 ++ .../server/client/ClientServiceHandler.java | 8 +++--- .../server/security/SecurityOperation.java | 28 ++-- 4 files changed, 28 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f49ff05/core/src/main/java/org/apache/accumulo/core/security/Credentials.java -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f49ff05/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f49ff05/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java --
[3/5] ACCUMULO-2726 Adds back missing methods for binary backwards compat with non-Deprecated methods from 1.5.0. Marks things that we're for sure removing with @Deprecated; mostly things that shouldn
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4454a06/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
new file mode 100644
index 000..2dac1fa
--- /dev/null
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
@@ -0,0 +1,214 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.client.impl;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.client.admin.NamespaceOperations;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
+
+public abstract class NamespaceOperationsHelper implements NamespaceOperations
{
+
+ @Override
+ public String systemNamespace() {
+return Namespaces.ACCUMULO_NAMESPACE;
+ }
+
+ @Override
+ public String defaultNamespace() {
+return Namespaces.DEFAULT_NAMESPACE;
+ }
+
+ @Override
+ public void attachIterator(String namespace, IteratorSetting setting) throws
AccumuloSecurityException, AccumuloException, NamespaceNotFoundException {
+attachIterator(namespace, setting, EnumSet.allOf(IteratorScope.class));
+ }
+
+ @Override
+ public void attachIterator(String namespace, IteratorSetting setting,
EnumSetIteratorScope scopes) throws AccumuloSecurityException,
AccumuloException,
+ NamespaceNotFoundException {
+checkIteratorConflicts(namespace, setting, scopes);
+for (IteratorScope scope : scopes) {
+ String root = String.format(%s%s.%s, Property.TABLE_ITERATOR_PREFIX,
scope.name().toLowerCase(), setting.getName());
+ for (EntryString,String prop : setting.getOptions().entrySet()) {
+this.setProperty(namespace, root + .opt. + prop.getKey(),
prop.getValue());
+ }
+ this.setProperty(namespace, root, setting.getPriority() + , +
setting.getIteratorClass());
+}
+ }
+
+ @Override
+ public void removeIterator(String namespace, String name,
EnumSetIteratorScope scopes) throws AccumuloSecurityException,
AccumuloException,
+ NamespaceNotFoundException {
+if (!exists(namespace))
+ throw new NamespaceNotFoundException(null, namespace, null);
+MapString,String copy = new TreeMapString,String();
+for (EntryString,String property : this.getProperties(namespace)) {
+ copy.put(property.getKey(), property.getValue());
+}
+for (IteratorScope scope : scopes) {
+ String root = String.format(%s%s.%s, Property.TABLE_ITERATOR_PREFIX,
scope.name().toLowerCase(), name);
+ for (EntryString,String property : copy.entrySet()) {
+if (property.getKey().equals(root) ||
property.getKey().startsWith(root + .opt.))
+ this.removeProperty(namespace, property.getKey());
+ }
+}
+ }
+
+ @Override
+ public IteratorSetting getIteratorSetting(String namespace, String name,
IteratorScope scope) throws AccumuloSecurityException, AccumuloException,
+ NamespaceNotFoundException {
+if (!exists(namespace))
+ throw new NamespaceNotFoundException(null, namespace, null);
+int priority = -1;
+String classname = null;
+MapString,String settings = new HashMapString,String();
+
+String root = String.format(%s%s.%s, Property.TABLE_ITERATOR_PREFIX,
scope.name().toLowerCase(), name);
+String opt = root + .opt.;
+for (EntryString,String property : this.getProperties(namespace)) {
+ if (property.getKey().equals(root)) {
+String parts[] = property.getValue().split(,);
+if (parts.length != 2) {
+ throw new AccumuloException(Bad value for iterator
[2/3] git commit: ACCUMULO-2734 Fix trivial javadoc bug
ACCUMULO-2734 Fix trivial javadoc bug
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83ef6b84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83ef6b84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83ef6b84
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 83ef6b8433e25477993308cb5a2acc30d9c26246
Parents: 700bcf5
Author: Christopher Tubbs ctubb...@apache.org
Authored: Fri Apr 25 13:42:41 2014 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Fri Apr 25 13:42:41 2014 -0400
--
.../accumulo/core/client/admin/TableOperations.java | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/83ef6b84/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 0823656..e06baae 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -134,16 +134,15 @@ public interface TableOperations {
* Note that while the documentation for Text specifies that its bytestream
should be UTF-8, the encoding is not enforced by operations that work with byte
arrays.
* p
* For example, you can create 256 evenly-sliced splits via the following
code sample even though the given byte sequences are not valid UTF-8.
+ *
* pre
- * {@code
- * TableOperations tableOps = connector.tableOperations();
- * TreeSetText splits = new TreeSetText();
- * for (int i = 0; i 256; i++) {
- *byte[] bytes = { (byte) i };
- *splits.add(new Text(bytes));
- * }
- * tableOps.addSplits(TABLE_NAME, splits);
+ * TableOperations tableOps = connector.tableOperations();
+ * TreeSetlt;Textgt; splits = new TreeSetlt;Textgt;();
+ * for (int i = 0; i lt; 256; i++) {
+ * byte[] bytes = {(byte) i};
+ * splits.add(new Text(bytes));
* }
+ * tableOps.addSplits(TABLE_NAME, splits);
* /pre
*
* @param tableName
[09/17] Merge branch '1.6.0-SNAPSHOT'
http://git-wip-us.apache.org/repos/asf/accumulo/blob/592c8b06/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
--
diff --cc
mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 7657c3c,000..69bbef2
mode 100644,00..100644
---
a/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++
b/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@@ -1,796 -1,0 +1,796 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.client.mapreduce.lib.impl;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ClientSideIteratorScanner;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.IsolatedScanner;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.RowIterator;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
+import org.apache.accumulo.core.client.impl.TabletLocator;
+import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
- import org.apache.accumulo.core.client.mock.MockTabletLocator;
++import org.apache.accumulo.core.client.mock.impl.MockTabletLocator;
+import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.data.PartialKey;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.master.state.tables.TableState;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.util.TextUtil;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.MapWritable;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringUtils;
+
+import com.google.common.collect.Maps;
+
+/**
+ * @since 1.6.0
+ */
+public class InputConfigurator extends ConfiguratorBase {
+
+ /**
+ * Configuration keys for {@link Scanner}.
+ *
+ * @since 1.6.0
+ */
+ public static enum ScanOpts {
+TABLE_NAME, AUTHORIZATIONS, RANGES, COLUMNS, ITERATORS, TABLE_CONFIGS
+ }
+
+ /**
+ * Configuration keys for various features.
+ *
+ * @since 1.6.0
+ */
+ public static enum Features {
+AUTO_ADJUST_RANGES, SCAN_ISOLATION, USE_LOCAL_ITERATORS, SCAN_OFFLINE
+ }
+
+ /**
+ * Sets the name of the input table, over which this job will scan.
+ *
+ * @param implementingClass
+ * the class whose name will be used as a prefix for the property
configuration key
+ * @param conf
+ * the Hadoop configuration object to configure
+ * @param tableName
+ * the table to use when the tablename is null in the write call
+ *
[08/17] git commit: ACCUMULO-2726 missed a deprecation for part of Mock.
ACCUMULO-2726 missed a deprecation for part of Mock.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9bdad265
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9bdad265
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9bdad265
Branch: refs/heads/master
Commit: 9bdad265990eb57ca7e101c0a3a446856798de55
Parents: 956f19b
Author: Sean Busbey bus...@cloudera.com
Authored: Fri Apr 25 14:12:51 2014 -0500
Committer: Sean Busbey bus...@cloudera.com
Committed: Fri Apr 25 14:15:01 2014 -0500
--
.../apache/accumulo/core/client/mock/MockSecurityOperations.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9bdad265/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
index 107c711..6271059 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
@@ -16,6 +16,10 @@
*/
package org.apache.accumulo.core.client.mock;
+/**
+ * @deprecated since 1.6.0; not intended for public api and you should not use
it.
+ */
+@Deprecated
public class MockSecurityOperations extends MockSecurityOperationsImpl {
MockSecurityOperations(MockAccumulo acu) {
[06/17] git commit: ACCUMULO-2734 Fix trivial javadoc bug
ACCUMULO-2734 Fix trivial javadoc bug
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83ef6b84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83ef6b84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83ef6b84
Branch: refs/heads/master
Commit: 83ef6b8433e25477993308cb5a2acc30d9c26246
Parents: 700bcf5
Author: Christopher Tubbs ctubb...@apache.org
Authored: Fri Apr 25 13:42:41 2014 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Fri Apr 25 13:42:41 2014 -0400
--
.../accumulo/core/client/admin/TableOperations.java | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/83ef6b84/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 0823656..e06baae 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -134,16 +134,15 @@ public interface TableOperations {
* Note that while the documentation for Text specifies that its bytestream
should be UTF-8, the encoding is not enforced by operations that work with byte
arrays.
* p
* For example, you can create 256 evenly-sliced splits via the following
code sample even though the given byte sequences are not valid UTF-8.
+ *
* pre
- * {@code
- * TableOperations tableOps = connector.tableOperations();
- * TreeSetText splits = new TreeSetText();
- * for (int i = 0; i 256; i++) {
- *byte[] bytes = { (byte) i };
- *splits.add(new Text(bytes));
- * }
- * tableOps.addSplits(TABLE_NAME, splits);
+ * TableOperations tableOps = connector.tableOperations();
+ * TreeSetlt;Textgt; splits = new TreeSetlt;Textgt;();
+ * for (int i = 0; i lt; 256; i++) {
+ * byte[] bytes = {(byte) i};
+ * splits.add(new Text(bytes));
* }
+ * tableOps.addSplits(TABLE_NAME, splits);
* /pre
*
* @param tableName
[17/17] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eae953e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eae953e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eae953e6 Branch: refs/heads/master Commit: eae953e6afd36885f502d368b946a35d380cb14d Parents: f277fea 448e757 Author: Sean Busbey bus...@cloudera.com Authored: Fri Apr 25 18:11:43 2014 -0500 Committer: Sean Busbey bus...@cloudera.com Committed: Fri Apr 25 18:11:43 2014 -0500 -- CHANGES | 73 1 file changed, 24 insertions(+), 49 deletions(-) --
[16/17] git commit: ACCUMULO-2726 cleanup for master's branch.
ACCUMULO-2726 cleanup for master's branch.
* remove things we deprecated in 1.6.0 related to this ticket.
* make sure changes in the implementations in master are reflected in the new
implementation locations
* make names in Mock consistent
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f277fea9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f277fea9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f277fea9
Branch: refs/heads/master
Commit: f277fea98588b5e9f97d237a6479b9dfa08a37a1
Parents: 592c8b0
Author: Sean Busbey bus...@cloudera.com
Authored: Fri Apr 25 12:45:22 2014 -0500
Committer: Sean Busbey bus...@cloudera.com
Committed: Fri Apr 25 16:08:24 2014 -0500
--
.../client/admin/InstanceOperationsImpl.java| 216 ---
.../client/admin/SecurityOperationsImpl.java| 291
.../client/admin/TableOperationsHelper.java | 208 ---
.../core/client/admin/TableOperationsImpl.java | 1581 --
.../core/client/impl/ConnectorImpl.java |4 -
.../client/impl/InstanceOperationsImpl.java | 18 +-
.../client/impl/SecurityOperationsImpl.java | 54 +-
.../core/client/impl/TableOperationsHelper.java | 14 +-
.../core/client/impl/TableOperationsImpl.java | 99 +-
.../core/client/mock/MockConnector.java |6 +-
.../client/mock/MockInstanceOperations.java | 73 +-
.../client/mock/MockInstanceOperationsImpl.java | 87 -
.../client/mock/MockSecurityOperations.java | 209 ++-
.../client/mock/MockSecurityOperationsImpl.java | 225 ---
.../core/client/mock/MockTableOperations.java | 431 -
.../client/mock/MockTableOperationsImpl.java| 447 -
.../core/client/mock/MockTabletLocator.java | 53 -
.../client/admin/TableOperationsHelperTest.java | 223 ---
.../apache/accumulo/shell/mock/MockShell.java | 39 -
19 files changed, 813 insertions(+), 3465 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f277fea9/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
deleted file mode 100644
index d3a6285..000
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.client.admin;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.security.Credentials;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
-import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.core.zookeeper.ZooUtil;
-import org.apache.accumulo.fate.zookeeper.ZooCache;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.accumulo.core.security.thrift.TCredentials;
-
-/**
- * Provides a class for administering the accumulo instance
- * @deprecated since 1.6.0; not intended for public api and you should not use
it.
- */
-@Deprecated
-public class InstanceOperationsImpl extends
org.apache.accumulo.core.client.impl.InstanceOperationsImpl {
-
- /**
- * @param instance
- *
[03/17] ACCUMULO-2726 Adds back missing methods for binary backwards compat with non-Deprecated methods from 1.5.0. Marks things that we're for sure removing with @Deprecated; mostly things that shoul
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4454a06/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
new file mode 100644
index 000..2dac1fa
--- /dev/null
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsHelper.java
@@ -0,0 +1,214 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.client.impl;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.client.admin.NamespaceOperations;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
+
+public abstract class NamespaceOperationsHelper implements NamespaceOperations
{
+
+ @Override
+ public String systemNamespace() {
+return Namespaces.ACCUMULO_NAMESPACE;
+ }
+
+ @Override
+ public String defaultNamespace() {
+return Namespaces.DEFAULT_NAMESPACE;
+ }
+
+ @Override
+ public void attachIterator(String namespace, IteratorSetting setting) throws
AccumuloSecurityException, AccumuloException, NamespaceNotFoundException {
+attachIterator(namespace, setting, EnumSet.allOf(IteratorScope.class));
+ }
+
+ @Override
+ public void attachIterator(String namespace, IteratorSetting setting,
EnumSetIteratorScope scopes) throws AccumuloSecurityException,
AccumuloException,
+ NamespaceNotFoundException {
+checkIteratorConflicts(namespace, setting, scopes);
+for (IteratorScope scope : scopes) {
+ String root = String.format(%s%s.%s, Property.TABLE_ITERATOR_PREFIX,
scope.name().toLowerCase(), setting.getName());
+ for (EntryString,String prop : setting.getOptions().entrySet()) {
+this.setProperty(namespace, root + .opt. + prop.getKey(),
prop.getValue());
+ }
+ this.setProperty(namespace, root, setting.getPriority() + , +
setting.getIteratorClass());
+}
+ }
+
+ @Override
+ public void removeIterator(String namespace, String name,
EnumSetIteratorScope scopes) throws AccumuloSecurityException,
AccumuloException,
+ NamespaceNotFoundException {
+if (!exists(namespace))
+ throw new NamespaceNotFoundException(null, namespace, null);
+MapString,String copy = new TreeMapString,String();
+for (EntryString,String property : this.getProperties(namespace)) {
+ copy.put(property.getKey(), property.getValue());
+}
+for (IteratorScope scope : scopes) {
+ String root = String.format(%s%s.%s, Property.TABLE_ITERATOR_PREFIX,
scope.name().toLowerCase(), name);
+ for (EntryString,String property : copy.entrySet()) {
+if (property.getKey().equals(root) ||
property.getKey().startsWith(root + .opt.))
+ this.removeProperty(namespace, property.getKey());
+ }
+}
+ }
+
+ @Override
+ public IteratorSetting getIteratorSetting(String namespace, String name,
IteratorScope scope) throws AccumuloSecurityException, AccumuloException,
+ NamespaceNotFoundException {
+if (!exists(namespace))
+ throw new NamespaceNotFoundException(null, namespace, null);
+int priority = -1;
+String classname = null;
+MapString,String settings = new HashMapString,String();
+
+String root = String.format(%s%s.%s, Property.TABLE_ITERATOR_PREFIX,
scope.name().toLowerCase(), name);
+String opt = root + .opt.;
+for (EntryString,String property : this.getProperties(namespace)) {
+ if (property.getKey().equals(root)) {
+String parts[] = property.getValue().split(,);
+if (parts.length != 2) {
+ throw new AccumuloException(Bad value for iterator
[13/17] ACCUMULO-2726 cleanup for master's branch.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f277fea9/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
b/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
deleted file mode 100644
index 1d91574..000
---
a/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.client.admin;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeMap;
-
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.client.TableExistsException;
-import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.security.Authorizations;
-import org.apache.hadoop.io.Text;
-
-/**
- * This class is left in place specifically to test for regressions against
the published version of TableOperationsHelper.
- */
-public class TableOperationsHelperTest extends
org.apache.accumulo.core.client.impl.TableOperationsHelperTest {
-
- @SuppressWarnings(deprecation)
- static class Tester extends TableOperationsHelper {
-MapString,MapString,String settings = new
HashMapString,MapString,String();
-
-@Override
-public SortedSetString list() {
- return null;
-}
-
-@Override
-public boolean exists(String tableName) {
- return true;
-}
-
-@Override
-public void create(String tableName) throws AccumuloException,
AccumuloSecurityException, TableExistsException {}
-
-@Override
-public void create(String tableName, boolean limitVersion) throws
AccumuloException, AccumuloSecurityException, TableExistsException {
- create(tableName, limitVersion, TimeType.MILLIS);
-}
-
-@Override
-public void create(String tableName, boolean versioningIter, TimeType
timeType) throws AccumuloException, AccumuloSecurityException,
TableExistsException {}
-
-@Override
-public void addSplits(String tableName, SortedSetText partitionKeys)
throws TableNotFoundException, AccumuloException, AccumuloSecurityException {}
-
-@Deprecated
-@Override
-public CollectionText getSplits(String tableName) throws
TableNotFoundException {
- return null;
-}
-
-@Deprecated
-@Override
-public CollectionText getSplits(String tableName, int maxSplits) throws
TableNotFoundException {
- return null;
-}
-
-@Override
-public CollectionText listSplits(String tableName) throws
TableNotFoundException {
- return null;
-}
-
-@Override
-public CollectionText listSplits(String tableName, int maxSplits) throws
TableNotFoundException {
- return null;
-}
-
-@Override
-public Text getMaxRow(String tableName, Authorizations auths, Text
startRow, boolean startInclusive, Text endRow, boolean endInclusive)
-throws TableNotFoundException, AccumuloException,
AccumuloSecurityException {
- return null;
-}
-
-@Override
-public void merge(String tableName, Text start, Text end) throws
AccumuloException, AccumuloSecurityException, TableNotFoundException {
-
-}
-
-@Override
-public void deleteRows(String tableName, Text start, Text end) throws
AccumuloException, AccumuloSecurityException, TableNotFoundException {}
-
-@Override
-public void compact(String tableName, Text start, Text end, boolean flush,
boolean wait) throws AccumuloSecurityException, TableNotFoundException,
-AccumuloException {}
-
-@Override
-public void
git commit: [maven-release-plugin] prepare release 1.6.0
Repository: accumulo Updated Branches: refs/heads/1.6.0-RC4 [created] 95ddea99e [maven-release-plugin] prepare release 1.6.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/95ddea99 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/95ddea99 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/95ddea99 Branch: refs/heads/1.6.0-RC4 Commit: 95ddea99e120102ce3316efbbe4948b574e59bc3 Parents: 448e757 Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Apr 25 20:13:36 2014 -0400 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Apr 25 20:13:36 2014 -0400 -- assemble/pom.xml| 2 +- core/pom.xml| 2 +- docs/pom.xml| 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml| 2 +- maven-plugin/pom.xml| 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml| 2 +- trace/pom.xml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/95ddea99/assemble/pom.xml -- diff --git a/assemble/pom.xml b/assemble/pom.xml index 4c84142..9ebd2de 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.accumulo/groupId artifactIdaccumulo-project/artifactId -version1.6.0-SNAPSHOT/version +version1.6.0/version /parent artifactIdaccumulo/artifactId packagingpom/packaging http://git-wip-us.apache.org/repos/asf/accumulo/blob/95ddea99/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 2509435..9859f92 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.accumulo/groupId artifactIdaccumulo-project/artifactId -version1.6.0-SNAPSHOT/version +version1.6.0/version /parent artifactIdaccumulo-core/artifactId nameCore/name http://git-wip-us.apache.org/repos/asf/accumulo/blob/95ddea99/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 5ceed97..dfc7f80 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.accumulo/groupId artifactIdaccumulo-project/artifactId -version1.6.0-SNAPSHOT/version +version1.6.0/version /parent artifactIdaccumulo-docs/artifactId packagingpom/packaging http://git-wip-us.apache.org/repos/asf/accumulo/blob/95ddea99/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index 35f0540..5403cba 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.accumulo/groupId artifactIdaccumulo-project/artifactId -version1.6.0-SNAPSHOT/version +version1.6.0/version relativePath../../pom.xml/relativePath /parent artifactIdaccumulo-examples-simple/artifactId http://git-wip-us.apache.org/repos/asf/accumulo/blob/95ddea99/fate/pom.xml -- diff --git a/fate/pom.xml b/fate/pom.xml index a3a7b42..3232c57 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.accumulo/groupId artifactIdaccumulo-project/artifactId -version1.6.0-SNAPSHOT/version +version1.6.0/version /parent artifactIdaccumulo-fate/artifactId nameFate/name http://git-wip-us.apache.org/repos/asf/accumulo/blob/95ddea99/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 7abb924..990599f 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.accumulo/groupId artifactIdaccumulo-project/artifactId -version1.6.0-SNAPSHOT/version +version1.6.0/version /parent artifactIdaccumulo-maven-plugin/artifactId packagingmaven-plugin/packaging http://git-wip-us.apache.org/repos/asf/accumulo/blob/95ddea99/minicluster/pom.xml -- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 0a3967d..a489d5c 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.accumulo/groupId
