svn commit: r1466875 - /accumulo/site/trunk/content/people.mdtext
Author: kturner Date: Thu Apr 11 13:12:02 2013 New Revision: 1466875 URL: http://svn.apache.org/r1466875 Log: CMS commit to accumulo by kturner Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1466875r1=1466874r2=1466875view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Thu Apr 11 13:12:02 2013 @@ -75,23 +75,24 @@ Contributors tr class=eventd/tdtdDennis Patrone/tdtda href=http://www.jhuapl.edu/The Johns Hopkins UniversitybrApplied Physics Laboratory/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr tr class=oddtd/tdtdEd Kohlwey/tdtda href=http://www.boozallen.com/Booz Allen Hamilton/a/tdtd/td/tr tr class=eventdedwardyoon/tdtdEdward Yoon/tdtd/tdtd/td/tr - tr class=oddtd/tdtdJay Shipper/tdtd/tdtd/td/tr - tr class=eventd/tdtdJesse Yates/tdtd/tdtd/td/tr - tr class=oddtd/tdtdJim Klucar/tdtda href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventd/tdtdJoe Skora/tdtd/tdtd/td/tr - tr class=oddtd/tdtdKevin Faro/tdtda href=http://www.tetraconcepts.com;Tetra Concepts LLC/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventd/tdtdLaura Peaslee/tdtda href=http://www.objectivesolutions.comObjective Solutions, Inc./a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtd/tdtdLuke Brassard/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventd/tdtdMatthew Kirkley/tdtd/tdtd/td/tr - tr class=oddtd/tdtdMichael Allen/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventd/tdtdMichael Berman/tdtd/tdtd/td/tr - tr class=oddtd/tdtdMichael Wall/tdtd/tdtd/td/tr - tr class=eventd/tdtdOren Falkowitz/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtd/tdtdPhil Eberhardt/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventd/tdtdPhilip Young/tdtd/tdtd/td/tr - tr class=oddtd/tdtdSapah Shah/tdtd/tdtd/td/tr - tr class=eventd/tdtdScott Kuehn/tdtd/tdtd/td/tr - tr class=oddtd/tdtdTim Halloran/tdtd/tdtd/td/tr - tr class=eventd/tdtdTim Reardon/tdtda href=http://www.texeltek.com/;TexelTek/a/tdtd/td/tr - tr class=oddtd/tdtdTravis Pinney/tdtd/tdtd/td/tr + tr class=oddtd/tdtdJason Then/tdtd/tdtd/td/tr + tr class=eventd/tdtdJay Shipper/tdtd/tdtd/td/tr + tr class=oddtd/tdtdJesse Yates/tdtd/tdtd/td/tr + tr class=eventd/tdtdJim Klucar/tdtda href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=oddtd/tdtdJoe Skora/tdtd/tdtd/td/tr + tr class=eventd/tdtdKevin Faro/tdtda href=http://www.tetraconcepts.com;Tetra Concepts LLC/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=oddtd/tdtdLaura Peaslee/tdtda href=http://www.objectivesolutions.comObjective Solutions, Inc./a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=eventd/tdtdLuke Brassard/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=oddtd/tdtdMatthew Kirkley/tdtd/tdtd/td/tr + tr
svn commit: r858108 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Thu Apr 11 13:12:14 2013
New Revision: 858108
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr 11 13:12:14 2013
@@ -1 +1 @@
-1462592
+1466875
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Thu Apr 11 13:12:14 2013
@@ -143,25 +143,26 @@ tr.even {
tr class=eventd/tdtdDennis Patrone/tdtda
href=http://www.jhuapl.edu/The Johns Hopkins UniversitybrApplied Physics
Laboratory/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
tr class=oddtd/tdtdEd Kohlwey/tdtda
href=http://www.boozallen.com/Booz Allen Hamilton/a/tdtd/td/tr
tr class=eventdedwardyoon/tdtdEdward
Yoon/tdtd/tdtd/td/tr
- tr class=oddtd/tdtdJay Shipper/tdtd/tdtd/td/tr
- tr class=eventd/tdtdJesse Yates/tdtd/tdtd/td/tr
- tr class=oddtd/tdtdJim Klucar/tdtda
href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
- tr class=eventd/tdtdJoe Skora/tdtd/tdtd/td/tr
- tr class=oddtd/tdtdKevin Faro/tdtda
href=http://www.tetraconcepts.com;Tetra Concepts LLC/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
- tr class=eventd/tdtdLaura Peaslee/tdtda
href=http://www.objectivesolutions.comObjective Solutions, Inc./a/tdtdET
(a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
- tr class=oddtd/tdtdLuke Brassard/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
- tr class=eventd/tdtdMatthew Kirkley/tdtd/tdtd/td/tr
- tr class=oddtd/tdtdMichael Allen/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
- tr class=eventd/tdtdMichael Berman/tdtd/tdtd/td/tr
- tr class=oddtd/tdtdMichael Wall/tdtd/tdtd/td/tr
- tr class=eventd/tdtdOren Falkowitz/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
- tr class=oddtd/tdtdPhil Eberhardt/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
- tr class=eventd/tdtdPhilip Young/tdtd/tdtd/td/tr
- tr class=oddtd/tdtdSapah Shah/tdtd/tdtd/td/tr
- tr class=eventd/tdtdScott Kuehn/tdtd/tdtd/td/tr
- tr class=oddtd/tdtdTim Halloran/tdtd/tdtd/td/tr
- tr class=eventd/tdtdTim Reardon/tdtda
href=http://www.texeltek.com/;TexelTek/a/tdtd/td/tr
- tr class=oddtd/tdtdTravis Pinney/tdtd/tdtd/td/tr
+ tr class=oddtd/tdtdJason Then/tdtd/tdtd/td/tr
+ tr class=eventd/tdtdJay Shipper/tdtd/tdtd/td/tr
+ tr class=oddtd/tdtdJesse Yates/tdtd/tdtd/td/tr
+ tr class=eventd/tdtdJim Klucar/tdtda
href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
+ tr class=oddtd/tdtdJoe Skora/tdtd/tdtd/td/tr
+ tr class=eventd/tdtdKevin Faro/tdtda
href=http://www.tetraconcepts.com;Tetra Concepts LLC/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
+ tr class=oddtd/tdtdLaura Peaslee/tdtda
href=http://www.objectivesolutions.comObjective Solutions, Inc./a/tdtdET
(a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
+ tr class=eventd/tdtdLuke Brassard/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
svn commit: r1466879 - /accumulo/site/trunk/content/people.mdtext
Author: kturner
Date: Thu Apr 11 13:21:30 2013
New Revision: 1466879
URL: http://svn.apache.org/r1466879
Log:
CMS commit to accumulo by kturner
Modified:
accumulo/site/trunk/content/people.mdtext
Modified: accumulo/site/trunk/content/people.mdtext
URL:
http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1466879r1=1466878r2=1466879view=diff
==
--- accumulo/site/trunk/content/people.mdtext (original)
+++ accumulo/site/trunk/content/people.mdtext Thu Apr 11 13:21:30 2013
@@ -31,12 +31,14 @@ th {
text-align: left;
background: #FF;
}
-tr.odd {
- background: #FF;
-}
-tr.even {
+tr:nth-child(2n){
background: #F0FFF0;
}
+
+tr:nth-child(2n+1) {
+ background: #FF;
+}
+
/style
PMC and Committers
@@ -44,8 +46,8 @@ PMC and Committers
table
trthusername/ththname/ththorganization/ththtimezone/th/tr
- tr class=eventdacordova/tdtdAaron
Cordova/tdtd/tdtd/td/tr
- tr class=oddtdafuchs/tdtdAdam Fuchs/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
+ trtdacordova/tdtdAaron Cordova/tdtd/tdtd/td/tr
+ trtdafuchs/tdtdAdam Fuchs/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
tr class=eventdbimargulies/tdtdBenson
Margulies/tdtd/tdtd/td/tr
tr class=oddtdbillie/tdtdBillie Rinaldi/tdtda
href=http://hortonworks.com/Hortonworks/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
tr class=eventdbrianloss/tdtdBrian Loss/tdtda
href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
svn commit: r858111 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Thu Apr 11 13:21:36 2013
New Revision: 858111
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr 11 13:21:36 2013
@@ -1 +1 @@
-1466875
+1466879
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Thu Apr 11 13:21:36 2013
@@ -103,19 +103,21 @@ th {
text-align: left;
background: #FF;
}
-tr.odd {
- background: #FF;
-}
-tr.even {
+tr:nth-child(2n){
background: #F0FFF0;
}
+
+tr:nth-child(2n+1) {
+ background: #FF;
+}
+
/style
h2 id=pmc-and-committersPMC and Committers/h2
table
trthusername/ththname/ththorganization/ththtimezone/th/tr
- tr class=eventdacordova/tdtdAaron
Cordova/tdtd/tdtd/td/tr
- tr class=oddtdafuchs/tdtdAdam Fuchs/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
+ trtdacordova/tdtdAaron Cordova/tdtd/tdtd/td/tr
+ trtdafuchs/tdtdAdam Fuchs/tdtda
href=http://sqrrl.com/sqrrl/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
tr class=eventdbimargulies/tdtdBenson
Margulies/tdtd/tdtd/td/tr
tr class=oddtdbillie/tdtdBillie Rinaldi/tdtda
href=http://hortonworks.com/Hortonworks/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
tr class=eventdbrianloss/tdtdBrian Loss/tdtda
href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
svn commit: r1466880 - /accumulo/site/trunk/content/people.mdtext
Author: kturner Date: Thu Apr 11 13:26:51 2013 New Revision: 1466880 URL: http://svn.apache.org/r1466880 Log: CMS commit to accumulo by kturner Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1466880r1=1466879r2=1466880view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Thu Apr 11 13:26:51 2013 @@ -48,20 +48,20 @@ PMC and Committers trthusername/ththname/ththorganization/ththtimezone/th/tr trtdacordova/tdtdAaron Cordova/tdtd/tdtd/td/tr trtdafuchs/tdtdAdam Fuchs/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventdbimargulies/tdtdBenson Margulies/tdtd/tdtd/td/tr - tr class=oddtdbillie/tdtdBillie Rinaldi/tdtda href=http://hortonworks.com/Hortonworks/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventdbrianloss/tdtdBrian Loss/tdtda href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtdcawaring/tdtdChris Waring/tdtd/tdtd/td/tr - tr class=eventda href=http://people.apache.org/~ctubbsii/;ctubbsii/a/tdtdChristopher Tubbs/tdtda href=http://www.nsa.gov/;NSA/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtddlmarion/tdtdDave Marion/tdtda href=http://www.objectivesolutions.comObjective Solutions, Inc./a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventdmedined/tdtdDavid Medinets/tdtd/tdtd/td/tr - tr class=oddtddrew/tdtdDrew Farris/tdtda href=http://www.boozallen.com/Booz Allen Hamilton/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventdecn/tdtdEric Newton/tdtda href=http://swcomplete.com/SW Complete Inc./a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtdjtrost/tdtdJason Trost/tdtda href=http://endgamesystems.com/Endgame/a/tdtd/td/tr - tr class=eventdvines/tdtdJohn Vines/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtdelserj/tdtdJosh Elser/tdtda href=http://sra.com;SRA International, Inc/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventdkturner/tdtdKeith Turner/tdtda href=http://www.ptech-llc.com/Peterson Technologies/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtdujustgotbilld/tdtdWilliam Slacum/tdtda href=http://www.atg-hq.com;Agile Technology Group, Inc/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + trtdbimargulies/tdtdBenson Margulies/tdtd/tdtd/td/tr + trtdbillie/tdtdBillie Rinaldi/tdtda href=http://hortonworks.com/Hortonworks/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + trtdbrianloss/tdtdBrian Loss/tdtda href=http://www.praxiseng.com/Praxis Engineering/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + trtdcawaring/tdtdChris Waring/tdtd/tdtd/td/tr + trtda href=http://people.apache.org/~ctubbsii/;ctubbsii/a/tdtdChristopher Tubbs/tdtda href=http://www.nsa.gov/;NSA/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a
svn commit: r858114 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: kturner Date: Thu Apr 11 13:28:08 2013 New Revision: 858114 Log: Publishing svnmucc operation to accumulo site by kturner Added: websites/production/accumulo/content/ - copied from r858113, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r858113, websites/production/accumulo/content/1.4/apidocs/
svn commit: r1466970 - /accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Author: ecn
Date: Thu Apr 11 17:03:52 2013
New Revision: 1466970
URL: http://svn.apache.org/r1466970
Log:
ACCUMULO-581: expand tests to a few more commands based on missing coverage
Modified:
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Modified:
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1466970r1=1466969r2=1466970view=diff
==
---
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
(original)
+++
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Thu Apr 11 17:03:52 2013
@@ -242,13 +242,32 @@ public class ShellServerTest {
exec(deletetable -f t);
}
+ @Test(timeout = 1000)
+ public void debug() throws Exception {
+exec(debug, true, off, true);
+exec(debug on, true);
+exec(debug, true, on, true);
+exec(debug off, true);
+exec(debug, true, off, true);
+exec(debug debug, false);
+exec(debug debug debug, false);
+ }
+
@Test(timeout = 3)
public void user() throws Exception {
-// createuser, deleteuser, user, users, droptable
+// createuser, deleteuser, user, users, droptable, grant, revoke
shell.getReader().setInput(new
ByteArrayInputStream(secret\nsecret\n.getBytes()));
exec(createuser xyzzy, true);
exec(users, true, xyzzy, true);
+String perms = exec(userpermissions -u xyzzy, true);
+assertTrue(perms.contains(Table permissions (!METADATA): Table.READ));
exec(grant -u xyzzy -s System.CREATE_TABLE, true);
+perms = exec(userpermissions -u xyzzy, true);
+assertTrue(perms.contains());
+exec(grant -u root -t !METADATA Table.WRITE, true);
+exec(grant -u root -t !METADATA Table.GOOFY, false);
+exec(grant -u root -s foo, false);
+exec(grant -u xyzzy -t !METADATA foo, false);
shell.getReader().setInput(new
ByteArrayInputStream(secret\nsecret\n.getBytes()));
exec(user xyzzy, true);
exec(createtable t, true, xyzzy@, true);
@@ -258,6 +277,12 @@ public class ShellServerTest {
exec(deleteuser xyzzy, false, delete yourself, true);
shell.getReader().setInput(new ByteArrayInputStream((secret + \n +
secret + \n).getBytes()));
exec(user root, true);
+exec(revoke -u xyzzy -s System.CREATE_TABLE, true);
+exec(revoke -u xyzzy -s System.GOOFY, false);
+exec(revoke -u xyzzy -s foo, false);
+exec(revoke -u xyzzy -t !METADATA Table.WRITE, true);
+exec(revoke -u xyzzy -t !METADATA Table.GOOFY, false);
+exec(revoke -u xyzzy -t !METADATA foo, false);
exec(deleteuser xyzzy, true);
exec(users, true, xyzzy, false);
}
@@ -485,6 +510,20 @@ public class ShellServerTest {
exec(help -np, true, Help Commands, true);
shell.getReader().setInput(new ByteArrayInputStream(\n\n.getBytes()));
exec(?, true, Help Commands, true);
+for (String c : (
+bye exit quit +
+about help info ? +
+deleteiter deletescaniter listiter setiter setscaniter +
+grant revoke systempermissions tablepermissions userpermissions
+
+execfile history +
+authenticate cls clear notable sleep table user whoami +
+clonetable config createtable deletetable droptable du
exporttable importtable offline online renametable tables +
+addsplits compact constraint flush getgropus getsplits merge
setgroups +
+addauths createuser deleteuser dropuser getauths passwd setauths
users +
+delete deletemany deleterows egrep formatter interpreter grep
importdirectory insert maxrow scan
+).split( )) {
+ exec(help + c, true);
+}
}
// @Test(timeout = 3)
@@ -621,6 +660,8 @@ public class ShellServerTest {
public void systempermission() throws Exception {
exec(systempermissions);
assertEquals(8, output.get().split(\n).length - 1);
+exec(tablepermissions, true);
+assertEquals(6, output.get().split(\n).length - 1);
}
@Test(timeout = 3)
svn commit: r1466982 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/test/j
Author: ecn
Date: Thu Apr 11 17:19:20 2013
New Revision: 1466982
URL: http://svn.apache.org/r1466982
Log:
ACCUMULO-581: expand tests to a few more commands based on missing coverage
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1466970
Propchange: accumulo/trunk/assemble/
--
Merged /accumulo/branches/1.5/assemble:r1466970
Propchange: accumulo/trunk/core/
--
Merged /accumulo/branches/1.5/core:r1466970
Propchange: accumulo/trunk/examples/
--
Merged /accumulo/branches/1.5/examples:r1466970
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466970
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466970
Propchange: accumulo/trunk/server/
--
Merged /accumulo/branches/1.5/server:r1466970
Propchange: accumulo/trunk/src/
--
Merged /accumulo/branches/1.5/src:r1466970
Modified:
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1466982r1=1466981r2=1466982view=diff
==
---
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
(original)
+++
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Thu Apr 11 17:19:20 2013
@@ -242,13 +242,32 @@ public class ShellServerTest {
exec(deletetable -f t);
}
+ @Test(timeout = 1000)
+ public void debug() throws Exception {
+exec(debug, true, off, true);
+exec(debug on, true);
+exec(debug, true, on, true);
+exec(debug off, true);
+exec(debug, true, off, true);
+exec(debug debug, false);
+exec(debug debug debug, false);
+ }
+
@Test(timeout = 3)
public void user() throws Exception {
-// createuser, deleteuser, user, users, droptable
+// createuser, deleteuser, user, users, droptable, grant, revoke
shell.getReader().setInput(new
ByteArrayInputStream(secret\nsecret\n.getBytes()));
exec(createuser xyzzy, true);
exec(users, true, xyzzy, true);
+String perms = exec(userpermissions -u xyzzy, true);
+assertTrue(perms.contains(Table permissions (!METADATA): Table.READ));
exec(grant -u xyzzy -s System.CREATE_TABLE, true);
+perms = exec(userpermissions -u xyzzy, true);
+assertTrue(perms.contains());
+exec(grant -u root -t !METADATA Table.WRITE, true);
+exec(grant -u root -t !METADATA Table.GOOFY, false);
+exec(grant -u root -s foo, false);
+exec(grant -u xyzzy -t !METADATA foo, false);
shell.getReader().setInput(new
ByteArrayInputStream(secret\nsecret\n.getBytes()));
exec(user xyzzy, true);
exec(createtable t, true, xyzzy@, true);
@@ -258,6 +277,12 @@ public class ShellServerTest {
exec(deleteuser xyzzy, false, delete yourself, true);
shell.getReader().setInput(new ByteArrayInputStream((secret + \n +
secret + \n).getBytes()));
exec(user root, true);
+exec(revoke -u xyzzy -s System.CREATE_TABLE, true);
+exec(revoke -u xyzzy -s System.GOOFY, false);
+exec(revoke -u xyzzy -s foo, false);
+exec(revoke -u xyzzy -t !METADATA Table.WRITE, true);
+exec(revoke -u xyzzy -t !METADATA Table.GOOFY, false);
+exec(revoke -u xyzzy -t !METADATA foo, false);
exec(deleteuser xyzzy, true);
exec(users, true, xyzzy, false);
}
@@ -485,6 +510,20 @@ public class ShellServerTest {
exec(help -np, true, Help Commands, true);
shell.getReader().setInput(new
svn commit: r1467002 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/conf/ server/src/main/java/org/apache/accumulo/s
Author: vines
Date: Thu Apr 11 17:48:36 2013
New Revision: 1467002
URL: http://svn.apache.org/r1467002
Log:
ACCUMULO-1263 - Shifted gc's no-trash to a property (also fixed javadoc bug)
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1467002r1=1467001r2=1467002view=diff
==
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
Thu Apr 11 17:48:36 2013
@@ -175,7 +175,7 @@ public interface TableOperations {
* specifies the maximum number of splits to return
* @return the split points (end-row names) for the table's current split
profile, grouped into fewer splits so as not to exceed maxSplits
* @throws TableNotFoundException
- * @deprecated since 1.5.0; use {@link #listSplits(String, int))} instead.
+ * @deprecated since 1.5.0; use {@link #listSplits(String, int)} instead.
*/
@Deprecated
public CollectionText getSplits(String tableName, int maxSplits) throws
TableNotFoundException;
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1467002r1=1467001r2=1467002view=diff
==
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java
Thu Apr 11 17:48:36 2013
@@ -212,6 +212,7 @@ public enum Property {
+ no longer in use are removed from the filesystem.),
GC_PORT(gc.port.client, 50091, PropertyType.PORT, The listening port
for the garbage collector's monitor service),
GC_DELETE_THREADS(gc.threads.delete, 16, PropertyType.COUNT, The number
of threads used to delete files),
+ GC_TRASH_IGNORE(gc.trash.ignore, false, PropertyType.BOOLEAN, Do not
use the Trash, even if it is configured),
// properties that are specific to the monitor server behavior
MONITOR_PREFIX(monitor., null, PropertyType.PREFIX, Properties in this
category affect the behavior of the monitor web server.),
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1467002r1=1467001r2=1467002view=diff
==
---
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
(original)
+++
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Thu Apr 11 17:48:36 2013
@@ -110,8 +110,6 @@ public class SimpleGarbageCollector impl
boolean offline = false;
@Parameter(names={-a, --address}, description=specify our local
address)
String address = null;
-@Parameter(names={--no-trash}, description=do not use the Trash, even
if it is configured)
-boolean noTrash = false;
}
// how much of the JVM's available memory should it use gathering candidates
@@ -157,7 +155,7 @@ public class SimpleGarbageCollector impl
if (opts.address != null)
gc.useAddress(address);
-gc.init(fs, instance, SecurityConstants.getSystemCredentials(),
opts.noTrash);
+gc.init(fs, instance, SecurityConstants.getSystemCredentials(),
serverConf.getConfiguration().getBoolean(Property.GC_TRASH_IGNORE));
Accumulo.enableTracing(address, gc);
gc.run();
}
svn commit: r1467003 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/conf/ server/ server/src/main/java/org/apache/
Author: vines
Date: Thu Apr 11 17:49:31 2013
New Revision: 1467003
URL: http://svn.apache.org/r1467003
Log:
ACCUMULO-1263 - Shifted gc's no-trash to a property (also fixed javadoc bug)
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1467002
Propchange: accumulo/trunk/core/
--
Merged /accumulo/branches/1.5/core:r1467002
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1467003r1=1467002r2=1467003view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
Thu Apr 11 17:49:31 2013
@@ -175,7 +175,7 @@ public interface TableOperations {
* specifies the maximum number of splits to return
* @return the split points (end-row names) for the table's current split
profile, grouped into fewer splits so as not to exceed maxSplits
* @throws TableNotFoundException
- * @deprecated since 1.5.0; use {@link #listSplits(String, int))} instead.
+ * @deprecated since 1.5.0; use {@link #listSplits(String, int)} instead.
*/
@Deprecated
public CollectionText getSplits(String tableName, int maxSplits) throws
TableNotFoundException;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1467003r1=1467002r2=1467003view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
Thu Apr 11 17:49:31 2013
@@ -212,6 +212,7 @@ public enum Property {
+ no longer in use are removed from the filesystem.),
GC_PORT(gc.port.client, 50091, PropertyType.PORT, The listening port
for the garbage collector's monitor service),
GC_DELETE_THREADS(gc.threads.delete, 16, PropertyType.COUNT, The number
of threads used to delete files),
+ GC_TRASH_IGNORE(gc.trash.ignore, false, PropertyType.BOOLEAN, Do not
use the Trash, even if it is configured),
// properties that are specific to the monitor server behavior
MONITOR_PREFIX(monitor., null, PropertyType.PREFIX, Properties in this
category affect the behavior of the monitor web server.),
Propchange: accumulo/trunk/server/
--
Merged /accumulo/branches/1.5/server:r1467002
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1467003r1=1467002r2=1467003view=diff
==
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Thu Apr 11 17:49:31 2013
@@ -110,8 +110,6 @@ public class SimpleGarbageCollector impl
boolean offline = false;
@Parameter(names={-a, --address}, description=specify our local
address)
String address = null;
-@Parameter(names={--no-trash}, description=do not use the Trash, even
if it is configured)
-boolean noTrash = false;
}
// how much of the JVM's available memory should it use gathering candidates
@@ -157,7 +155,7 @@ public class SimpleGarbageCollector impl
if (opts.address != null)
gc.useAddress(address);
-gc.init(fs, instance, SecurityConstants.getSystemCredentials(),
opts.noTrash);
+gc.init(fs, instance, SecurityConstants.getSystemCredentials(),
serverConf.getConfiguration().getBoolean(Property.GC_TRASH_IGNORE));
Accumulo.enableTracing(address, gc);
gc.run();
}
svn commit: r1467005 - in /accumulo/branches/1.5/core/src: main/java/org/apache/accumulo/core/util/shell/commands/EscapeTokenizer.java test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java
Author: ecn Date: Thu Apr 11 17:50:39 2013 New Revision: 1467005 URL: http://svn.apache.org/r1467005 Log: ACCUMULO-581 removing dead code Removed: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EscapeTokenizer.java accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java
svn commit: r1467019 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/simple/pom.xml pom.xml proxy/pom.xml server/pom.xml test/pom.xml
Author: ctubbsii Date: Thu Apr 11 18:06:36 2013 New Revision: 1467019 URL: http://svn.apache.org/r1467019 Log: ACCUMULO-1265 Fix 'mvn compile' Modified: accumulo/branches/1.5/assemble/pom.xml accumulo/branches/1.5/core/pom.xml accumulo/branches/1.5/examples/simple/pom.xml accumulo/branches/1.5/pom.xml accumulo/branches/1.5/proxy/pom.xml accumulo/branches/1.5/server/pom.xml accumulo/branches/1.5/test/pom.xml Modified: accumulo/branches/1.5/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1467019r1=1467018r2=1467019view=diff == --- accumulo/branches/1.5/assemble/pom.xml (original) +++ accumulo/branches/1.5/assemble/pom.xml Thu Apr 11 18:06:36 2013 @@ -30,42 +30,50 @@ jnilib**/*.jnilib/jnilib so**/*.so/so /properties - !-- NOTE: These dependency declarations are only required to sort this project to the end of the line in the multimodule build. Since we only include the child -modules in our assembly, we only need to ensure this distribution project builds AFTER those... -- dependencies -dependency - groupIdlog4j/groupId - artifactIdlog4j/artifactId - scopeprovided/scope -/dependency +!-- + NOTE: These dependency declarations are required to sort + this project to the end of the line in the multimodule + build. + Further, the dependencies for Accumulo artifacts must be + here so they will be copied into the lib directory for + the binary distribution assemblies. + -- dependency groupIdorg.apache.accumulo/groupId artifactIdaccumulo-core/artifactId - scopeprovided/scope /dependency dependency groupIdorg.apache.accumulo/groupId artifactIdaccumulo-examples-simple/artifactId - scopeprovided/scope +/dependency +dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-fate/artifactId /dependency dependency groupIdorg.apache.accumulo/groupId artifactIdaccumulo-proxy/artifactId - scopeprovided/scope /dependency dependency groupIdorg.apache.accumulo/groupId artifactIdaccumulo-server/artifactId - scopeprovided/scope /dependency dependency groupIdorg.apache.accumulo/groupId artifactIdaccumulo-start/artifactId - scopeprovided/scope +/dependency +dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-test/artifactId /dependency dependency groupIdorg.apache.accumulo/groupId artifactIdaccumulo-trace/artifactId +/dependency +dependency + groupIdlog4j/groupId + artifactIdlog4j/artifactId scopeprovided/scope /dependency /dependencies Modified: accumulo/branches/1.5/core/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1467019r1=1467018r2=1467019view=diff == --- accumulo/branches/1.5/core/pom.xml (original) +++ accumulo/branches/1.5/core/pom.xml Thu Apr 11 18:06:36 2013 @@ -34,18 +34,6 @@ artifactIdjline/artifactId /dependency dependency - groupIdorg.apache.accumulo/groupId - artifactIdaccumulo-fate/artifactId -/dependency -dependency - groupIdorg.apache.accumulo/groupId - artifactIdaccumulo-start/artifactId -/dependency -dependency - groupIdorg.apache.accumulo/groupId - artifactIdaccumulo-trace/artifactId -/dependency -dependency groupIdorg.apache.thrift/groupId artifactIdlibthrift/artifactId /dependency @@ -85,6 +73,21 @@ scopeprovided/scope /dependency dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-fate/artifactId + scopeprovided/scope +/dependency +dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-start/artifactId + scopeprovided/scope +/dependency +dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-trace/artifactId + scopeprovided/scope +/dependency +dependency groupIdorg.apache.zookeeper/groupId artifactIdzookeeper/artifactId scopeprovided/scope Modified: accumulo/branches/1.5/examples/simple/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1467019r1=1467018r2=1467019view=diff == --- accumulo/branches/1.5/examples/simple/pom.xml (original) +++ accumulo/branches/1.5/examples/simple/pom.xml Thu Apr 11 18:06:36 2013 @@ -30,10 +30,6 @@ artifactIdjcommander/artifactId /dependency dependency - groupIdorg.apache.accumulo/groupId - artifactIdaccumulo-core/artifactId -/dependency -dependency groupIdcommons-codec/groupId
svn commit: r1467027 - /accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh
Author: ctubbsii
Date: Thu Apr 11 18:13:03 2013
New Revision: 1467027
URL: http://svn.apache.org/r1467027
Log:
ACCUMULO-1250 Trivially fail the build when thrift profile is active
Modified:
accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh
Modified: accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh?rev=1467027r1=1467026r2=1467027view=diff
==
--- accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh (original)
+++ accumulo/branches/1.5/core/src/main/scripts/generate-thrift.sh Thu Apr 11
18:13:03 2013
@@ -47,8 +47,7 @@ if [ $VERSION -ne 1 ] ; then
echo *** thrift is not available
echo *** expecting 'thrift -version' to return ${REQUIRED_THRIFT_VERSION}
echo *** generated code will not be updated
- echo
- exit 0
+ fail
fi
# Include thrift sources from additional modules
svn commit: r1467036 - in /accumulo/trunk: ./ assemble/ bin/ core/ core/src/main/scripts/ examples/ examples/simple/ fate/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/ac
Author: ctubbsii
Date: Thu Apr 11 18:32:33 2013
New Revision: 1467036
URL: http://svn.apache.org/r1467036
Log:
ACCUMULO-1265, ACCUMULO-1250, ACCUMULO-1244, ACCUMULO-1063 merged to trunk from
1.5 branch
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/pom.xml
accumulo/trunk/bin/accumulo
accumulo/trunk/bin/bootstrap_hdfs.sh
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/pom.xml
accumulo/trunk/core/src/main/scripts/generate-thrift.sh
accumulo/trunk/examples/ (props changed)
accumulo/trunk/examples/simple/pom.xml
accumulo/trunk/fate/pom.xml
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml
accumulo/trunk/proxy/pom.xml
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/pom.xml
accumulo/trunk/src/ (props changed)
accumulo/trunk/start/pom.xml
accumulo/trunk/test/pom.xml
accumulo/trunk/trace/pom.xml
Propchange: accumulo/trunk/
--
Merged
/accumulo/branches/1.5:r145-1466969,1466971-1467001,1467003-1467004,1467006-1467009,1467011-1467033
Propchange: accumulo/trunk/assemble/
--
Merged
/accumulo/branches/1.5/assemble:r145-1466969,1466971-1467004,1467006-1467009,1467011-1467033
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1467036r1=1467035r2=1467036view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Thu Apr 11 18:32:33 2013
@@ -30,37 +30,50 @@
jnilib**/*.jnilib/jnilib
so**/*.so/so
/properties
- !-- NOTE: These dependency declarations are only required to sort this
project to the end of the line in the multimodule build. Since we only include
the child
-modules in our assembly, we only need to ensure this distribution project
builds AFTER those... --
dependencies
+!--
+ NOTE: These dependency declarations are required to sort
+ this project to the end of the line in the multimodule
+ build.
+ Further, the dependencies for Accumulo artifacts must be
+ here so they will be copied into the lib directory for
+ the binary distribution assemblies.
+ --
dependency
groupIdorg.apache.accumulo/groupId
artifactIdaccumulo-core/artifactId
- scopeprovided/scope
/dependency
dependency
groupIdorg.apache.accumulo/groupId
artifactIdaccumulo-examples-simple/artifactId
- scopeprovided/scope
+/dependency
+dependency
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-fate/artifactId
/dependency
dependency
groupIdorg.apache.accumulo/groupId
artifactIdaccumulo-proxy/artifactId
- scopeprovided/scope
/dependency
dependency
groupIdorg.apache.accumulo/groupId
artifactIdaccumulo-server/artifactId
- scopeprovided/scope
/dependency
dependency
groupIdorg.apache.accumulo/groupId
artifactIdaccumulo-start/artifactId
- scopeprovided/scope
+/dependency
+dependency
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-test/artifactId
/dependency
dependency
groupIdorg.apache.accumulo/groupId
artifactIdaccumulo-trace/artifactId
+/dependency
+dependency
+ groupIdlog4j/groupId
+ artifactIdlog4j/artifactId
scopeprovided/scope
/dependency
/dependencies
Modified: accumulo/trunk/bin/accumulo
URL:
http://svn.apache.org/viewvc/accumulo/trunk/bin/accumulo?rev=1467036r1=1467035r2=1467036view=diff
==
--- accumulo/trunk/bin/accumulo (original)
+++ accumulo/trunk/bin/accumulo Thu Apr 11 18:32:33 2013
@@ -28,7 +28,7 @@ script=$( basename $SOURCE )
. $bin/config.sh
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar
+START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
#
# Resolve a program to its installation directory
@@ -80,7 +80,8 @@ logger) export ACCUMULO_OPTS=${ACCUMUL
esac
XML_FILES=${ACCUMULO_HOME}/conf
-CLASSPATH=${XML_FILES}:${START_JAR}
+LOG4J_JAR=$(ls $HADOOP_PREFIX/lib/log4j-*.jar | head -1)
+CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
echo JAVA_HOME is not set or is not a directory. Please make sure it's
set globally or in conf/accumulo-env.sh
Modified: accumulo/trunk/bin/bootstrap_hdfs.sh
URL:
svn commit: r1467051 - /accumulo/branches/1.5/bin/accumulo
Author: ecn
Date: Thu Apr 11 19:01:31 2013
New Revision: 1467051
URL: http://svn.apache.org/r1467051
Log:
ACCUMULO-1244 fix log4 lookup for hadoop2
Modified:
accumulo/branches/1.5/bin/accumulo
Modified: accumulo/branches/1.5/bin/accumulo
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/accumulo?rev=1467051r1=1467050r2=1467051view=diff
==
--- accumulo/branches/1.5/bin/accumulo (original)
+++ accumulo/branches/1.5/bin/accumulo Thu Apr 11 19:01:31 2013
@@ -81,7 +81,7 @@ logger) export ACCUMULO_OPTS=${ACCUMUL
esac
XML_FILES=${ACCUMULO_HOME}/conf
-LOG4J_JAR=$(ls $HADOOP_PREFIX/lib/log4j-*.jar | head -1)
+LOG4J_JAR=$(find $HADOOP_PREFIX/lib $HADOOP_PREFIX/share/hadoop/common/lib
-name 'log4j*.jar' -print 2/dev/null | head -1)
CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
svn commit: r1467098 - in /accumulo/trunk: ./ assemble/ assemble/dist.xml assemble/pom.xml core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accum
Author: ctubbsii
Date: Thu Apr 11 21:22:57 2013
New Revision: 1467098
URL: http://svn.apache.org/r1467098
Log:
ACCUMULO-1107 merge to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/dist.xml
accumulo/trunk/assemble/pom.xml
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1467034-1467050,1467052-1467094
Propchange: accumulo/trunk/assemble/
--
Merged /accumulo/branches/1.5/assemble:r1467034-1467050,1467052-1467094
Modified: accumulo/trunk/assemble/dist.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1467098r1=1467097r2=1467098view=diff
==
--- accumulo/trunk/assemble/dist.xml (original)
+++ accumulo/trunk/assemble/dist.xml Thu Apr 11 21:22:57 2013
@@ -50,7 +50,7 @@
include**/*.pl/include
include**/*.sh/include
include**/*.example/include
-include${so}/include
+include**/*.so/include
/includes
excludes
exclude**/target/exclude
@@ -109,8 +109,6 @@
exclude**/randomwalk/conf/logger.xml/exclude
exclude**/randomwalk/conf/randomwalk.conf/exclude
exclude**/randomwalk/conf/walkers/exclude
-exclude${so}/exclude
-exclude${jnilib}/exclude
/excludes
fileMode0644/fileMode
directoryMode0755/directoryMode
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1467098r1=1467097r2=1467098view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Thu Apr 11 21:22:57 2013
@@ -27,8 +27,6 @@
nameAssemble/name
properties
accumulo-top../accumulo-top
-jnilib**/*.jnilib/jnilib
-so**/*.so/so
/properties
dependencies
!--
@@ -130,13 +128,6 @@
/build
/profile
profile
- iddist/id
- properties
-jnilib/jnilib
-so/so
- /properties
-/profile
-profile
idrpm/id
build
plugins
@@ -152,7 +143,6 @@
Google's BigTable design./description
copyright2011 The Apache Software Foundation./copyright
urlhttp://accumulo.apache.org/url
- needarchtrue/needarch
groupUtilities/group
requires
requirejdk/require
@@ -178,6 +168,9 @@
sources
source
location${accumulo-top}/docs/location
+ excludes
+excludesrc/**/exclude
+ /excludes
/source
/sources
/mapping
@@ -187,10 +180,15 @@
source
location${accumulo-top}/test/location
excludes
-exclude${accumulo-top}/**/walkers.txt/exclude
-exclude${accumulo-top}/**/ingesters.txt/exclude
-exclude${accumulo-top}/**/continuous-env.sh/exclude
-exclude${accumulo-top}/**/*.pyc/exclude
+excludesrc/**/exclude
+excludetarget/**/exclude
+exclude**/walkers.txt/exclude
+exclude**/ingesters.txt/exclude
+exclude**/continuous-env.sh/exclude
+exclude.*/**/exclude
+exclude**/*.pyc/exclude
+exclude**/*.pyo/exclude
+excludepom.xml/exclude
/excludes
/source
/sources
@@ -231,19 +229,24 @@
/mapping
mapping
directory/opt/accumulo/accumulo-${project.version}/lib/directory
- dependency/dependency
sources
source
location${accumulo-top}/lib/location
+ includes
+include*.jar/include
+ /includes
/source
/sources
/mapping
+mapping
+
svn commit: r1467108 - in /accumulo/branches/1.5: ./ server/src/main/java/org/apache/accumulo/server/monitor/servlets/ server/src/main/java/org/apache/accumulo/server/security/ start/src/main/java/org
Author: ctubbsii
Date: Thu Apr 11 21:56:57 2013
New Revision: 1467108
URL: http://svn.apache.org/r1467108
Log:
ACCUMULO-971 Fix broken javadocs
Modified:
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
Modified: accumulo/branches/1.5/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1467108r1=1467107r2=1467108view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Thu Apr 11 21:56:57 2013
@@ -386,7 +386,6 @@
configuration
encodingUTF-8/encoding
quiettrue/quiet
-jarOutputDirectorylib/jarOutputDirectory
reportOutputDirectorydocs/reportOutputDirectory
javadocVersion1.6/javadocVersion
additionalJOption-J-Xmx512m/additionalJOption
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java?rev=1467108r1=1467107r2=1467108view=diff
==
---
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
(original)
+++
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
Thu Apr 11 21:56:57 2013
@@ -227,7 +227,6 @@ abstract public class BasicServlet exten
* Allow the concrete servlet implementation to provide attributes on the
body HTML tag,
* such as 'onload', which can be used to call Javascript methods on page
load.
* By default, nothing is specified.
- * @return
*/
protected String getBodyAttributes() {
return ;
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java?rev=1467108r1=1467107r2=1467108view=diff
==
---
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
(original)
+++
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
Thu Apr 11 21:56:57 2013
@@ -94,7 +94,7 @@ public class SecurityOperation {
/**
*
- * @Deprecated not for client use
+ * @deprecated not for client use
*/
public SecurityOperation(String instanceId) {
ZKUserPath = Constants.ZROOT + / + instanceId + /users;
Modified:
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java?rev=1467108r1=1467107r2=1467108view=diff
==
---
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
(original)
+++
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
Thu Apr 11 21:56:57 2013
@@ -58,8 +58,7 @@ public class HdfsFileProvider extends Ab
}
/**
- * @see org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider#
- * doCreateFileSystem(org.apache.commons.vfs2.FileName,
org.apache.commons.vfs2.FileSystemOptions)
+ * @see
org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider#doCreateFileSystem(org.apache.commons.vfs2.FileName,
org.apache.commons.vfs2.FileSystemOptions)
*/
@Override
protected FileSystem doCreateFileSystem(final FileName rootName, final
FileSystemOptions fileSystemOptions)
Modified:
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java?rev=1467108r1=1467107r2=1467108view=diff
==
---
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
(original)
+++
svn commit: r1467112 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java
Author: ctubbsii
Date: Thu Apr 11 22:00:45 2013
New Revision: 1467112
URL: http://svn.apache.org/r1467112
Log:
ACCUMULO-971 merge javadoc fixes to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
accumulo/trunk/src/ (props changed)
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1467095-1467109
Propchange: accumulo/trunk/assemble/
--
Merged /accumulo/branches/1.5/assemble:r1467095-1467109
Propchange: accumulo/trunk/core/
--
Merged /accumulo/branches/1.5/core:r1467095-1467109
Propchange: accumulo/trunk/examples/
--
Merged /accumulo/branches/1.5/examples:r1467095-1467109
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1467095-1467109
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1467095-1467109
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467112r1=1467111r2=1467112view=diff
==
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Thu Apr 11 22:00:45 2013
@@ -386,7 +386,6 @@
configuration
encodingUTF-8/encoding
quiettrue/quiet
-jarOutputDirectorylib/jarOutputDirectory
reportOutputDirectorydocs/reportOutputDirectory
javadocVersion1.6/javadocVersion
additionalJOption-J-Xmx512m/additionalJOption
Propchange: accumulo/trunk/server/
--
Merged /accumulo/branches/1.5/server:r1467095-1467109
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java?rev=1467112r1=1467111r2=1467112view=diff
==
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
Thu Apr 11 22:00:45 2013
@@ -227,7 +227,6 @@ abstract public class BasicServlet exten
* Allow the concrete servlet implementation to provide attributes on the
body HTML tag,
* such as 'onload', which can be used to call Javascript methods on page
load.
* By default, nothing is specified.
- * @return
*/
protected String getBodyAttributes() {
return ;
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java?rev=1467112r1=1467111r2=1467112view=diff
==
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
Thu Apr 11 22:00:45 2013
@@ -94,7 +94,7 @@ public class SecurityOperation {
/**
*
- * @Deprecated not for client use
+ * @deprecated not for client use
*/
public SecurityOperation(String instanceId) {
ZKUserPath = Constants.ZROOT + / + instanceId + /users;
Propchange: accumulo/trunk/src/
