[2/6] accumulo git commit: ACCUMULO-4104 Move m2e config to profile

2016-01-08 Thread ctubbsii 
ACCUMULO-4104 Move m2e config to profile


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e85f14be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e85f14be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e85f14be

Branch: refs/heads/1.7
Commit: e85f14be9074bb95d859db03d24988a8e92182f9
Parents: c8c0cf7
Author: Christopher Tubbs 
Authored: Sat Jan 9 01:41:50 2016 -0500
Committer: Christopher Tubbs 
Committed: Sat Jan 9 01:41:50 2016 -0500

--
 pom.xml | 361 +++
 1 file changed, 188 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e85f14be/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f04aa53..d51f406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -679,179 +679,6 @@
   1.1
 
 
-  org.eclipse.m2e
-  lifecycle-mapping
-  1.0.0
-  
-
-  
-
-  
-org.apache.maven.plugins
-maven-plugin-plugin
-[3.2,)
-
-  helpmojo
-  descriptor
-
-  
-  
-
-  
-
-
-  
-
com.googlecode.maven-java-formatter-plugin
-maven-java-formatter-plugin
-[0.4,)
-
-  format
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-checkstyle-plugin
-[2.13,)
-
-  check
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-dependency-plugin
-[2.0,)
-
-  copy-dependencies
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-remote-resources-plugin
-[1.0,)
-
-  process
-
-  
-  
-
-  
-
-
-  
-org.apache.rat
-apache-rat-plugin
-[0.8,)
-
-  check
-
-  
-  
-
-  
-
-
-  
-org.codehaus.mojo
-native-maven-plugin
-[1.0-alpha-7,)
-
-  compile
-  initialize
-  javah
-  link
-  unzipinc
-
-  
-  
-
-  
-
-
-  
-org.codehaus.mojo
-exec-maven-plugin
-[1.0,)
-
-  exec
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-enforcer-plugin
-[1.0,)
-
-  enforce
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-invoker-plugin
-[1.7,)
-
-  install
-
-  
-  
-
-  
-
-
-  
-com.github.ekryd.sortpom
-sortpom-maven-plugin
-[2.4.0,)
-
-  sort
-  verify
-
-

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-08 Thread ctubbsii 
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c4ef06f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c4ef06f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c4ef06f

Branch: refs/heads/master
Commit: 7c4ef06f4b51f8c458407abd3771bd87aca3a36a
Parents: 8ff2ca8 d55fef7
Author: Christopher Tubbs 
Authored: Sat Jan 9 02:18:26 2016 -0500
Committer: Christopher Tubbs 
Committed: Sat Jan 9 02:18:26 2016 -0500

--
 pom.xml | 361 +++
 1 file changed, 188 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c4ef06f/pom.xml
--
diff --cc pom.xml
index 4149d7a,0fa003a..3f90af2
--- a/pom.xml
+++ b/pom.xml
@@@ -1286,14 -1081,222 +1113,202 @@@


  
+   m2e
+   
+ 
+   m2e.version
+ 
+   
+   
+ 
+   
+ 
+ 
+   org.eclipse.m2e
+   lifecycle-mapping
+   1.0.0
+   
+ 
+   
+ 
+   
+ org.apache.maven.plugins
+ maven-plugin-plugin
+ [3.2,)
+ 
+   helpmojo
+   descriptor
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ 
com.googlecode.maven-java-formatter-plugin
+ maven-java-formatter-plugin
+ [0.4,)
+ 
+   format
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ [2.13,)
+ 
+   check
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ [2.0,)
+ 
+   copy-dependencies
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-remote-resources-plugin
+ [1.0,)
+ 
+   process
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.rat
+ apache-rat-plugin
+ [0.8,)
+ 
+   check
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.codehaus.mojo
+ native-maven-plugin
+ [1.0-alpha-7,)
+ 
+   compile
+   initialize
+   javah
+   link
+   unzipinc
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.codehaus.mojo
+ exec-maven-plugin
+ [1.0,)
+ 
+   exec
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ [1.0,)
+ 
+   enforce

[1/6] accumulo git commit: ACCUMULO-4104 Move m2e config to profile

2016-01-08 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 c8c0cf7f9 -> e85f14be9
  refs/heads/1.7 0ccba14f8 -> d55fef70c
  refs/heads/master 8ff2ca81c -> 7c4ef06f4


ACCUMULO-4104 Move m2e config to profile


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e85f14be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e85f14be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e85f14be

Branch: refs/heads/1.6
Commit: e85f14be9074bb95d859db03d24988a8e92182f9
Parents: c8c0cf7
Author: Christopher Tubbs 
Authored: Sat Jan 9 01:41:50 2016 -0500
Committer: Christopher Tubbs 
Committed: Sat Jan 9 01:41:50 2016 -0500

--
 pom.xml | 361 +++
 1 file changed, 188 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e85f14be/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f04aa53..d51f406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -679,179 +679,6 @@
   1.1
 
 
-  org.eclipse.m2e
-  lifecycle-mapping
-  1.0.0
-  
-
-  
-
-  
-org.apache.maven.plugins
-maven-plugin-plugin
-[3.2,)
-
-  helpmojo
-  descriptor
-
-  
-  
-
-  
-
-
-  
-
com.googlecode.maven-java-formatter-plugin
-maven-java-formatter-plugin
-[0.4,)
-
-  format
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-checkstyle-plugin
-[2.13,)
-
-  check
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-dependency-plugin
-[2.0,)
-
-  copy-dependencies
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-remote-resources-plugin
-[1.0,)
-
-  process
-
-  
-  
-
-  
-
-
-  
-org.apache.rat
-apache-rat-plugin
-[0.8,)
-
-  check
-
-  
-  
-
-  
-
-
-  
-org.codehaus.mojo
-native-maven-plugin
-[1.0-alpha-7,)
-
-  compile
-  initialize
-  javah
-  link
-  unzipinc
-
-  
-  
-
-  
-
-
-  
-org.codehaus.mojo
-exec-maven-plugin
-[1.0,)
-
-  exec
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-enforcer-plugin
-[1.0,)
-
-  enforce
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-invoker-plugin
-[1.7,)
-
-  install
-
-  
-  
-
-  
-
-
-  
-com.github.ekryd.sortpom
-

[3/6] accumulo git commit: ACCUMULO-4104 Move m2e config to profile

2016-01-08 Thread ctubbsii 
ACCUMULO-4104 Move m2e config to profile


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e85f14be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e85f14be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e85f14be

Branch: refs/heads/master
Commit: e85f14be9074bb95d859db03d24988a8e92182f9
Parents: c8c0cf7
Author: Christopher Tubbs 
Authored: Sat Jan 9 01:41:50 2016 -0500
Committer: Christopher Tubbs 
Committed: Sat Jan 9 01:41:50 2016 -0500

--
 pom.xml | 361 +++
 1 file changed, 188 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e85f14be/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f04aa53..d51f406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -679,179 +679,6 @@
   1.1
 
 
-  org.eclipse.m2e
-  lifecycle-mapping
-  1.0.0
-  
-
-  
-
-  
-org.apache.maven.plugins
-maven-plugin-plugin
-[3.2,)
-
-  helpmojo
-  descriptor
-
-  
-  
-
-  
-
-
-  
-
com.googlecode.maven-java-formatter-plugin
-maven-java-formatter-plugin
-[0.4,)
-
-  format
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-checkstyle-plugin
-[2.13,)
-
-  check
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-dependency-plugin
-[2.0,)
-
-  copy-dependencies
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-remote-resources-plugin
-[1.0,)
-
-  process
-
-  
-  
-
-  
-
-
-  
-org.apache.rat
-apache-rat-plugin
-[0.8,)
-
-  check
-
-  
-  
-
-  
-
-
-  
-org.codehaus.mojo
-native-maven-plugin
-[1.0-alpha-7,)
-
-  compile
-  initialize
-  javah
-  link
-  unzipinc
-
-  
-  
-
-  
-
-
-  
-org.codehaus.mojo
-exec-maven-plugin
-[1.0,)
-
-  exec
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-enforcer-plugin
-[1.0,)
-
-  enforce
-
-  
-  
-
-  
-
-
-  
-org.apache.maven.plugins
-maven-invoker-plugin
-[1.7,)
-
-  install
-
-  
-  
-
-  
-
-
-  
-com.github.ekryd.sortpom
-sortpom-maven-plugin
-[2.4.0,)
-
-  sort
-  verify
-
-

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-08 Thread ctubbsii 
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d55fef70
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d55fef70
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d55fef70

Branch: refs/heads/1.7
Commit: d55fef70c7801f7481e255b8e5ed91242b8a06aa
Parents: 0ccba14 e85f14b
Author: Christopher Tubbs 
Authored: Sat Jan 9 01:56:25 2016 -0500
Committer: Christopher Tubbs 
Committed: Sat Jan 9 01:56:25 2016 -0500

--
 pom.xml | 361 +++
 1 file changed, 188 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d55fef70/pom.xml
--
diff --cc pom.xml
index 644f506,d51f406..0fa003a
--- a/pom.xml
+++ b/pom.xml
@@@ -717,182 -671,14 +717,9 @@@
  
org.codehaus.mojo
exec-maven-plugin
 -  1.2.1
 -
 -
 -  org.codehaus.mojo
 -  latex-maven-plugin
 -  1.1
 +  1.4.0
  
  
-   org.eclipse.m2e
-   lifecycle-mapping
-   1.0.0
-   
- 
-   
- 
-   
- org.apache.maven.plugins
- maven-plugin-plugin
- [3.2,)
- 
-   helpmojo
-   descriptor
- 
-   
-   
- 
-   
- 
- 
-   
- 
com.googlecode.maven-java-formatter-plugin
- maven-java-formatter-plugin
- [0.4,)
- 
-   format
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-checkstyle-plugin
- [2.13,)
- 
-   check
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-dependency-plugin
- [2.0,)
- 
-   copy-dependencies
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-remote-resources-plugin
- [1.0,)
- 
-   process
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.rat
- apache-rat-plugin
- [0.8,)
- 
-   check
- 
-   
-   
- 
-   
- 
- 
-   
- org.codehaus.mojo
- native-maven-plugin
- [1.0-alpha-7,)
- 
-   compile
-   initialize
-   javah
-   link
-   unzipinc
- 
-   
-   
- 
-   
- 
- 
-   
- org.codehaus.mojo
- exec-maven-plugin
- [1.0,)
- 
-   exec
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-enforcer-plugin
- [1.0,)
- 
-   enforce
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-invoker-plugin
- [1.7,)
- 
-   install
- 
-   
-   
-

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-08 Thread ctubbsii 
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d55fef70
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d55fef70
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d55fef70

Branch: refs/heads/master
Commit: d55fef70c7801f7481e255b8e5ed91242b8a06aa
Parents: 0ccba14 e85f14b
Author: Christopher Tubbs 
Authored: Sat Jan 9 01:56:25 2016 -0500
Committer: Christopher Tubbs 
Committed: Sat Jan 9 01:56:25 2016 -0500

--
 pom.xml | 361 +++
 1 file changed, 188 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d55fef70/pom.xml
--
diff --cc pom.xml
index 644f506,d51f406..0fa003a
--- a/pom.xml
+++ b/pom.xml
@@@ -717,182 -671,14 +717,9 @@@
  
org.codehaus.mojo
exec-maven-plugin
 -  1.2.1
 -
 -
 -  org.codehaus.mojo
 -  latex-maven-plugin
 -  1.1
 +  1.4.0
  
  
-   org.eclipse.m2e
-   lifecycle-mapping
-   1.0.0
-   
- 
-   
- 
-   
- org.apache.maven.plugins
- maven-plugin-plugin
- [3.2,)
- 
-   helpmojo
-   descriptor
- 
-   
-   
- 
-   
- 
- 
-   
- 
com.googlecode.maven-java-formatter-plugin
- maven-java-formatter-plugin
- [0.4,)
- 
-   format
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-checkstyle-plugin
- [2.13,)
- 
-   check
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-dependency-plugin
- [2.0,)
- 
-   copy-dependencies
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-remote-resources-plugin
- [1.0,)
- 
-   process
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.rat
- apache-rat-plugin
- [0.8,)
- 
-   check
- 
-   
-   
- 
-   
- 
- 
-   
- org.codehaus.mojo
- native-maven-plugin
- [1.0-alpha-7,)
- 
-   compile
-   initialize
-   javah
-   link
-   unzipinc
- 
-   
-   
- 
-   
- 
- 
-   
- org.codehaus.mojo
- exec-maven-plugin
- [1.0,)
- 
-   exec
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-enforcer-plugin
- [1.0,)
- 
-   enforce
- 
-   
-   
- 
-   
- 
- 
-   
- org.apache.maven.plugins
- maven-invoker-plugin
- [1.7,)
- 
-   install
- 
-   
-   
-

[04/19] accumulo git commit: ACCUMULO-4102 Configure javadoc plugin for jdk8

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Configure javadoc plugin for jdk8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4169a12b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4169a12b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4169a12b

Branch: refs/heads/1.6
Commit: 4169a12b52c6e6744a975eab60f8b29fdcb2f22b
Parents: f38d5e7
Author: Christopher Tubbs 
Authored: Fri Jan 8 17:43:57 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 17:43:57 2016 -0500

--
 pom.xml | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4169a12b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ea40f31..6138dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1401,11 +1401,28 @@
 
   jdk8
   
-[1.8,)
+[1.8,1.9)
   
   
 3.0.1
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  
+${project.reporting.outputEncoding}
+true
+1.8
+-J-Xmx512m
+
-Xdoclint:all,-Xdoclint:-missing
+  
+
+  
+
+

[05/19] accumulo git commit: ACCUMULO-4102 Configure javadoc plugin for jdk8

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Configure javadoc plugin for jdk8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4169a12b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4169a12b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4169a12b

Branch: refs/heads/1.7
Commit: 4169a12b52c6e6744a975eab60f8b29fdcb2f22b
Parents: f38d5e7
Author: Christopher Tubbs 
Authored: Fri Jan 8 17:43:57 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 17:43:57 2016 -0500

--
 pom.xml | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4169a12b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ea40f31..6138dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1401,11 +1401,28 @@
 
   jdk8
   
-[1.8,)
+[1.8,1.9)
   
   
 3.0.1
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  
+${project.reporting.outputEncoding}
+true
+1.8
+-J-Xmx512m
+
-Xdoclint:all,-Xdoclint:-missing
+  
+
+  
+
+

[01/19] accumulo git commit: ACCUMULO-4103 Add jdk8 profile for findbugs

2016-01-08 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 05811af38 -> c8c0cf7f9
  refs/heads/1.7 d505843e1 -> 0ccba14f8
  refs/heads/master c252d1a6e -> 8ff2ca81c


ACCUMULO-4103 Add jdk8 profile for findbugs

* Automatically set findbugs.version for jdk8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f38d5e7f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f38d5e7f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f38d5e7f

Branch: refs/heads/1.6
Commit: f38d5e7f69d21eec6d197e2109575bbc60b3eae0
Parents: 05811af
Author: Christopher Tubbs 
Authored: Fri Jan 8 14:30:35 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 15:34:07 2016 -0500

--
 pom.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f38d5e7f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 833bf44..ea40f31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1398,5 +1398,14 @@
 1.7.5
   
 
+
+  jdk8
+  
+[1.8,)
+  
+  
+3.0.1
+  
+

[13/19] accumulo git commit: Merge branch 'javadoc-jdk8-1.6' into javadoc-jdk8-1.7

2016-01-08 Thread ctubbsii 
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
--
diff --cc 
server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
index 01bd23a,000..bf582c7
mode 100644,00..100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
@@@ -1,167 -1,0 +1,167 @@@
 +/*
 + * 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.monitor.servlets;
 +
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +
 +import javax.servlet.http.HttpServletRequest;
 +import javax.servlet.http.HttpServletResponse;
 +
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
 +import org.apache.accumulo.core.replication.ReplicationConstants;
 +import org.apache.accumulo.core.replication.ReplicationTable;
 +import org.apache.accumulo.core.replication.ReplicationTarget;
 +import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.monitor.Monitor;
 +import org.apache.accumulo.monitor.util.Table;
 +import org.apache.accumulo.monitor.util.celltypes.NumberType;
 +import 
org.apache.accumulo.server.replication.DistributedWorkQueueWorkAssignerHelper;
 +import org.apache.accumulo.server.replication.ReplicationUtil;
 +import org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
 +import org.apache.zookeeper.KeeperException;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +/**
 + *
 + */
 +public class ReplicationServlet extends BasicServlet {
 +  private static final Logger log = 
LoggerFactory.getLogger(ReplicationServlet.class);
 +
 +  private static final long serialVersionUID = 1L;
 +
 +  // transient because it's not serializable and servlets are serializable
 +  private transient volatile ReplicationUtil replicationUtil = null;
 +
 +  private synchronized ReplicationUtil getReplicationUtil() {
 +// make transient replicationUtil available as needed
 +if (replicationUtil == null) {
 +  replicationUtil = new ReplicationUtil(Monitor.getContext());
 +}
 +return replicationUtil;
 +  }
 +
 +  @Override
 +  protected String getTitle(HttpServletRequest req) {
 +return "Replication Overview";
 +  }
 +
 +  @Override
 +  protected void pageBody(HttpServletRequest req, HttpServletResponse 
response, StringBuilder sb) throws Exception {
 +final Connector conn = Monitor.getContext().getConnector();
 +final MasterMonitorInfo mmi = Monitor.getMmi();
 +
 +// The total number of "slots" we have to replicate data
 +int totalWorkQueueSize = 
getReplicationUtil().getMaxReplicationThreads(mmi);
 +
 +TableOperations tops = conn.tableOperations();
 +if (!ReplicationTable.isOnline(conn)) {
 +  banner(sb, "", "Replication table is offline");
 +  return;
 +}
 +
 +Table replicationStats = new Table("replicationStats", "Replication 
Status");
 +replicationStats.addSortableColumn("Table");
 +replicationStats.addSortableColumn("Peer");
 +replicationStats.addSortableColumn("Remote Identifier");
 +replicationStats.addSortableColumn("ReplicaSystem Type");
 +replicationStats.addSortableColumn("Files needing replication", new 
NumberType(), null);
 +
 +Map peers = getReplicationUtil().getPeers();
 +
 +// The total set of configured targets
 +Set allConfiguredTargets = 
getReplicationUtil().getReplicationTargets();
 +
 +// Number of files per target we have to replicate
 +Map targetCounts = 
getReplicationUtil().getPendingReplications();
 +
 +Map tableNameToId = tops.tableIdMap();
 +Map tableIdToName = 
getReplicationUtil().invert(tableNameToId);
 +
 +long filesPendingOverAllTargets = 0l;
 +for (ReplicationTarget configuredTarget : allConfiguredTargets) {
 +  String

[16/19] accumulo git commit: Merge branch 'javadoc-jdk8-1.6' into javadoc-jdk8-1.7

2016-01-08 Thread ctubbsii 
Merge branch 'javadoc-jdk8-1.6' into javadoc-jdk8-1.7

* Merge to 1.7 branch, with additional javadoc fixes so build works
* Prevent merging maven-plugin-plugin version 3.4 specification (as it only 
applied to 1.6 branch)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6becfbd3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6becfbd3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6becfbd3

Branch: refs/heads/master
Commit: 6becfbd3852dc10f46658827d064f7d1e9ee6c45
Parents: d505843 c8c0cf7
Author: Christopher Tubbs 
Authored: Fri Jan 8 22:04:57 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 22:04:57 2016 -0500

--
 .../core/bloomfilter/DynamicBloomFilter.java|  4 +--
 .../accumulo/core/client/BatchWriterConfig.java | 10 +++---
 .../core/client/ConditionalWriterConfig.java|  4 +--
 .../client/mapred/AccumuloFileOutputFormat.java |  4 +--
 .../mapreduce/AccumuloFileOutputFormat.java |  4 +--
 .../lib/impl/FileOutputConfigurator.java|  4 +--
 .../lib/util/FileOutputConfigurator.java|  4 +--
 .../security/tokens/AuthenticationToken.java|  2 +-
 .../core/constraints/VisibilityConstraint.java  |  1 -
 .../java/org/apache/accumulo/core/data/Key.java |  2 +-
 .../org/apache/accumulo/core/data/Range.java|  6 ++--
 .../file/blockfile/cache/CachedBlockQueue.java  |  2 +-
 .../core/file/blockfile/cache/ClassSize.java|  4 +--
 .../accumulo/core/file/rfile/bcfile/Utils.java  | 35 +++-
 .../user/WholeColumnFamilyIterator.java |  4 +--
 .../core/metadata/ServicerForMetadataTable.java |  2 +-
 .../core/metadata/ServicerForRootTable.java |  2 +-
 .../core/metadata/ServicerForUserTables.java|  2 +-
 .../core/metadata/schema/MetadataSchema.java|  2 +-
 .../core/replication/ReplicationSchema.java |  6 ++--
 .../core/security/ColumnVisibility.java |  8 ++---
 .../security/crypto/CryptoModuleParameters.java |  7 +---
 .../accumulo/core/conf/config-header.html   | 12 +++
 .../examples/simple/filedata/ChunkCombiner.java | 18 +-
 pom.xml | 26 +++
 .../apache/accumulo/server/ServerConstants.java |  2 +-
 .../server/master/balancer/GroupBalancer.java   |  4 +--
 .../master/balancer/RegexGroupBalancer.java |  6 ++--
 .../server/security/SecurityOperation.java  |  6 ++--
 .../server/security/UserImpersonation.java  |  2 +-
 .../server/security/SystemCredentialsTest.java  |  2 +-
 .../replication/SequentialWorkAssigner.java |  2 +-
 .../monitor/servlets/DefaultServlet.java|  2 +-
 .../monitor/servlets/ReplicationServlet.java|  2 +-
 .../monitor/servlets/TablesServlet.java |  4 +--
 .../tserver/compaction/CompactionStrategy.java  |  6 ++--
 .../test/replication/merkle/package-info.java   |  9 ++---
 .../replication/merkle/skvi/DigestIterator.java |  2 +-
 38 files changed, 124 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 6ceefad,320ecf4..3421f76
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@@ -49,10 -48,8 +49,10 @@@ public class BatchWriterConfig implemen
private static final Integer DEFAULT_MAX_WRITE_THREADS = 3;
private Integer maxWriteThreads = null;
  
 +  private Durability durability = Durability.DEFAULT;
 +
/**
-* Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
+* Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
 * If set to a value smaller than a single mutation, then it will {@link 
BatchWriter#flush()} after each added mutation. Must be non-negative.
 *
 * 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java

[07/19] accumulo git commit: ACCUMULO-4102 Bump maven-plugin-plugin to 3.4

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Bump maven-plugin-plugin to 3.4

* Bump maven-plugin-plugin so the generated HelpMojo doesn't have
  javadoc problems (especially on JDK8)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7cc81374
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cc81374
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cc81374

Branch: refs/heads/1.6
Commit: 7cc81374233b0f8ba3a243f6084eecce9d6a1e6f
Parents: 4169a12
Author: Christopher Tubbs 
Authored: Fri Jan 8 20:45:03 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 20:45:49 2016 -0500

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7cc81374/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6138dbc..f04aa53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -904,6 +904,11 @@
 
   
 
+
+  org.apache.maven.plugins
+  maven-plugin-plugin
+  3.4
+

[06/19] accumulo git commit: ACCUMULO-4102 Configure javadoc plugin for jdk8

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Configure javadoc plugin for jdk8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4169a12b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4169a12b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4169a12b

Branch: refs/heads/master
Commit: 4169a12b52c6e6744a975eab60f8b29fdcb2f22b
Parents: f38d5e7
Author: Christopher Tubbs 
Authored: Fri Jan 8 17:43:57 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 17:43:57 2016 -0500

--
 pom.xml | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4169a12b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ea40f31..6138dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1401,11 +1401,28 @@
 
   jdk8
   
-[1.8,)
+[1.8,1.9)
   
   
 3.0.1
   
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  
+${project.reporting.outputEncoding}
+true
+1.8
+-J-Xmx512m
+
-Xdoclint:all,-Xdoclint:-missing
+  
+
+  
+
+

[14/19] accumulo git commit: Merge branch 'javadoc-jdk8-1.6' into javadoc-jdk8-1.7

2016-01-08 Thread ctubbsii 
Merge branch 'javadoc-jdk8-1.6' into javadoc-jdk8-1.7

* Merge to 1.7 branch, with additional javadoc fixes so build works
* Prevent merging maven-plugin-plugin version 3.4 specification (as it only 
applied to 1.6 branch)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6becfbd3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6becfbd3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6becfbd3

Branch: refs/heads/1.7
Commit: 6becfbd3852dc10f46658827d064f7d1e9ee6c45
Parents: d505843 c8c0cf7
Author: Christopher Tubbs 
Authored: Fri Jan 8 22:04:57 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 22:04:57 2016 -0500

--
 .../core/bloomfilter/DynamicBloomFilter.java|  4 +--
 .../accumulo/core/client/BatchWriterConfig.java | 10 +++---
 .../core/client/ConditionalWriterConfig.java|  4 +--
 .../client/mapred/AccumuloFileOutputFormat.java |  4 +--
 .../mapreduce/AccumuloFileOutputFormat.java |  4 +--
 .../lib/impl/FileOutputConfigurator.java|  4 +--
 .../lib/util/FileOutputConfigurator.java|  4 +--
 .../security/tokens/AuthenticationToken.java|  2 +-
 .../core/constraints/VisibilityConstraint.java  |  1 -
 .../java/org/apache/accumulo/core/data/Key.java |  2 +-
 .../org/apache/accumulo/core/data/Range.java|  6 ++--
 .../file/blockfile/cache/CachedBlockQueue.java  |  2 +-
 .../core/file/blockfile/cache/ClassSize.java|  4 +--
 .../accumulo/core/file/rfile/bcfile/Utils.java  | 35 +++-
 .../user/WholeColumnFamilyIterator.java |  4 +--
 .../core/metadata/ServicerForMetadataTable.java |  2 +-
 .../core/metadata/ServicerForRootTable.java |  2 +-
 .../core/metadata/ServicerForUserTables.java|  2 +-
 .../core/metadata/schema/MetadataSchema.java|  2 +-
 .../core/replication/ReplicationSchema.java |  6 ++--
 .../core/security/ColumnVisibility.java |  8 ++---
 .../security/crypto/CryptoModuleParameters.java |  7 +---
 .../accumulo/core/conf/config-header.html   | 12 +++
 .../examples/simple/filedata/ChunkCombiner.java | 18 +-
 pom.xml | 26 +++
 .../apache/accumulo/server/ServerConstants.java |  2 +-
 .../server/master/balancer/GroupBalancer.java   |  4 +--
 .../master/balancer/RegexGroupBalancer.java |  6 ++--
 .../server/security/SecurityOperation.java  |  6 ++--
 .../server/security/UserImpersonation.java  |  2 +-
 .../server/security/SystemCredentialsTest.java  |  2 +-
 .../replication/SequentialWorkAssigner.java |  2 +-
 .../monitor/servlets/DefaultServlet.java|  2 +-
 .../monitor/servlets/ReplicationServlet.java|  2 +-
 .../monitor/servlets/TablesServlet.java |  4 +--
 .../tserver/compaction/CompactionStrategy.java  |  6 ++--
 .../test/replication/merkle/package-info.java   |  9 ++---
 .../replication/merkle/skvi/DigestIterator.java |  2 +-
 38 files changed, 124 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 6ceefad,320ecf4..3421f76
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@@ -49,10 -48,8 +49,10 @@@ public class BatchWriterConfig implemen
private static final Integer DEFAULT_MAX_WRITE_THREADS = 3;
private Integer maxWriteThreads = null;
  
 +  private Durability durability = Durability.DEFAULT;
 +
/**
-* Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
+* Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
 * If set to a value smaller than a single mutation, then it will {@link 
BatchWriter#flush()} after each added mutation. Must be non-negative.
 *
 * 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java

[09/19] accumulo git commit: ACCUMULO-4102 Bump maven-plugin-plugin to 3.4

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Bump maven-plugin-plugin to 3.4

* Bump maven-plugin-plugin so the generated HelpMojo doesn't have
  javadoc problems (especially on JDK8)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7cc81374
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cc81374
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cc81374

Branch: refs/heads/1.7
Commit: 7cc81374233b0f8ba3a243f6084eecce9d6a1e6f
Parents: 4169a12
Author: Christopher Tubbs 
Authored: Fri Jan 8 20:45:03 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 20:45:49 2016 -0500

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7cc81374/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6138dbc..f04aa53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -904,6 +904,11 @@
 
   
 
+
+  org.apache.maven.plugins
+  maven-plugin-plugin
+  3.4
+

[18/19] accumulo git commit: ACCUMULO-4203 Remove unnecessary findbugs.version 1.7 branch

2016-01-08 Thread ctubbsii 
ACCUMULO-4203 Remove unnecessary findbugs.version 1.7 branch

* findbugs.version defaults to 3.0.1 in 1.7 pom, which works with JDK7
  and JDK8, so no need to put it in the JDK8 profile.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0ccba14f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ccba14f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ccba14f

Branch: refs/heads/1.7
Commit: 0ccba14f8daf2352a12cd8f6a97b18373131a792
Parents: 6becfbd
Author: Christopher Tubbs 
Authored: Fri Jan 8 22:12:28 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 22:12:28 2016 -0500

--
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ccba14f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 55bbaab..644f506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1409,9 +1409,6 @@
   
 [1.8,1.9)
   
-  
-3.0.1
-

[11/19] accumulo git commit: ACCUMULO-4102 Fix bad javadocs

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Fix bad javadocs


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8c0cf7f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8c0cf7f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8c0cf7f

Branch: refs/heads/master
Commit: c8c0cf7f90023a49cbb2b790f30819810bed0bf9
Parents: 7cc8137
Author: Christopher Tubbs 
Authored: Fri Jan 8 19:50:42 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 20:48:51 2016 -0500

--
 .../core/bloomfilter/DynamicBloomFilter.java|  4 +--
 .../accumulo/core/client/BatchWriterConfig.java | 10 +++---
 .../core/client/ConditionalWriterConfig.java|  4 +--
 .../client/mapred/AccumuloFileOutputFormat.java |  4 +--
 .../mapreduce/AccumuloFileOutputFormat.java |  6 ++--
 .../lib/impl/FileOutputConfigurator.java|  4 +--
 .../lib/util/FileOutputConfigurator.java|  4 +--
 .../security/tokens/AuthenticationToken.java|  2 +-
 .../core/conf/AccumuloConfiguration.java|  2 +-
 .../org/apache/accumulo/core/data/Range.java|  8 ++---
 .../file/blockfile/cache/CachedBlockQueue.java  |  2 +-
 .../core/file/blockfile/cache/ClassSize.java|  4 +--
 .../accumulo/core/file/rfile/bcfile/Utils.java  | 35 +++-
 .../user/WholeColumnFamilyIterator.java |  4 +--
 .../core/metadata/ServicerForMetadataTable.java |  2 +-
 .../core/metadata/ServicerForRootTable.java |  2 +-
 .../core/metadata/ServicerForUserTables.java|  2 +-
 .../core/security/ColumnVisibility.java |  8 ++---
 .../core/security/VisibilityConstraint.java |  1 -
 .../security/crypto/CryptoModuleParameters.java |  7 +---
 .../examples/simple/filedata/ChunkCombiner.java | 18 +-
 .../apache/accumulo/server/ServerConstants.java |  2 +-
 .../server/security/SecurityOperation.java  |  6 ++--
 .../server/security/SystemCredentialsTest.java  |  2 +-
 .../monitor/servlets/DefaultServlet.java|  2 +-
 .../monitor/servlets/TablesServlet.java |  4 +--
 26 files changed, 73 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8c0cf7f/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
 
b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
index 740bdda..11e765a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
@@ -60,8 +60,8 @@ import org.apache.hadoop.util.bloom.Key;
  * 
  * A dynamic Bloom filter (DBF) makes use of a s * m bit matrix 
but each of the s rows is a standard Bloom filter. The creation
  * process of a DBF is iterative. At the start, the DBF is a 1 * 
m bit matrix, i.e., it is composed of a single standard Bloom filter. It 
assumes
- * that nr elements are recorded in the initial bit 
vector, where nr <= n (n is the 
cardinality of
- * the set A to record in the filter).
+ * that nr elements are recorded in the initial bit 
vector, where nr = n (n is the 
cardinality
+ * of the set A to record in the filter).
  * 
  * As the size of A grows during the execution of the 
application, several keys must be inserted in the DBF. When inserting a key 
into the DBF, one
  * must first get an active Bloom filter in the matrix. A Bloom filter is 
active when the number of recorded keys, nr, is 
strictly less

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8c0cf7f/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java 
b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 08eb853..320ecf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -49,7 +49,7 @@ public class BatchWriterConfig implements Writable {
   private Integer maxWriteThreads = null;
 
   /**
-   * Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
+   * Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
* If set to a value smaller than a single mutation, then it will {@link 
BatchWriter#flush()} after each added mutation. Must be non-negative.
*
* 
@@ -69,11 +69,11 @@ public class BatchWriterConfig

[19/19] accumulo git commit: Merge branch 'javadoc-jdk8-1.7'

2016-01-08 Thread ctubbsii 
Merge branch 'javadoc-jdk8-1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ff2ca81
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ff2ca81
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ff2ca81

Branch: refs/heads/master
Commit: 8ff2ca81cd6b2e7ddc76197bd60cfea64eac465f
Parents: c252d1a 0ccba14
Author: Christopher Tubbs 
Authored: Fri Jan 8 22:35:43 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 22:35:43 2016 -0500

--
 .../core/bloomfilter/DynamicBloomFilter.java|  4 +--
 .../accumulo/core/client/BatchWriterConfig.java | 10 +++---
 .../core/client/ConditionalWriterConfig.java|  4 +--
 .../accumulo/core/client/ScannerBase.java   |  2 --
 .../client/mapred/AccumuloFileOutputFormat.java |  4 +--
 .../mapreduce/AccumuloFileOutputFormat.java |  4 +--
 .../lib/impl/FileOutputConfigurator.java|  4 +--
 .../lib/util/FileOutputConfigurator.java|  4 +--
 .../security/tokens/AuthenticationToken.java|  2 +-
 .../core/constraints/VisibilityConstraint.java  |  1 -
 .../java/org/apache/accumulo/core/data/Key.java |  2 +-
 .../org/apache/accumulo/core/data/Range.java|  6 ++--
 .../file/blockfile/cache/CachedBlockQueue.java  |  2 +-
 .../core/file/blockfile/cache/ClassSize.java|  4 +--
 .../accumulo/core/file/rfile/bcfile/Utils.java  | 35 +++-
 .../core/iterators/IteratorEnvironment.java |  2 --
 .../user/WholeColumnFamilyIterator.java |  4 +--
 .../core/metadata/ServicerForMetadataTable.java |  2 +-
 .../core/metadata/ServicerForRootTable.java |  2 +-
 .../core/metadata/ServicerForUserTables.java|  2 +-
 .../core/metadata/schema/MetadataSchema.java|  2 +-
 .../core/replication/ReplicationSchema.java |  6 ++--
 .../accumulo/core/sample/RowColumnSampler.java  |  4 +--
 .../core/security/ColumnVisibility.java |  8 ++---
 .../security/crypto/CryptoModuleParameters.java |  7 +---
 .../org/apache/accumulo/core/util/OpTimer.java  |  7 ++--
 .../accumulo/core/conf/config-header.html   | 12 +++
 .../examples/simple/filedata/ChunkCombiner.java | 18 +-
 pom.xml | 23 +
 .../apache/accumulo/server/ServerConstants.java |  2 +-
 .../server/master/balancer/GroupBalancer.java   |  4 +--
 .../master/balancer/RegexGroupBalancer.java |  6 ++--
 .../server/security/SecurityOperation.java  |  6 ++--
 .../server/security/UserImpersonation.java  |  2 +-
 .../server/security/SystemCredentialsTest.java  |  2 +-
 .../replication/SequentialWorkAssigner.java |  2 +-
 .../monitor/servlets/DefaultServlet.java|  2 +-
 .../monitor/servlets/ReplicationServlet.java|  2 +-
 .../monitor/servlets/TablesServlet.java |  4 +--
 .../tserver/compaction/CompactionStrategy.java  |  6 ++--
 .../accumulo/test/functional/ScanIdIT.java  | 11 +++---
 .../test/replication/merkle/package-info.java   |  9 ++---
 .../replication/merkle/skvi/DigestIterator.java |  2 +-
 43 files changed, 135 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8ff2ca81/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8ff2ca81/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index aed67bc,b5692d2..51f6fae
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@@ -175,98 -174,4 +175,96 @@@ public interface ScannerBase extends It
 * @return The authorizations set on the scanner instance
 */
Authorizations getAuthorizations();
 +
 +  /**
 +   * Setting this will cause the scanner to read sample data, as long as that 
sample data was generated with the given configuration. By default this is not 
set
 +   * and all data is read.
 +   *
 +   * 
 +   * One way to use this method is as follows, where the sampler 
configuration is obtained from the table configuration. Sample data can be 
generated in many
 +   * different ways, so its important to verify the sample data configuration 
meets expectations.
 +   *
-* 
-*
 +   * 
 +   * 
 +   *   // could cache this if creating many scanners to avoid RPCs.
 +   *   SamplerConfiguration samplerConfig = 
connector.tableOperations().getSamplerConfiguration(table);
 +   *   // verify table's sample data is generated in an expected way before 
using
 +   *

[17/19] accumulo git commit: ACCUMULO-4203 Remove unnecessary findbugs.version 1.7 branch

2016-01-08 Thread ctubbsii 
ACCUMULO-4203 Remove unnecessary findbugs.version 1.7 branch

* findbugs.version defaults to 3.0.1 in 1.7 pom, which works with JDK7
  and JDK8, so no need to put it in the JDK8 profile.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0ccba14f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ccba14f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ccba14f

Branch: refs/heads/master
Commit: 0ccba14f8daf2352a12cd8f6a97b18373131a792
Parents: 6becfbd
Author: Christopher Tubbs 
Authored: Fri Jan 8 22:12:28 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 22:12:28 2016 -0500

--
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ccba14f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 55bbaab..644f506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1409,9 +1409,6 @@
   
 [1.8,1.9)
   
-  
-3.0.1
-

[10/19] accumulo git commit: ACCUMULO-4102 Fix bad javadocs

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Fix bad javadocs


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8c0cf7f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8c0cf7f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8c0cf7f

Branch: refs/heads/1.6
Commit: c8c0cf7f90023a49cbb2b790f30819810bed0bf9
Parents: 7cc8137
Author: Christopher Tubbs 
Authored: Fri Jan 8 19:50:42 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 20:48:51 2016 -0500

--
 .../core/bloomfilter/DynamicBloomFilter.java|  4 +--
 .../accumulo/core/client/BatchWriterConfig.java | 10 +++---
 .../core/client/ConditionalWriterConfig.java|  4 +--
 .../client/mapred/AccumuloFileOutputFormat.java |  4 +--
 .../mapreduce/AccumuloFileOutputFormat.java |  6 ++--
 .../lib/impl/FileOutputConfigurator.java|  4 +--
 .../lib/util/FileOutputConfigurator.java|  4 +--
 .../security/tokens/AuthenticationToken.java|  2 +-
 .../core/conf/AccumuloConfiguration.java|  2 +-
 .../org/apache/accumulo/core/data/Range.java|  8 ++---
 .../file/blockfile/cache/CachedBlockQueue.java  |  2 +-
 .../core/file/blockfile/cache/ClassSize.java|  4 +--
 .../accumulo/core/file/rfile/bcfile/Utils.java  | 35 +++-
 .../user/WholeColumnFamilyIterator.java |  4 +--
 .../core/metadata/ServicerForMetadataTable.java |  2 +-
 .../core/metadata/ServicerForRootTable.java |  2 +-
 .../core/metadata/ServicerForUserTables.java|  2 +-
 .../core/security/ColumnVisibility.java |  8 ++---
 .../core/security/VisibilityConstraint.java |  1 -
 .../security/crypto/CryptoModuleParameters.java |  7 +---
 .../examples/simple/filedata/ChunkCombiner.java | 18 +-
 .../apache/accumulo/server/ServerConstants.java |  2 +-
 .../server/security/SecurityOperation.java  |  6 ++--
 .../server/security/SystemCredentialsTest.java  |  2 +-
 .../monitor/servlets/DefaultServlet.java|  2 +-
 .../monitor/servlets/TablesServlet.java |  4 +--
 26 files changed, 73 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8c0cf7f/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
 
b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
index 740bdda..11e765a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
@@ -60,8 +60,8 @@ import org.apache.hadoop.util.bloom.Key;
  * 
  * A dynamic Bloom filter (DBF) makes use of a s * m bit matrix 
but each of the s rows is a standard Bloom filter. The creation
  * process of a DBF is iterative. At the start, the DBF is a 1 * 
m bit matrix, i.e., it is composed of a single standard Bloom filter. It 
assumes
- * that nr elements are recorded in the initial bit 
vector, where nr <= n (n is the 
cardinality of
- * the set A to record in the filter).
+ * that nr elements are recorded in the initial bit 
vector, where nr = n (n is the 
cardinality
+ * of the set A to record in the filter).
  * 
  * As the size of A grows during the execution of the 
application, several keys must be inserted in the DBF. When inserting a key 
into the DBF, one
  * must first get an active Bloom filter in the matrix. A Bloom filter is 
active when the number of recorded keys, nr, is 
strictly less

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8c0cf7f/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java 
b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 08eb853..320ecf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -49,7 +49,7 @@ public class BatchWriterConfig implements Writable {
   private Integer maxWriteThreads = null;
 
   /**
-   * Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
+   * Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
* If set to a value smaller than a single mutation, then it will {@link 
BatchWriter#flush()} after each added mutation. Must be non-negative.
*
* 
@@ -69,11 +69,11 @@ public class BatchWriterConfig implements

[12/19] accumulo git commit: ACCUMULO-4102 Fix bad javadocs

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Fix bad javadocs


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8c0cf7f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8c0cf7f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8c0cf7f

Branch: refs/heads/1.7
Commit: c8c0cf7f90023a49cbb2b790f30819810bed0bf9
Parents: 7cc8137
Author: Christopher Tubbs 
Authored: Fri Jan 8 19:50:42 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 20:48:51 2016 -0500

--
 .../core/bloomfilter/DynamicBloomFilter.java|  4 +--
 .../accumulo/core/client/BatchWriterConfig.java | 10 +++---
 .../core/client/ConditionalWriterConfig.java|  4 +--
 .../client/mapred/AccumuloFileOutputFormat.java |  4 +--
 .../mapreduce/AccumuloFileOutputFormat.java |  6 ++--
 .../lib/impl/FileOutputConfigurator.java|  4 +--
 .../lib/util/FileOutputConfigurator.java|  4 +--
 .../security/tokens/AuthenticationToken.java|  2 +-
 .../core/conf/AccumuloConfiguration.java|  2 +-
 .../org/apache/accumulo/core/data/Range.java|  8 ++---
 .../file/blockfile/cache/CachedBlockQueue.java  |  2 +-
 .../core/file/blockfile/cache/ClassSize.java|  4 +--
 .../accumulo/core/file/rfile/bcfile/Utils.java  | 35 +++-
 .../user/WholeColumnFamilyIterator.java |  4 +--
 .../core/metadata/ServicerForMetadataTable.java |  2 +-
 .../core/metadata/ServicerForRootTable.java |  2 +-
 .../core/metadata/ServicerForUserTables.java|  2 +-
 .../core/security/ColumnVisibility.java |  8 ++---
 .../core/security/VisibilityConstraint.java |  1 -
 .../security/crypto/CryptoModuleParameters.java |  7 +---
 .../examples/simple/filedata/ChunkCombiner.java | 18 +-
 .../apache/accumulo/server/ServerConstants.java |  2 +-
 .../server/security/SecurityOperation.java  |  6 ++--
 .../server/security/SystemCredentialsTest.java  |  2 +-
 .../monitor/servlets/DefaultServlet.java|  2 +-
 .../monitor/servlets/TablesServlet.java |  4 +--
 26 files changed, 73 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8c0cf7f/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
 
b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
index 740bdda..11e765a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
@@ -60,8 +60,8 @@ import org.apache.hadoop.util.bloom.Key;
  * 
  * A dynamic Bloom filter (DBF) makes use of a s * m bit matrix 
but each of the s rows is a standard Bloom filter. The creation
  * process of a DBF is iterative. At the start, the DBF is a 1 * 
m bit matrix, i.e., it is composed of a single standard Bloom filter. It 
assumes
- * that nr elements are recorded in the initial bit 
vector, where nr <= n (n is the 
cardinality of
- * the set A to record in the filter).
+ * that nr elements are recorded in the initial bit 
vector, where nr = n (n is the 
cardinality
+ * of the set A to record in the filter).
  * 
  * As the size of A grows during the execution of the 
application, several keys must be inserted in the DBF. When inserting a key 
into the DBF, one
  * must first get an active Bloom filter in the matrix. A Bloom filter is 
active when the number of recorded keys, nr, is 
strictly less

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8c0cf7f/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java 
b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index 08eb853..320ecf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -49,7 +49,7 @@ public class BatchWriterConfig implements Writable {
   private Integer maxWriteThreads = null;
 
   /**
-   * Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
+   * Sets the maximum memory to batch before writing. The smaller this value, 
the more frequently the {@link BatchWriter} will write.
* If set to a value smaller than a single mutation, then it will {@link 
BatchWriter#flush()} after each added mutation. Must be non-negative.
*
* 
@@ -69,11 +69,11 @@ public class BatchWriterConfig implements

[03/19] accumulo git commit: ACCUMULO-4103 Add jdk8 profile for findbugs

2016-01-08 Thread ctubbsii 
ACCUMULO-4103 Add jdk8 profile for findbugs

* Automatically set findbugs.version for jdk8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f38d5e7f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f38d5e7f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f38d5e7f

Branch: refs/heads/master
Commit: f38d5e7f69d21eec6d197e2109575bbc60b3eae0
Parents: 05811af
Author: Christopher Tubbs 
Authored: Fri Jan 8 14:30:35 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 15:34:07 2016 -0500

--
 pom.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f38d5e7f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 833bf44..ea40f31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1398,5 +1398,14 @@
 1.7.5
   
 
+
+  jdk8
+  
+[1.8,)
+  
+  
+3.0.1
+  
+

[08/19] accumulo git commit: ACCUMULO-4102 Bump maven-plugin-plugin to 3.4

2016-01-08 Thread ctubbsii 
ACCUMULO-4102 Bump maven-plugin-plugin to 3.4

* Bump maven-plugin-plugin so the generated HelpMojo doesn't have
  javadoc problems (especially on JDK8)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7cc81374
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cc81374
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cc81374

Branch: refs/heads/master
Commit: 7cc81374233b0f8ba3a243f6084eecce9d6a1e6f
Parents: 4169a12
Author: Christopher Tubbs 
Authored: Fri Jan 8 20:45:03 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 8 20:45:49 2016 -0500

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7cc81374/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6138dbc..f04aa53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -904,6 +904,11 @@
 
   
 
+
+  org.apache.maven.plugins
+  maven-plugin-plugin
+  3.4
+

[15/19] accumulo git commit: Merge branch 'javadoc-jdk8-1.6' into javadoc-jdk8-1.7

2016-01-08 Thread ctubbsii 
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6becfbd3/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
--
diff --cc 
server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
index 01bd23a,000..bf582c7
mode 100644,00..100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java
@@@ -1,167 -1,0 +1,167 @@@
 +/*
 + * 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.monitor.servlets;
 +
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +
 +import javax.servlet.http.HttpServletRequest;
 +import javax.servlet.http.HttpServletResponse;
 +
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
 +import org.apache.accumulo.core.replication.ReplicationConstants;
 +import org.apache.accumulo.core.replication.ReplicationTable;
 +import org.apache.accumulo.core.replication.ReplicationTarget;
 +import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.monitor.Monitor;
 +import org.apache.accumulo.monitor.util.Table;
 +import org.apache.accumulo.monitor.util.celltypes.NumberType;
 +import 
org.apache.accumulo.server.replication.DistributedWorkQueueWorkAssignerHelper;
 +import org.apache.accumulo.server.replication.ReplicationUtil;
 +import org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
 +import org.apache.zookeeper.KeeperException;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +/**
 + *
 + */
 +public class ReplicationServlet extends BasicServlet {
 +  private static final Logger log = 
LoggerFactory.getLogger(ReplicationServlet.class);
 +
 +  private static final long serialVersionUID = 1L;
 +
 +  // transient because it's not serializable and servlets are serializable
 +  private transient volatile ReplicationUtil replicationUtil = null;
 +
 +  private synchronized ReplicationUtil getReplicationUtil() {
 +// make transient replicationUtil available as needed
 +if (replicationUtil == null) {
 +  replicationUtil = new ReplicationUtil(Monitor.getContext());
 +}
 +return replicationUtil;
 +  }
 +
 +  @Override
 +  protected String getTitle(HttpServletRequest req) {
 +return "Replication Overview";
 +  }
 +
 +  @Override
 +  protected void pageBody(HttpServletRequest req, HttpServletResponse 
response, StringBuilder sb) throws Exception {
 +final Connector conn = Monitor.getContext().getConnector();
 +final MasterMonitorInfo mmi = Monitor.getMmi();
 +
 +// The total number of "slots" we have to replicate data
 +int totalWorkQueueSize = 
getReplicationUtil().getMaxReplicationThreads(mmi);
 +
 +TableOperations tops = conn.tableOperations();
 +if (!ReplicationTable.isOnline(conn)) {
 +  banner(sb, "", "Replication table is offline");
 +  return;
 +}
 +
 +Table replicationStats = new Table("replicationStats", "Replication 
Status");
 +replicationStats.addSortableColumn("Table");
 +replicationStats.addSortableColumn("Peer");
 +replicationStats.addSortableColumn("Remote Identifier");
 +replicationStats.addSortableColumn("ReplicaSystem Type");
 +replicationStats.addSortableColumn("Files needing replication", new 
NumberType(), null);
 +
 +Map peers = getReplicationUtil().getPeers();
 +
 +// The total set of configured targets
 +Set allConfiguredTargets = 
getReplicationUtil().getReplicationTargets();
 +
 +// Number of files per target we have to replicate
 +Map targetCounts = 
getReplicationUtil().getPendingReplications();
 +
 +Map tableNameToId = tops.tableIdMap();
 +Map tableIdToName = 
getReplicationUtil().invert(tableNameToId);
 +
 +long filesPendingOverAllTargets = 0l;
 +for (ReplicationTarget configuredTarget : allConfiguredTargets) {
 +  String