You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 11:37:47 UTC
[1/5] oodt git commit: OODT-895 remove measure
Repository: oodt
Updated Branches:
refs/heads/master 96c0ce65c -> d7bbba082
OODT-895 remove measure
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d95d4c7a
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d95d4c7a
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d95d4c7a
Branch: refs/heads/master
Commit: d95d4c7a185d3192fd90dcf1fc88d685062017fa
Parents: 96c0ce6
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 10:23:47 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 10:23:47 2015 +0000
----------------------------------------------------------------------
balance/etc/skel/static/css/balance/balance.css | 6 +--
.../cas-browser/static/css/cas-browser.css | 40 +++++++++---------
.../cas-browser/static/css/dataTables.css | 2 +-
balance/modules/profile/static/css/profile.css | 2 +-
balance/modules/puny/static/css/editor.css | 4 +-
.../org/apache/oodt/cas/curation/HomePage.css | 32 +++++++-------
.../org/apache/oodt/cas/curation/HomePage.html | 2 +-
.../apache/oodt/cas/curation/HomePage_edrn.html | 2 +-
.../oodt/cas/curation/HomePage_wicket.css | 32 +++++++-------
.../oodt/cas/curation/edrn-informatics.css | 44 ++++++++++----------
.../cas/curation/edrn-informatics_wicket.css | 44 ++++++++++----------
.../oodt/cas/curation/login/LoginPage.css | 6 +--
filemgr/src/site/resources/css/guides.css | 2 +-
grid/src/main/webapp/style.css | 4 +-
.../java/org/apache/oodt/pcs/opsui/BasePage.css | 8 ++--
.../apache/oodt/pcs/opsui/BasePage_classic.css | 36 ++++++++--------
.../oodt/pcs/opsui/BasePage_cleanwhite.css | 14 +++----
.../apache/oodt/pcs/opsui/BasePage_navyblue.css | 14 +++----
.../java/org/apache/oodt/pcs/opsui/HomePage.css | 4 +-
.../oodt/pcs/opsui/HomePage_cleanwhite.css | 8 ++--
.../apache/oodt/pcs/opsui/HomePage_navyblue.css | 8 ++--
.../config/filemgr/FileManagerConfigPage.css | 4 +-
.../apache/oodt/pcs/opsui/status/StatusPage.css | 2 +-
.../curation/workbench/Workbench.css | 32 +++++++-------
.../curation/workbench/Workbench.html | 2 +-
.../curation/workbench/Workbench_wicket.css | 32 +++++++-------
.../curation/workbench/jquery.alerts.css | 12 +++---
.../curation/workbench/jquery.alerts_wicket.css | 12 +++---
.../instance/WorkflowInstancesViewer.css | 2 +-
.../workflow/model/WorkflowViewer.css | 2 +-
.../pcs/webcomponents/health/HealthMonitor.css | 2 +-
workflow/src/site/resources/css/guides.css | 2 +-
32 files changed, 209 insertions(+), 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/balance/etc/skel/static/css/balance/balance.css
----------------------------------------------------------------------
diff --git a/balance/etc/skel/static/css/balance/balance.css b/balance/etc/skel/static/css/balance/balance.css
index a67a776..e32eb68 100644
--- a/balance/etc/skel/static/css/balance/balance.css
+++ b/balance/etc/skel/static/css/balance/balance.css
@@ -65,19 +65,19 @@ html,body {
}
h1, h2, h3, h4, h5 {
- margin:10px 0px;
+ margin:10px 0;
}
h1 {
font-size:2.1em;
font-weight:bold;
- margin:15px 0px;
+ margin:15px 0;
}
h2 {
font-size:1.8em;
font-weight:bold;
- margin:12px 0px;
+ margin:12px 0;
}
h3 {
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/balance/modules/cas-browser/static/css/cas-browser.css
----------------------------------------------------------------------
diff --git a/balance/modules/cas-browser/static/css/cas-browser.css b/balance/modules/cas-browser/static/css/cas-browser.css
index c0dadba..f2dd4a7 100644
--- a/balance/modules/cas-browser/static/css/cas-browser.css
+++ b/balance/modules/cas-browser/static/css/cas-browser.css
@@ -42,7 +42,7 @@ div#productTypeSearch_length {
div#productTypeSearch_filter {
float:none;
margin-top:-20px;
- right:0px;
+ right:0;
text-align:left;
width:450px;
}
@@ -60,7 +60,7 @@ table.dataTable {
}
.dataTables_filter input[type=text] {
padding:5px;
- margin-left:0px;
+ margin-left:0;
width:97%;
}
table.dataTable thead tr th {
@@ -96,20 +96,20 @@ table.dataTable tbody tr td a {
*/
ul.tabs {
border-bottom:solid 1px #ccc;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
padding-bottom:6px;
}
ul.tabs li {
display:inline;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
}
ul.tabs li a {
border:solid 1px #ccc;
padding:8px 12px;
margin-right:5px;
- margin-bottom:0px;
+ margin-bottom:0;
background-color:#ccc;
}
ul.tabs li a.selected {
@@ -121,11 +121,11 @@ ul.tabs li a.selected {
* MET VIEWER
*/
h4.toggler {
- padding:5px 0px;
+ padding:5px 0;
text-decoration:underline;
cursor:pointer;
_cursor:hand;
- margin-bottom:0px;
+ margin-bottom:0;
}
table.metwidget {
@@ -160,8 +160,8 @@ table.metwidget.multivalue td {
border:none;
}
table.metwidget table {
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
}
div#section_products {
@@ -174,18 +174,18 @@ div#cas_browser_dataset_download {
ul.pp_productList {
margin-top:10px;
list-style:none;
- padding-left:0px;
+ padding-left:0;
}
ul.pp_productList li {
line-height:28px;
- padding-left:0px;
- margin-left:0px;
+ padding-left:0;
+ margin-left:0;
}
ul.pp_productList li a {
text-decoration:none;
display:block;
background-color:#fff;
- padding:0px 8px;
+ padding:0 8px;
width:100%;
}
ul.pp_productList li a:hover {
@@ -226,8 +226,8 @@ table.metwidget tr td {
}
ul.tabmenu {
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
margin-bottom:15px;
padding-bottom:7px;
border-bottom:solid 1px #ccc;
@@ -260,8 +260,8 @@ div#section_filter_tools_container {
div#section_filter_tools_buttons {
text-align:right;
position:absolute;
- top:0px;
- right:0px;
+ top:0;
+ right:0;
}
div#section_filter_tools {
margin-bottom:15px;
@@ -269,7 +269,7 @@ div#section_filter_tools {
div#filter_widget_exclusive_container {
position:absolute;
top:25px;
- right:0px;
+ right:0;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/balance/modules/cas-browser/static/css/dataTables.css
----------------------------------------------------------------------
diff --git a/balance/modules/cas-browser/static/css/dataTables.css b/balance/modules/cas-browser/static/css/dataTables.css
index e70042c..8abc9df 100644
--- a/balance/modules/cas-browser/static/css/dataTables.css
+++ b/balance/modules/cas-browser/static/css/dataTables.css
@@ -109,7 +109,7 @@
.dataTables_processing {
position: absolute;
- top: 0px;
+ top: 0;
left: 50%;
width: 250px;
margin-left: -125px;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/balance/modules/profile/static/css/profile.css
----------------------------------------------------------------------
diff --git a/balance/modules/profile/static/css/profile.css b/balance/modules/profile/static/css/profile.css
index a8d95a5..5ee73df 100644
--- a/balance/modules/profile/static/css/profile.css
+++ b/balance/modules/profile/static/css/profile.css
@@ -64,7 +64,7 @@ label.invalid {
/* Signup form */
#signupform table {
- border-spacing: 0px;
+ border-spacing: 0;
border-collapse: collapse;
empty-cells: show;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/balance/modules/puny/static/css/editor.css
----------------------------------------------------------------------
diff --git a/balance/modules/puny/static/css/editor.css b/balance/modules/puny/static/css/editor.css
index f6175fa..e51303b 100644
--- a/balance/modules/puny/static/css/editor.css
+++ b/balance/modules/puny/static/css/editor.css
@@ -276,7 +276,7 @@ margin: 0 auto;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
line-height: 1.8em;
margin: 1em 0 0.4em;
- padding: 0.5em; /* I don't really like mixing pct & em here� */
+ padding: 0.5em; /* I don't really like mixing pct & em here� */
width: 100%;
height: 20em;
}
@@ -292,7 +292,7 @@ margin: 0 auto;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-weight: bold;
height: 35px;
- margin: 0px 5px;
+ margin: 0 5px;
padding: 0.4em 1em;
text-shadow: 0 1px 0 #fff;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
index 8af4cce..804405d 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
@@ -26,22 +26,22 @@ div#cas-header {
text-align:right;
border-bottom:solid 1px #000;
overflow:none;
- background:url(blackfade-syncd.jpg) scroll 0px 0px repeat-x;
+ background:url(blackfade-syncd.jpg) scroll 0 0 repeat-x;
}
/* DIV.CAS-LOGO-LEFT */
div#cas-logo-left {
position:absolute;
- top:0px;
- left:0px;
+ top:0;
+ left:0;
height:67px;
width:500px;
}
/* DIV.CAS-LOGO-RIGHT */
div#cas-logo-right {
position:absolute;
- top:0px;
- right:0px;
+ top:0;
+ right:0;
height:67px;
width:290px;
}
@@ -50,11 +50,11 @@ div#cas-logo-right {
h2.app-title {
position:absolute;
top:67px;
- right:0px;
- margin:0px;
+ right:0;
+ margin:0;
width:100%;
padding:5px;
- padding-left:0px;
+ padding-left:0;
font-weight:normal;
font-size:15px;
letter-spacing:0.03em;
@@ -83,8 +83,8 @@ div#breadcrumbs {
}
div#breadcrumbs ul {
list-style:none;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
}
div#breadcrumbs ul li {
display:inline;
@@ -147,7 +147,7 @@ div.success {
/* HEADERS (H1,H2,H3,......) */
h2.title {
padding:5px;
- margin:0px;
+ margin:0;
border-top:solid 2px #900;
border-bottom:solid 1px #300;
font-weight:normal;
@@ -166,7 +166,7 @@ h4 {
/* LOGIN FORM */
form#login-form {
- border:solid 0px #f66;
+ border:solid 0 #f66;
background-color:#fff;
margin:5px;
padding:3px;
@@ -174,8 +174,8 @@ form#login-form {
}
form#login-form h3 {
color:#333;
- margin-top:0px;
- border-bottom:dotted 0px #444;
+ margin-top:0;
+ border-bottom:dotted 0 #444;
}
form#login-form input[type=text], form#login-form input[type=password] {
@@ -186,7 +186,7 @@ form#login-form input[type=text], form#login-form input[type=password] {
form#login-form table {
color:#333;
margin:5px;
- margin-top:0px;
+ margin-top:0;
border:solid 1px #ccc;
width:242px;
}
@@ -206,7 +206,7 @@ div.info {
}
div.info input[type=button] {
padding:2px;
- margin:5px 0px;
+ margin:5px 0;
}
div#infoNoMetadataExtractorDefined {
position:absolute;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
index 7c2876e..a0d8911 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
@@ -125,7 +125,7 @@
<th>MetExtractor</th>
<th>MetExt Config</th>
<th>Status</th>
- <th style="border-right-width:0px;">Action</th>
+ <th style="border-right-width:0;">Action</th>
</tr>
</thead>
<tbody>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
index 59d0c1a..e017835 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
@@ -128,7 +128,7 @@
<th>MetExtractor</th>
<th>MetExt Config</th>
<th>Status</th>
- <th style="border-right-width:0px;">Action</th>
+ <th style="border-right-width:0;">Action</th>
</tr>
</thead>
<tbody>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_wicket.css
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_wicket.css b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_wicket.css
index 91bf12b..a8dc9bc 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_wicket.css
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_wicket.css
@@ -26,22 +26,22 @@ div#cas-header {
text-align:right;
border-bottom:solid 1px #000;
overflow:none;
- background:url(../../images/blackfade-syncd.jpg) scroll 0px 0px repeat-x;
+ background:url(../../images/blackfade-syncd.jpg) scroll 0 0 repeat-x;
}
/* DIV.CAS-LOGO-LEFT */
div#cas-logo-left {
position:absolute;
- top:0px;
- left:0px;
+ top:0;
+ left:0;
height:67px;
width:500px;
}
/* DIV.CAS-LOGO-RIGHT */
div#cas-logo-right {
position:absolute;
- top:0px;
- right:0px;
+ top:0;
+ right:0;
height:67px;
width:290px;
}
@@ -50,11 +50,11 @@ div#cas-logo-right {
h2.app-title {
position:absolute;
top:67px;
- right:0px;
- margin:0px;
+ right:0;
+ margin:0;
width:100%;
padding:5px;
- padding-left:0px;
+ padding-left:0;
font-weight:normal;
font-size:15px;
letter-spacing:0.03em;
@@ -83,8 +83,8 @@ div#breadcrumbs {
}
div#breadcrumbs ul {
list-style:none;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
}
div#breadcrumbs ul li {
display:inline;
@@ -147,7 +147,7 @@ div.success {
/* HEADERS (H1,H2,H3,......) */
h2.title {
padding:5px;
- margin:0px;
+ margin:0;
border-top:solid 2px #900;
border-bottom:solid 1px #300;
font-weight:normal;
@@ -166,7 +166,7 @@ h4 {
/* LOGIN FORM */
form#login-form {
- border:solid 0px #f66;
+ border:solid 0 #f66;
background-color:#fff;
margin:5px;
padding:3px;
@@ -174,8 +174,8 @@ form#login-form {
}
form#login-form h3 {
color:#333;
- margin-top:0px;
- border-bottom:dotted 0px #444;
+ margin-top:0;
+ border-bottom:dotted 0 #444;
}
form#login-form input[type=text], form#login-form input[type=password] {
@@ -186,7 +186,7 @@ form#login-form input[type=text], form#login-form input[type=password] {
form#login-form table {
color:#333;
margin:5px;
- margin-top:0px;
+ margin-top:0;
border:solid 1px #ccc;
width:242px;
}
@@ -206,7 +206,7 @@ div.info {
}
div.info input[type=button] {
padding:2px;
- margin:5px 0px;
+ margin:5px 0;
}
div#infoNoMetadataExtractorDefined {
position:absolute;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
index 1673bf8..d139d85 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
@@ -16,8 +16,8 @@
* limitations under the License.
*/
html, body {
- padding:0px;
- margin:0px auto;
+ padding:0;
+ margin:0 auto;
background:transparent url(bg-body.gif) repeat-x scroll 0 0;
background-color:#fff;
font-family:"Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
@@ -34,7 +34,7 @@ div#ncibanner {
}
div#ncibanner-inner {
width:974px;
- margin:0px auto;
+ margin:0 auto;
position:relative;
}
div.#ncibanner-inner a {
@@ -81,7 +81,7 @@ h2.dcplogo {
div#page, div#footer {
width:974px;
- margin:0px auto;
+ margin:0 auto;
position:relative;
}
@@ -100,7 +100,7 @@ div#edrninformatics {
* This is the header that precedes application content.
*/
div#edrninformatics.cas-header {
- background:url(blackfade-syncd.jpg) scroll 0px 0px repeat-x;
+ background:url(blackfade-syncd.jpg) scroll 0 0 repeat-x;
}
div#edrninformatics.cas-header div.menu {
padding-top:50px;
@@ -130,7 +130,7 @@ div#edrn-dna.cas-logo-right {
div#edrnlogo {
height:68px;
width:974px;
- margin:0px auto;
+ margin:0 auto;
}
img#edrnlogo-logo {
width:64px;
@@ -139,7 +139,7 @@ img#edrnlogo-logo {
margin-right:5px;
vertical-align:top;
float:left;
- border:solid 0px #955;
+ border:solid 0 #955;
}
div#edrnlogo h1.header-title {
font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -180,8 +180,8 @@ div#edrnlogo span.smaller {
*/
div#edrn-dna {
position:absolute;
- top:0px;
- right:0px;
+ top:0;
+ right:0;
height:67px;
width:290px;
background:url(edrn_dna-bigger.jpg) scroll left top no-repeat;
@@ -195,12 +195,12 @@ div#edrn-dna {
*/
h2.app-title {
position:absolute;
- top:0px;
- right:0px;
+ top:0;
+ right:0;
background-color:transparent;
- margin:0px;
+ margin:0;
padding:5px;
- padding-right:0px;
+ padding-right:0;
color:#722;
font-weight:normal;
font-size:13px;
@@ -275,7 +275,7 @@ div#breadcrumbs {
padding:4px;
padding-right:5px;
padding-left:5px;
- border-top:solid 0px #700003;
+ border-top:solid 0 #700003;
border-bottom:solid 1px #700003;
padding-bottom:5px;
background-color:#fff;
@@ -284,8 +284,8 @@ div#breadcrumbs {
}
div#breadcrumbs ul {
list-style:none;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
}
div#breadcrumbs ul li {
display:inline;
@@ -323,7 +323,7 @@ div#footer img {
h2.title {
background-color:#555;
padding:5px;
- margin:0px;
+ margin:0;
color:#fff;
border-top:solid 2px #900;
border-bottom:solid 1px #300;
@@ -351,7 +351,7 @@ h4 {
* LOGIN FORM
*/
form#login-form {
- border:solid 0px #f66;
+ border:solid 0 #f66;
background-color:#fff;
margin:5px;
padding:3px;
@@ -359,8 +359,8 @@ form#login-form {
}
form#login-form h3 {
color:#333;
- margin-top:0px;
- border-bottom:dotted 0px #444;
+ margin-top:0;
+ border-bottom:dotted 0 #444;
}
form#login-form input[type=text], form#login-form input[type=password] {
@@ -371,7 +371,7 @@ form#login-form input[type=text], form#login-form input[type=password] {
form#login-form table {
color:#333;
margin:5px;
- margin-top:0px;
+ margin-top:0;
border:solid 1px #ccc;
width:242px;
}
@@ -411,7 +411,7 @@ div.info {
}
div.info input[type=button] {
padding:2px;
- margin:5px 0px;
+ margin:5px 0;
}
#centered{
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
index d4aad4f..e93ee8c 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
@@ -16,8 +16,8 @@
* limitations under the License.
*/
html, body {
- padding:0px;
- margin:0px auto;
+ padding:0;
+ margin:0 auto;
background:transparent url(../../images/bg-body.gif) repeat-x scroll 0 0;
background-color:#fff;
font-family:"Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
@@ -34,7 +34,7 @@ div#ncibanner {
}
div#ncibanner-inner {
width:974px;
- margin:0px auto;
+ margin:0 auto;
position:relative;
}
div.#ncibanner-inner a {
@@ -81,7 +81,7 @@ h2.dcplogo {
div#page, div#footer {
width:974px;
- margin:0px auto;
+ margin:0 auto;
position:relative;
}
@@ -100,7 +100,7 @@ div#edrninformatics {
* This is the header that precedes application content.
*/
div#edrninformatics.cas-header {
- background:url(../../images/blackfade-syncd.jpg) scroll 0px 0px repeat-x;
+ background:url(../../images/blackfade-syncd.jpg) scroll 0 0 repeat-x;
}
div#edrninformatics.cas-header div.menu {
padding-top:50px;
@@ -130,7 +130,7 @@ div#edrn-dna.cas-logo-right {
div#edrnlogo {
height:68px;
width:974px;
- margin:0px auto;
+ margin:0 auto;
}
img#edrnlogo-logo {
width:64px;
@@ -139,7 +139,7 @@ img#edrnlogo-logo {
margin-right:5px;
vertical-align:top;
float:left;
- border:solid 0px #955;
+ border:solid 0 #955;
}
div#edrnlogo h1.header-title {
font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -180,8 +180,8 @@ div#edrnlogo span.smaller {
*/
div#edrn-dna {
position:absolute;
- top:0px;
- right:0px;
+ top:0;
+ right:0;
height:67px;
width:290px;
background:url(../../images/edrn_dna-bigger.jpg) scroll left top no-repeat;
@@ -195,12 +195,12 @@ div#edrn-dna {
*/
h2.app-title {
position:absolute;
- top:0px;
- right:0px;
+ top:0;
+ right:0;
background-color:transparent;
- margin:0px;
+ margin:0;
padding:5px;
- padding-right:0px;
+ padding-right:0;
color:#722;
font-weight:normal;
font-size:13px;
@@ -275,7 +275,7 @@ div#breadcrumbs {
padding:4px;
padding-right:5px;
padding-left:5px;
- border-top:solid 0px #700003;
+ border-top:solid 0 #700003;
border-bottom:solid 1px #700003;
padding-bottom:5px;
background-color:#fff;
@@ -284,8 +284,8 @@ div#breadcrumbs {
}
div#breadcrumbs ul {
list-style:none;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
}
div#breadcrumbs ul li {
display:inline;
@@ -323,7 +323,7 @@ div#footer img {
h2.title {
background-color:#555;
padding:5px;
- margin:0px;
+ margin:0;
color:#fff;
border-top:solid 2px #900;
border-bottom:solid 1px #300;
@@ -351,7 +351,7 @@ h4 {
* LOGIN FORM
*/
form#login-form {
- border:solid 0px #f66;
+ border:solid 0 #f66;
background-color:#fff;
margin:5px;
padding:3px;
@@ -359,8 +359,8 @@ form#login-form {
}
form#login-form h3 {
color:#333;
- margin-top:0px;
- border-bottom:dotted 0px #444;
+ margin-top:0;
+ border-bottom:dotted 0 #444;
}
form#login-form input[type=text], form#login-form input[type=password] {
@@ -371,7 +371,7 @@ form#login-form input[type=text], form#login-form input[type=password] {
form#login-form table {
color:#333;
margin:5px;
- margin-top:0px;
+ margin-top:0;
border:solid 1px #ccc;
width:242px;
}
@@ -411,7 +411,7 @@ div.info {
}
div.info input[type=button] {
padding:2px;
- margin:5px 0px;
+ margin:5px 0;
}
#centered{
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
----------------------------------------------------------------------
diff --git a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
index 4b79590..9fa5b83 100644
--- a/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
+++ b/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
@@ -33,7 +33,7 @@
}
#invalid_creds{
align:center;
- margin:0px;
+ margin:0;
margin-bottom:5px;
width:230px;
font-size:90%;
@@ -41,7 +41,7 @@
#connect_error{
align:center;
- margin:0px;
+ margin:0;
margin-bottom:5px;
width:230px;
font-size:90%;
@@ -49,7 +49,7 @@
#spacer{
align:center;
- margin:0px;
+ margin:0;
margin-bottom:5px;
width:230px;
font-size:90%;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/filemgr/src/site/resources/css/guides.css
----------------------------------------------------------------------
diff --git a/filemgr/src/site/resources/css/guides.css b/filemgr/src/site/resources/css/guides.css
index df4af72..a9cf4e3 100644
--- a/filemgr/src/site/resources/css/guides.css
+++ b/filemgr/src/site/resources/css/guides.css
@@ -17,7 +17,7 @@
.info, .success, .warning, .error, .validation {
border: 1px solid;
-margin: 10px 0px;
+margin: 10px 0;
padding:15px 10px 15px 50px;
background-repeat: no-repeat;
background-position: 10px center;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/grid/src/main/webapp/style.css
----------------------------------------------------------------------
diff --git a/grid/src/main/webapp/style.css b/grid/src/main/webapp/style.css
index d976f01..0cce428 100755
--- a/grid/src/main/webapp/style.css
+++ b/grid/src/main/webapp/style.css
@@ -39,8 +39,8 @@ h3 {
fieldset {
border: 1 solid #336699;
- margin: 1em 0em 1em 0em;
- padding: 0em 1em 1em 1em;
+ margin: 1em 0 1em 0;
+ padding: 0 1em 1em 1em;
line-height: 1.5em;
width: auto;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.css
index 7ed928b..3953da1 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.css
@@ -47,11 +47,11 @@
#footer{
position:fixed;
- bottom:0px;
+ bottom:0;
width:100%;
height:80px;
- padding:5px 0px;
- border-spacing:0px;
+ padding:5px 0;
+ border-spacing:0;
border-top:solid 1px #2e3e4e;
font-size:90%;
z-index:10000;
@@ -63,7 +63,7 @@
}
#feedback {
- margin:0px;
+ margin:0;
margin-top:-20px;
font-size:90%;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.css
index 84f1d4c..a89fd48 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.css
@@ -26,27 +26,27 @@ body{
}
#opsui_header_tbl{
- border:0px;
- border-spacing:0px;
+ border:0;
+ border-spacing:0;
white-space:nowrap;
- padding:0px;
+ padding:0;
width:100%;
}
#opsui_inner_header_tbl{
- border:0px;
- border-spacing:0px;
+ border:0;
+ border-spacing:0;
white-space:nowrap;
- padding:0px;
+ padding:0;
width:100%;
}
#menu_inner_tbl{
- padding:0px;
+ padding:0;
border-spacing:1px;
- border:0px;
+ border:0;
width:100%;
color:white;
}
@@ -59,9 +59,9 @@ body{
}
#menu_tbl_links{
- padding:0px;
+ padding:0;
border-spacing:1px;
- border:0px;
+ border:0;
width:100%;
color:white;
}
@@ -98,13 +98,13 @@ body{
#footer_tbl{
padding:4px;
- border-spacing:0px;
+ border-spacing:0;
width:730px;
- border:0px;
+ border:0;
}
.banner{
- border:0px;
+ border:0;
width:379px;
height:65px;
}
@@ -123,7 +123,7 @@ body{
.tight-noborder{
vertical-spacing:0px;
width:100%;
- border:0px;
+ border:0;
}
.white {
@@ -146,13 +146,13 @@ body{
.firstGovImg{
height:39px;
width:136px;
- border:0px;
+ border:0;
}
.nasaHomePageImg{
height:40px;
width:61px;
- border:0px;
+ border:0;
}
.feedback{
@@ -215,8 +215,8 @@ a:hover{
border-right: 1px;
padding-right: 1px;
border-width: 1px;
- border-top:0px;
- border-bottom:0px;
+ border-top:0;
+ border-bottom:0;
border-style:solid;
border-color:black;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.css
index 3883e97..adfc661 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.css
@@ -24,8 +24,8 @@
body {
background-color:#FFF;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
font-family: verdana, arial, sans-serif;
font-size: small;
}
@@ -72,11 +72,11 @@ body {
#footer{
position:fixed;
- bottom:0px;
+ bottom:0;
width:100%;
height:80px;
- padding:5px 0px;
- border-spacing:0px;
+ padding:5px 0;
+ border-spacing:0;
border-top:solid 1px #2e3e4e;
background-color: #EEE;
font-size:90%;
@@ -93,7 +93,7 @@ body {
}
#feedback {
- margin:0px;
+ margin:0;
margin-top:-20px;
font-size:90%;
}
@@ -193,7 +193,7 @@ div#breadcrumbs a {
}
div#breadcrumbs span.divider {
- padding:0px 5px;
+ padding:0 5px;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_navyblue.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_navyblue.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_navyblue.css
index 3b43dad..b9b6981 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_navyblue.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_navyblue.css
@@ -24,8 +24,8 @@
body {
background-color:#345;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
font-family: arial, verdana, sans-serif;
}
@@ -68,11 +68,11 @@ body {
#footer{
position:fixed;
- bottom:0px;
+ bottom:0;
width:100%;
height:80px;
- padding:5px 0px;
- border-spacing:0px;
+ padding:5px 0;
+ border-spacing:0;
border-top:solid 1px #2e3e4e;
color:#234;
background-color:#364656;
@@ -90,7 +90,7 @@ body {
}
#feedback {
- margin:0px;
+ margin:0;
margin-top:-20px;
font-size:90%;
}
@@ -188,7 +188,7 @@ div#breadcrumbs a {
}
div#breadcrumbs span.divider {
- padding:0px 5px;
+ padding:0 5px;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.css
index 0f32f07..7e92b7d 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.css
@@ -54,8 +54,8 @@
position:absolute;
bottom:20px;
width:100%;
- padding:10px 0px;
- border-spacing:0px;
+ padding:10px 0;
+ border-spacing:0;
border-top:solid 1px #2e3e4e;
color:#234;
font-size:90%;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_cleanwhite.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_cleanwhite.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_cleanwhite.css
index 1825c94..1030db1 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_cleanwhite.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_cleanwhite.css
@@ -22,8 +22,8 @@
body {
background-color:#FFF;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
font-family: verdana, arial, sans-serif;
}
@@ -74,8 +74,8 @@ body {
position:absolute;
bottom:20px;
width:100%;
- padding:10px 0px;
- border-spacing:0px;
+ padding:10px 0;
+ border-spacing:0;
border-top:solid 1px #2e3e4e;
color:#234;
font-size:90%;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_navyblue.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_navyblue.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_navyblue.css
index cdb22ac..8dc522f 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_navyblue.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage_navyblue.css
@@ -22,8 +22,8 @@
body {
background-color:#345;
- margin:0px;
- padding:0px;
+ margin:0;
+ padding:0;
font-family: arial, verdana, sans-serif;
}
@@ -73,8 +73,8 @@ body {
position:absolute;
bottom:20px;
width:100%;
- padding:10px 0px;
- border-spacing:0px;
+ padding:10px 0;
+ border-spacing:0;
border-top:solid 1px #2e3e4e;
color:#234;
font-size:90%;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
index 518ee56..99adee3 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
@@ -17,14 +17,14 @@
#fm_cfg_outer_shell{
width:100%;
height:570px;
- border-spacing:0px;
+ border-spacing:0;
border: 1px solid #000000;
}
#sixpadded{
width:100px;
border:1px solid #000000;
- border-spacing:0px;
+ border-spacing:0;
padding: 6px;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.css
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.css b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.css
index 23c852c..9596599 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.css
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.css
@@ -16,7 +16,7 @@
*/
#widenoborder{
width:100%;
- border:0px;
+ border:0;
}
#fm_status{
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
index 0a22ba8..c281c51 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
@@ -18,8 +18,8 @@ UL.fileTree {
font-family: Verdana, sans-serif;
font-size: 11px;
line-height: 18px;
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
LI.helper {
@@ -30,9 +30,9 @@ LI.helper {
UL.fileTree LI, LI.helper {
list-style: none;
- padding: 0px;
+ padding: 0;
padding-left: 20px;
- margin: 0px;
+ margin: 0;
white-space: nowrap;
}
@@ -40,7 +40,7 @@ UL.fileTree A, LI.helper A {
color: #333;
text-decoration: none;
display: block;
- padding: 0px 2px;
+ padding: 0 2px;
}
UL.fileTree A:hover, LI.helper A {
@@ -123,14 +123,14 @@ UL.fileTree A:hover, LI.helper A {
/* UI.TABS */
-.ui-tabs { padding: 0em; zoom: 1; font-size:11px; }
-.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: 0px; }
+.ui-tabs { padding: 0; zoom: 1; font-size:11px; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: 0; }
.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0; margin: 0 .2em; padding: 0; }
.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 3px; border-bottom-color:#fff; margin-bottom:-2px; overflow:none; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { padding: 1em 0em; display: block; background: none; }
+.ui-tabs .ui-tabs-panel { padding: 1em 0; display: block; background: none; }
.ui-tabs .ui-tabs-hide { display: none !important; }
@@ -140,7 +140,7 @@ UL.fileTree A:hover, LI.helper A {
.ui-tabs .ui-tabs-nav li a { color: #fff; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a { color: #555; }
.ui-tabs .ui-tabs-nav { }
-.ui-tabs .ui-tabs-panel { padding: 1em 0em; margin: 0em; border-top: solid 1px #ccc;}
+.ui-tabs .ui-tabs-panel { padding: 1em 0; margin: 0; border-top: solid 1px #ccc;}
@@ -225,12 +225,12 @@ div#catalogMetadataWorkbenchContent {
background-color:#EEEEEE;
border:solid 1px #ccc;
padding-top:18px;
- margin:5px 0px;
+ margin:5px 0;
}
.container h5 {
position:relative;
margin:-20px -4px 5px;
- padding:0px;
+ padding:0;
font-family:arial,sans-serif;
text-transform:uppercase;
color:#999;
@@ -250,7 +250,7 @@ div#catalogMetadataWorkbenchContent {
/* METADATA EDITOR */
div.editor {
position:relative;
- padding:0px;
+ padding:0;
}
div.editor.info {
@@ -291,7 +291,7 @@ div.editor table tr td {
padding-top:20px;
}
.container.tasks h5 {
- margin:-18px 0px 2px;
+ margin:-18px 0 2px;
}
div#ingestionTaskList {
@@ -357,12 +357,12 @@ div#droppedFileList {
div.ptwbSectionBox {
border:solid 1px #ccc;
padding:2px;
- margin:5px 0px 2px 0px;
+ margin:5px 0 2px 0;
}
div.ptwbSectionBox h5 {
margin:0 0 4px;
- padding:0px;
+ padding:0;
}
div#droppedFileTarget {
@@ -391,7 +391,7 @@ div.editor table tr td {
div.editor table tr td img.pencil {
position:relative;
- left:0px;
+ left:0;
cursor:pointer;
_cursor:hand;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
index 9f796d6..351d2f2 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
@@ -96,7 +96,7 @@ the License.
<th>MetExtractor</th>
<th>MetExt Config</th>
<th>Status</th>
- <th style="border-right-width:0px;">Action</th>
+ <th style="border-right-width:0;">Action</th>
</tr>
</thead>
<tbody>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
index c383088..acfa555 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
@@ -18,8 +18,8 @@ UL.fileTree {
font-family: Verdana, sans-serif;
font-size: 11px;
line-height: 18px;
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
LI.helper {
@@ -30,9 +30,9 @@ LI.helper {
UL.fileTree LI, LI.helper {
list-style: none;
- padding: 0px;
+ padding: 0;
padding-left: 20px;
- margin: 0px;
+ margin: 0;
white-space: nowrap;
}
@@ -40,7 +40,7 @@ UL.fileTree A, LI.helper A {
color: #333;
text-decoration: none;
display: block;
- padding: 0px 2px;
+ padding: 0 2px;
}
UL.fileTree A:hover, LI.helper A {
@@ -123,14 +123,14 @@ UL.fileTree A:hover, LI.helper A {
/* UI.TABS */
-.ui-tabs { padding: 0em; zoom: 1; font-size:11px; }
-.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: 0px; }
+.ui-tabs { padding: 0; zoom: 1; font-size:11px; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: 0; }
.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0; margin: 0 .2em; padding: 0; }
.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 3px; border-bottom-color:#fff; margin-bottom:-2px; overflow:none; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { padding: 1em 0em; display: block; background: none; }
+.ui-tabs .ui-tabs-panel { padding: 1em 0; display: block; background: none; }
.ui-tabs .ui-tabs-hide { display: none !important; }
@@ -140,7 +140,7 @@ UL.fileTree A:hover, LI.helper A {
.ui-tabs .ui-tabs-nav li a { color: #fff; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a { color: #555; }
.ui-tabs .ui-tabs-nav { }
-.ui-tabs .ui-tabs-panel { padding: 1em 0em; margin: 0em; border-top: solid 1px #ccc;}
+.ui-tabs .ui-tabs-panel { padding: 1em 0; margin: 0; border-top: solid 1px #ccc;}
@@ -225,12 +225,12 @@ div#catalogMetadataWorkbenchContent {
background-color:#EEEEEE;
border:solid 1px #ccc;
padding-top:18px;
- margin:5px 0px;
+ margin:5px 0;
}
.container h5 {
position:relative;
margin:-20px -4px 5px;
- padding:0px;
+ padding:0;
font-family:arial,sans-serif;
text-transform:uppercase;
color:#999;
@@ -250,7 +250,7 @@ div#catalogMetadataWorkbenchContent {
/* METADATA EDITOR */
div.editor {
position:relative;
- padding:0px;
+ padding:0;
}
div.editor.info {
@@ -291,7 +291,7 @@ div.editor table tr td {
padding-top:20px;
}
.container.tasks h5 {
- margin:-18px 0px 2px;
+ margin:-18px 0 2px;
}
div#ingestionTaskList {
@@ -357,12 +357,12 @@ div#droppedFileList {
div.ptwbSectionBox {
border:solid 1px #ccc;
padding:2px;
- margin:5px 0px 2px 0px;
+ margin:5px 0 2px 0;
}
div.ptwbSectionBox h5 {
margin:0 0 4px;
- padding:0px;
+ padding:0;
}
div#droppedFileTarget {
@@ -391,7 +391,7 @@ div.editor table tr td {
div.editor table tr td img.pencil {
position:relative;
- left:0px;
+ left:0;
cursor:pointer;
_cursor:hand;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
index 6fd1879..d5fe5a9 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
@@ -38,14 +38,14 @@
border: solid 1px #FFF;
border-bottom: solid 1px #999;
cursor: default;
- padding: 0em;
- margin: 0em;
+ padding: 0;
+ margin: 0;
}
#popup_content {
background: 16px 16px no-repeat url(info.gif);
padding: 1em 1.75em;
- margin: 0em;
+ margin: 0;
}
#popup_content.alert {
@@ -66,12 +66,12 @@
#popup_panel {
text-align: center;
- margin: 1em 0em 0em 1em;
+ margin: 1em 0 0 1em;
}
#popup_prompt {
- margin: .5em 0em;
+ margin: .5em 0;
}
.popup_multiPrompt {
- margin: 0.5em 0em;
+ margin: 0.5em 0;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
index 38b205c..947f316 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
@@ -38,14 +38,14 @@
border: solid 1px #FFF;
border-bottom: solid 1px #999;
cursor: default;
- padding: 0em;
- margin: 0em;
+ padding: 0;
+ margin: 0;
}
#popup_content {
background: 16px 16px no-repeat url(../../images/info.gif);
padding: 1em 1.75em;
- margin: 0em;
+ margin: 0;
}
#popup_content.alert {
@@ -66,12 +66,12 @@
#popup_panel {
text-align: center;
- margin: 1em 0em 0em 1em;
+ margin: 1em 0 0 1em;
}
#popup_prompt {
- margin: .5em 0em;
+ margin: .5em 0;
}
.popup_multiPrompt {
- margin: 0.5em 0em;
+ margin: 0.5em 0;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.css
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.css b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.css
index 0536f64..14b259c 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.css
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.css
@@ -27,7 +27,7 @@ a.workflow_status{
}
#workflow_inst_tbl{
- border:0px;
+ border:0;
border-spacing:3px;
border: 4px #000000;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
index c3347f8..ac2aae5 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
@@ -39,5 +39,5 @@
height:16;
text-align:center;
vertical-align:middle;
- border-width: 0px;
+ border-width: 0;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.css
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.css b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.css
index 6186f6c..0c0da48 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.css
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.css
@@ -17,7 +17,7 @@
#widenoborder{
width:100%;
- border:0px;
+ border:0;
}
#fm_status{
http://git-wip-us.apache.org/repos/asf/oodt/blob/d95d4c7a/workflow/src/site/resources/css/guides.css
----------------------------------------------------------------------
diff --git a/workflow/src/site/resources/css/guides.css b/workflow/src/site/resources/css/guides.css
index df4af72..a9cf4e3 100644
--- a/workflow/src/site/resources/css/guides.css
+++ b/workflow/src/site/resources/css/guides.css
@@ -17,7 +17,7 @@
.info, .success, .warning, .error, .validation {
border: 1px solid;
-margin: 10px 0px;
+margin: 10px 0;
padding:15px 10px 15px 50px;
background-repeat: no-repeat;
background-position: 10px center;
[3/5] oodt git commit: OODT-896 remove interface modifier
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigMetKeys.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigMetKeys.java b/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigMetKeys.java
index fe91029..fa4688c 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigMetKeys.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigMetKeys.java
@@ -24,73 +24,73 @@ package org.apache.oodt.cas.pge.config;
*/
public interface PgeConfigMetKeys {
- public static final String IMPORT_TAG = "import";
+ String IMPORT_TAG = "import";
- public static final String NAMESPACE_ATTR = "namespace";
+ String NAMESPACE_ATTR = "namespace";
- public static final String FILE_ATTR = "file";
+ String FILE_ATTR = "file";
- public static final String CUSTOM_METADATA_TAG = "customMetadata";
+ String CUSTOM_METADATA_TAG = "customMetadata";
- public static final String METADATA_TAG = "metadata";
+ String METADATA_TAG = "metadata";
- public static final String KEYREF_ATTR = "key-ref";
+ String KEYREF_ATTR = "key-ref";
- public static final String KEY_GEN_ATTR = "key-gen";
+ String KEY_GEN_ATTR = "key-gen";
- public static final String KEY_ATTR = "key";
+ String KEY_ATTR = "key";
- public static final String VAL_ATTR = "val";
+ String VAL_ATTR = "val";
- public static final String ENV_REPLACE_ATTR = "envReplace";
+ String ENV_REPLACE_ATTR = "envReplace";
- public static final String ENV_REPLACE_NO_RECUR_ATTR = "envReplace-NoRecur";
+ String ENV_REPLACE_NO_RECUR_ATTR = "envReplace-NoRecur";
- public static final String SPLIT_ATTR = "split";
+ String SPLIT_ATTR = "split";
- public static final String WORKFLOW_MET_ATTR = "workflowMet";
+ String WORKFLOW_MET_ATTR = "workflowMet";
- public static final String DYN_INPUT_FILES_TAG = "dynInputFiles";
+ String DYN_INPUT_FILES_TAG = "dynInputFiles";
- public static final String FILE_TAG = "file";
+ String FILE_TAG = "file";
- public static final String PATH_ATTR = "path";
+ String PATH_ATTR = "path";
- public static final String WRITER_CLASS_ATTR = "writerClass";
+ String WRITER_CLASS_ATTR = "writerClass";
- public static final String ARGS_ATTR = "args";
+ String ARGS_ATTR = "args";
- public static final String EXE_TAG = "exe";
+ String EXE_TAG = "exe";
- public static final String DIR_ATTR = "dir";
+ String DIR_ATTR = "dir";
- public static final String SHELL_TYPE_ATTR = "shellType";
+ String SHELL_TYPE_ATTR = "shellType";
- public static final String CMD_TAG = "cmd";
+ String CMD_TAG = "cmd";
- public static final String OUTPUT_TAG = "output";
+ String OUTPUT_TAG = "output";
- public static final String DIR_TAG = "dir";
+ String DIR_TAG = "dir";
- public static final String CREATE_BEFORE_EXEC_ATTR = "createBeforeExe";
+ String CREATE_BEFORE_EXEC_ATTR = "createBeforeExe";
- public static final String FILES_TAG = "files";
+ String FILES_TAG = "files";
- public static final String REGEX_ATTR = "regExp";
+ String REGEX_ATTR = "regExp";
- public static final String NAME_ATTR = "name";
+ String NAME_ATTR = "name";
- public static final String MET_FILE_WRITER_CLASS_ATTR = "metFileWriterClass";
+ String MET_FILE_WRITER_CLASS_ATTR = "metFileWriterClass";
- public static final String RENAMING_CONV_TAG = "renamingConv";
+ String RENAMING_CONV_TAG = "renamingConv";
- public static final String NAMING_EXPR_ATTR = "namingExpr";
+ String NAMING_EXPR_ATTR = "namingExpr";
- public static final String FILE_STAGING_TAG = "fileStaging";
+ String FILE_STAGING_TAG = "fileStaging";
- public static final String STAGE_FILES_TAG = "stageFiles";
+ String STAGE_FILES_TAG = "stageFiles";
- public static final String METADATA_KEY_ATTR = "metadataKey";
+ String METADATA_KEY_ATTR = "metadataKey";
- public static final String FORCE_ATTR = "force";
+ String FORCE_ATTR = "force";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pge/src/main/java/org/apache/oodt/cas/pge/writers/SciPgeConfigFileWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/SciPgeConfigFileWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/SciPgeConfigFileWriter.java
index cbaf55e..8f8417e 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/SciPgeConfigFileWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/SciPgeConfigFileWriter.java
@@ -45,7 +45,7 @@ public interface SciPgeConfigFileWriter {
* @return
* @throws IOException
*/
- public File createConfigFile(String sciPgeConfigFilePath,
- Metadata inputMetadata, Object... customArgs) throws IOException;
+ File createConfigFile(String sciPgeConfigFilePath,
+ Metadata inputMetadata, Object... customArgs) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java
index 5638a21..c619883 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java
@@ -47,7 +47,7 @@ public interface OFSNGetHandler {
* @throws ProductException
* If any error occurs.
*/
- public byte[] retrieveChunk(String filepath, long offset, int length)
+ byte[] retrieveChunk(String filepath, long offset, int length)
throws ProductException;
/**
@@ -59,7 +59,7 @@ public interface OFSNGetHandler {
* @return The size of the remote file, potentially after a remote
* transformation has occured.
*/
- public long sizeOf(String filepath);
+ long sizeOf(String filepath);
/**
* Configures this handler with the provided configuration stored in a
@@ -68,6 +68,6 @@ public interface OFSNGetHandler {
* @param conf
* The configuration for this list handler.
*/
- public void configure(Properties conf);
+ void configure(Properties conf);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java
index 72c24d3..5e23d58 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java
@@ -48,7 +48,7 @@ public interface OFSNListHandler {
* @throws ProductException
* If any error occurs performing the listing on the server side.
*/
- public File[] getListing(String ofsn) throws ProductException;
+ File[] getListing(String ofsn) throws ProductException;
/**
* Configures this handler with the provided configuration stored in a
@@ -57,5 +57,5 @@ public interface OFSNListHandler {
* @param conf
* The configuration for this list handler.
*/
- public void configure(Properties conf);
+ void configure(Properties conf);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNMetKeys.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNMetKeys.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNMetKeys.java
index 91be3f8..e56d7aa 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNMetKeys.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNMetKeys.java
@@ -27,15 +27,15 @@ package org.apache.oodt.product.handlers.ofsn.metadata;
*/
public interface OFSNMetKeys {
- public static final String LISTING_CMD = "listing";
+ String LISTING_CMD = "listing";
- public static final String GET_CMD = "get";
+ String GET_CMD = "get";
- public static final String OFSN_XML_CONF_FILE_KEY = "org.apache.oodt.product.handlers.ofsn.xmlConfigFilePath";
+ String OFSN_XML_CONF_FILE_KEY = "org.apache.oodt.product.handlers.ofsn.xmlConfigFilePath";
- public static final String OFSN_COMPUTE_DIR_SIZE = "org.apache.oodt.product.handlers.ofsn.computeDirSize";
+ String OFSN_COMPUTE_DIR_SIZE = "org.apache.oodt.product.handlers.ofsn.computeDirSize";
- public static final String OFSN_COMPUTE_FILE_SIZE = "org.apache.oodt.product.handlers.ofsn.computeFileSize";
+ String OFSN_COMPUTE_FILE_SIZE = "org.apache.oodt.product.handlers.ofsn.computeFileSize";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLConfigMetKeys.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLConfigMetKeys.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLConfigMetKeys.java
index 17a7891..f4f8c53 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLConfigMetKeys.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLConfigMetKeys.java
@@ -29,27 +29,27 @@ package org.apache.oodt.product.handlers.ofsn.metadata;
*/
public interface OFSNXMLConfigMetKeys {
- public static final String OFSN_CFG_ID_ATTR = "id";
+ String OFSN_CFG_ID_ATTR = "id";
- public static final String OFSN_CFG_NAME_ATTR = "name";
+ String OFSN_CFG_NAME_ATTR = "name";
- public static final String OFSN_PRODUCT_ROOT_ATTR = "productRoot";
+ String OFSN_PRODUCT_ROOT_ATTR = "productRoot";
- public static final String HANDLER_TAG = "handler";
+ String HANDLER_TAG = "handler";
- public static final String HANDLER_CLASSNAME_ATTR = "class";
+ String HANDLER_CLASSNAME_ATTR = "class";
- public static final String HANDLER_NAME_ATTR = "name";
+ String HANDLER_NAME_ATTR = "name";
- public static final String HANDLER_TYPE_ATTR = "type";
+ String HANDLER_TYPE_ATTR = "type";
- public static final String PROPERTY_TAG = "property";
+ String PROPERTY_TAG = "property";
- public static final String PROPERTY_NAME_ATTR = "name";
+ String PROPERTY_NAME_ATTR = "name";
- public static final String PROPERTY_VALUE_ATTR = "value";
+ String PROPERTY_VALUE_ATTR = "value";
/* optional handler property attributes supported by all handlers */
- public static final String PROPERTY_MIMETYPE_ATTR = "mimeType";
+ String PROPERTY_MIMETYPE_ATTR = "mimeType";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java
index a694c97..0bcdd75 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java
@@ -27,17 +27,17 @@ package org.apache.oodt.product.handlers.ofsn.metadata;
*/
public interface OFSNXMLMetKeys {
- public static final String DIR_RESULT_TAG = "dirResult";
+ String DIR_RESULT_TAG = "dirResult";
- public static final String DIR_ENTRY_TAG = "dirEntry";
+ String DIR_ENTRY_TAG = "dirEntry";
- public static final String OFSN_TAG = "OFSN";
+ String OFSN_TAG = "OFSN";
- public static final String FILE_SIZE_TAG = "fileSize";
+ String FILE_SIZE_TAG = "fileSize";
- public static final String XML_MIME_TYPE = "text/xml";
+ String XML_MIME_TYPE = "text/xml";
// FIXME: change namespace URI?
- public static final String DIR_LISTING_NS = "http://oodt.jpl.nasa.gov/xml/namespaces/dirlist/1.0";
+ String DIR_LISTING_NS = "http://oodt.jpl.nasa.gov/xml/namespaces/dirlist/1.0";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OODTMetKeys.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OODTMetKeys.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OODTMetKeys.java
index 777faf5..56ff703 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OODTMetKeys.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OODTMetKeys.java
@@ -26,6 +26,6 @@ package org.apache.oodt.product.handlers.ofsn.metadata;
*/
public interface OODTMetKeys {
- public static final String XMLQUERY_QUERYELEM_ROLE_ELEM = "elemName";
+ String XMLQUERY_QUERYELEM_ROLE_ELEM = "elemName";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/XMLQueryMetKeys.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/XMLQueryMetKeys.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/XMLQueryMetKeys.java
index ff55105..b9f1f79 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/XMLQueryMetKeys.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/XMLQueryMetKeys.java
@@ -26,7 +26,7 @@ package org.apache.oodt.product.handlers.ofsn.metadata;
*/
public interface XMLQueryMetKeys {
- public static final String OFSN = "OFSN";
+ String OFSN = "OFSN";
- public static final String RETURN_TYPE = "RT";
+ String RETURN_TYPE = "RT";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/protocol/api/src/main/java/org/apache/oodt/cas/protocol/Protocol.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/Protocol.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/Protocol.java
index bbe05e2..54df836 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/Protocol.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/Protocol.java
@@ -33,28 +33,28 @@ import java.util.List;
*/
public interface Protocol {
- public void connect(String host, Authentication authentication) throws ProtocolException;
+ void connect(String host, Authentication authentication) throws ProtocolException;
- public void close() throws ProtocolException;
+ void close() throws ProtocolException;
- public boolean connected();
+ boolean connected();
- public void cd(ProtocolFile file) throws ProtocolException;
+ void cd(ProtocolFile file) throws ProtocolException;
- public void cdRoot() throws ProtocolException;
+ void cdRoot() throws ProtocolException;
- public void cdHome() throws ProtocolException;
+ void cdHome() throws ProtocolException;
- public void get(ProtocolFile fromFile, File toFile) throws ProtocolException;
+ void get(ProtocolFile fromFile, File toFile) throws ProtocolException;
- public void put(File fromFile, ProtocolFile toFile) throws ProtocolException;
+ void put(File fromFile, ProtocolFile toFile) throws ProtocolException;
- public ProtocolFile pwd() throws ProtocolException;
+ ProtocolFile pwd() throws ProtocolException;
- public List<ProtocolFile> ls() throws ProtocolException;
+ List<ProtocolFile> ls() throws ProtocolException;
- public List<ProtocolFile> ls(ProtocolFileFilter filter) throws ProtocolException;
+ List<ProtocolFile> ls(ProtocolFileFilter filter) throws ProtocolException;
- public void delete(ProtocolFile file) throws ProtocolException;
+ void delete(ProtocolFile file) throws ProtocolException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/protocol/api/src/main/java/org/apache/oodt/cas/protocol/ProtocolFactory.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/ProtocolFactory.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/ProtocolFactory.java
index ed6153f..e0ffd61 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/ProtocolFactory.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/ProtocolFactory.java
@@ -24,8 +24,8 @@ package org.apache.oodt.cas.protocol;
*/
public interface ProtocolFactory {
- public Protocol newInstance();
+ Protocol newInstance();
- public String getSchema();
+ String getSchema();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/protocol/api/src/main/java/org/apache/oodt/cas/protocol/auth/Authentication.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/auth/Authentication.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/auth/Authentication.java
index 381e7ff..d387933 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/auth/Authentication.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/auth/Authentication.java
@@ -23,8 +23,8 @@ package org.apache.oodt.cas.protocol.auth;
*/
public interface Authentication {
- public String getUser();
+ String getUser();
- public String getPass();
+ String getPass();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/protocol/api/src/main/java/org/apache/oodt/cas/protocol/config/ProtocolConfig.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/config/ProtocolConfig.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/config/ProtocolConfig.java
index 33eb471..6c36b62 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/config/ProtocolConfig.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/config/ProtocolConfig.java
@@ -32,8 +32,8 @@ import java.util.List;
*/
public interface ProtocolConfig {
- public List<ProtocolFactory> getAllFactories();
+ List<ProtocolFactory> getAllFactories();
- public List<ProtocolFactory> getFactoriesBySite(URI site);
+ List<ProtocolFactory> getFactoriesBySite(URI site);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/protocol/api/src/main/java/org/apache/oodt/cas/protocol/util/ProtocolFileFilter.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/util/ProtocolFileFilter.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/util/ProtocolFileFilter.java
index 70ed141..5f99845 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/util/ProtocolFileFilter.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/util/ProtocolFileFilter.java
@@ -27,6 +27,6 @@ import org.apache.oodt.cas.protocol.ProtocolFile;
*/
public interface ProtocolFileFilter {
- public boolean accept(ProtocolFile file);
+ boolean accept(ProtocolFile file);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifier.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifier.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifier.java
index 2f7d00b..6463006 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifier.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifier.java
@@ -30,6 +30,6 @@ import org.apache.oodt.cas.protocol.auth.Authentication;
*/
public interface ProtocolVerifier {
- public boolean verify(Protocol protocol, URI site, Authentication auth);
+ boolean verify(Protocol protocol, URI site, Authentication auth);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifierFactory.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifierFactory.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifierFactory.java
index 66a6db9..3d257a3 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifierFactory.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/verify/ProtocolVerifierFactory.java
@@ -23,6 +23,6 @@ package org.apache.oodt.cas.protocol.verify;
*/
public interface ProtocolVerifierFactory {
- public ProtocolVerifier newInstance();
+ ProtocolVerifier newInstance();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java
index 42e3a72..bb32309 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java
@@ -28,44 +28,44 @@ package org.apache.oodt.cas.pushpull.config;
*/
public interface ConfigMetKeys {
- public static final String STAGING_AREA_PREFIX = "Staging_Area";
+ String STAGING_AREA_PREFIX = "Staging_Area";
- public static final String EXTERNAL_PROPERTIES_FILES = "org.apache.oodt.cas.pushpull.config.external.properties.files";
+ String EXTERNAL_PROPERTIES_FILES = "org.apache.oodt.cas.pushpull.config.external.properties.files";
- public static final String PROTOCOL_FACTORY_INFO_FILES = "org.apache.oodt.cas.pushpull.config.protocolfactory.info.files";
+ String PROTOCOL_FACTORY_INFO_FILES = "org.apache.oodt.cas.pushpull.config.protocolfactory.info.files";
- public static final String PARSER_INFO_FILES = "org.apache.oodt.cas.pushpull.config.parser.info.files";
+ String PARSER_INFO_FILES = "org.apache.oodt.cas.pushpull.config.parser.info.files";
- public static final String INGESTER_CLASS = "org.apache.oodt.cas.filemgr.ingester";
+ String INGESTER_CLASS = "org.apache.oodt.cas.filemgr.ingester";
- public static final String INGESTER_DATA_TRANSFER = "org.apache.oodt.cas.filemgr.datatransfer.factory";
+ String INGESTER_DATA_TRANSFER = "org.apache.oodt.cas.filemgr.datatransfer.factory";
- public static final String INGESTER_FM_URL = "org.apache.oodt.cas.filemgr.url";
+ String INGESTER_FM_URL = "org.apache.oodt.cas.filemgr.url";
- public static final String NO_FM_SPECIFIED = "N/A";
+ String NO_FM_SPECIFIED = "N/A";
- public static final String CACHE_FACTORY_CLASS = "org.apache.oodt.cas.filemgr.ingest.cache.factory";
+ String CACHE_FACTORY_CLASS = "org.apache.oodt.cas.filemgr.ingest.cache.factory";
- public static final String TYPE_DETECTION_FILE = "org.apache.oodt.cas.pushpull.config.type.detection.file";
+ String TYPE_DETECTION_FILE = "org.apache.oodt.cas.pushpull.config.type.detection.file";
- public static final String MET_LIST_TO_PRINT = "org.apache.oodt.cas.pushpull.metadata.list.to.print";
+ String MET_LIST_TO_PRINT = "org.apache.oodt.cas.pushpull.metadata.list.to.print";
- public static final String ALLOW_ONLY_DEFINED_TYPES = "org.apache.oodt.cas.pushpull.allow.only.defined.types";
+ String ALLOW_ONLY_DEFINED_TYPES = "org.apache.oodt.cas.pushpull.allow.only.defined.types";
- public static final String USE_TRACKER = "org.apache.oodt.cas.pushpull.crawler.use.tracker";
+ String USE_TRACKER = "org.apache.oodt.cas.pushpull.crawler.use.tracker";
- public static final String FILE_RET_SYSTEM_REC_THREAD_COUNT = "org.apache.oodt.cas.pushpull.file.retrieval.system.recommended.thread.count";
+ String FILE_RET_SYSTEM_REC_THREAD_COUNT = "org.apache.oodt.cas.pushpull.file.retrieval.system.recommended.thread.count";
- public static final String FILE_RET_SYSTEM_MAX_ALLOWED_FAIL_DOWNLOADS = "org.apache.oodt.cas.pushpull.file.retrieval.system.max.number.allowed.failed.downloads";
+ String FILE_RET_SYSTEM_MAX_ALLOWED_FAIL_DOWNLOADS = "org.apache.oodt.cas.pushpull.file.retrieval.system.max.number.allowed.failed.downloads";
- public static final String MET_FILE_EXT = "org.apache.oodt.cas.pushpull.met.file.extension";
+ String MET_FILE_EXT = "org.apache.oodt.cas.pushpull.met.file.extension";
- public static final String PROTOCOL_TIMEOUT_MS = "org.apache.oodt.cas.pushpull.protocol.timeout.milliseconds";
+ String PROTOCOL_TIMEOUT_MS = "org.apache.oodt.cas.pushpull.protocol.timeout.milliseconds";
- public static final String PROTOCOL_PAGE_SIZE = "org.apache.oodt.cas.pushpull.protocol.page_size";
+ String PROTOCOL_PAGE_SIZE = "org.apache.oodt.cas.pushpull.protocol.page_size";
- public static final String DATA_FILE_BASE_STAGING_AREA = "org.apache.oodt.cas.pushpull.data.files.base.staging.area";
+ String DATA_FILE_BASE_STAGING_AREA = "org.apache.oodt.cas.pushpull.data.files.base.staging.area";
- public static final String WRITE_MET_FILE = "org.apache.oodt.cas.pushpull.write.met.file";
+ String WRITE_MET_FILE = "org.apache.oodt.cas.pushpull.write.met.file";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
index b876df9..6d43ad3 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
@@ -28,86 +28,86 @@ package org.apache.oodt.cas.pushpull.config;
*/
public interface ConfigParserMetKeys {
- public static final String RETRIEVAL_METHOD_TAG = "rtvlMethod";
+ String RETRIEVAL_METHOD_TAG = "rtvlMethod";
- public static final String CLASS_ATTR = "class";
+ String CLASS_ATTR = "class";
- public static final String PARSER_TAG = "parser";
+ String PARSER_TAG = "parser";
- public static final String PROTOCOL_TAG = "protocol";
+ String PROTOCOL_TAG = "protocol";
- public static final String TYPE_ATTR = "type";
+ String TYPE_ATTR = "type";
- public static final String PROTOCOL_FACTORY_TAG = "protocolFactory";
+ String PROTOCOL_FACTORY_TAG = "protocolFactory";
- public static final String ALIAS_SPEC_TAG = "aliasSpec";
+ String ALIAS_SPEC_TAG = "aliasSpec";
- public static final String FILE_ATTR = "file";
+ String FILE_ATTR = "file";
- public static final String DAEMON_TAG = "daemon";
+ String DAEMON_TAG = "daemon";
- public static final String ACTIVE_ATTR = "active";
+ String ACTIVE_ATTR = "active";
- public static final String ALIAS_ATTR = "alias";
+ String ALIAS_ATTR = "alias";
- public static final String RUN_INFO_TAG = "runInfo";
+ String RUN_INFO_TAG = "runInfo";
- public static final String FIRSTRUN_DATETIME_ATTR = "firstRunDateTime";
+ String FIRSTRUN_DATETIME_ATTR = "firstRunDateTime";
- public static final String PERIOD_ATTR = "period";
+ String PERIOD_ATTR = "period";
- public static final String RUNONREBOOT_ATTR = "runOnReboot";
+ String RUNONREBOOT_ATTR = "runOnReboot";
- public static final String EPSILON_ATTR = "epsilon";
+ String EPSILON_ATTR = "epsilon";
- public static final String PROP_INFO_TAG = "propInfo";
+ String PROP_INFO_TAG = "propInfo";
- public static final String DIR_ATTR = "dir";
+ String DIR_ATTR = "dir";
- public static final String PROP_FILES_TAG = "propFiles";
+ String PROP_FILES_TAG = "propFiles";
- public static final String REG_EXP_ATTR = "regExp";
+ String REG_EXP_ATTR = "regExp";
- public static final String PARSER_ATTR = "parser";
+ String PARSER_ATTR = "parser";
- public static final String DOWNLOAD_INFO_TAG = "downloadInfo";
+ String DOWNLOAD_INFO_TAG = "downloadInfo";
- public static final String RENAMING_CONV_ATTR = "renamingConv";
+ String RENAMING_CONV_ATTR = "renamingConv";
- public static final String ALLOW_ALIAS_OVERRIDE_ATTR = "allowAliasOverride";
+ String ALLOW_ALIAS_OVERRIDE_ATTR = "allowAliasOverride";
- public static final String DELETE_FROM_SERVER_ATTR = "deleteFromServer";
+ String DELETE_FROM_SERVER_ATTR = "deleteFromServer";
- public static final String PROP_FILE_TAG = "propFile";
+ String PROP_FILE_TAG = "propFile";
- public static final String PATH_ATTR = "path";
+ String PATH_ATTR = "path";
- public static final String AFTER_USE_TAG = "afterUse";
+ String AFTER_USE_TAG = "afterUse";
- public static final String DELETE_ON_SUCCESS_ATTR = "deleteOnSuccess";
+ String DELETE_ON_SUCCESS_ATTR = "deleteOnSuccess";
- public static final String MOVEON_TO_SUCCESS_ATTR = "moveToOnSuccess";
+ String MOVEON_TO_SUCCESS_ATTR = "moveToOnSuccess";
- public static final String MOVEON_TO_FAIL_ATTR = "moveToOnFail";
+ String MOVEON_TO_FAIL_ATTR = "moveToOnFail";
- public static final String DATA_INFO_TAG = "dataInfo";
+ String DATA_INFO_TAG = "dataInfo";
- public static final String QUERY_ELEM_ATTR = "queryElement";
+ String QUERY_ELEM_ATTR = "queryElement";
- public static final String STAGING_AREA_ATTR = "stagingArea";
+ String STAGING_AREA_ATTR = "stagingArea";
- public static final String SOURCE_TAG = "source";
+ String SOURCE_TAG = "source";
- public static final String HOST_ATTR = "host";
+ String HOST_ATTR = "host";
- public static final String LOGIN_ATTR = "login";
+ String LOGIN_ATTR = "login";
- public static final String USERNAME_TAG = "username";
+ String USERNAME_TAG = "username";
- public static final String PASSWORD_TAG = "password";
+ String PASSWORD_TAG = "password";
- public static final String CD_TEST_DIR_TAG = "cdTestDir";
+ String CD_TEST_DIR_TAG = "cdTestDir";
- public static final String MAX_CONN_TAG = "maxConn";
+ String MAX_CONN_TAG = "maxConn";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java
index cfb637b..880316b 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java
@@ -27,12 +27,12 @@ package org.apache.oodt.cas.pushpull.daemon;
*/
public interface DaemonLauncherMBean {
- public void killAllDaemons();
+ void killAllDaemons();
- public void refreshDaemons();
+ void refreshDaemons();
- public void quit();
+ void quit();
- public String[] viewDaemonWaitingList();
+ String[] viewDaemonWaitingList();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java
index b90dfd0..40f4cf8 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java
@@ -29,12 +29,12 @@ package org.apache.oodt.cas.pushpull.daemon;
*/
public interface DaemonListener {
- public void wasRegisteredWith(Daemon daemon);
+ void wasRegisteredWith(Daemon daemon);
- public void wasUnregisteredWith(Daemon daemon);
+ void wasUnregisteredWith(Daemon daemon);
- public void daemonStarting(Daemon daemon);
+ void daemonStarting(Daemon daemon);
- public void daemonFinished(Daemon daemon);
+ void daemonFinished(Daemon daemon);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java
index 646e6cb..a133bdd 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java
@@ -40,7 +40,7 @@ public interface DaemonMBean {
*
* @return
*/
- public void quit();
+ void quit();
/**
* Can be used to determine if Crawler is presently running
@@ -48,48 +48,48 @@ public interface DaemonMBean {
* @return true if Crawler is runnning
* @uml.property name="isRunning"
*/
- public boolean isRunning();
+ boolean isRunning();
- public boolean getHasBeenToldToQuit();
+ boolean getHasBeenToldToQuit();
- public long getTimeIntervalInMilliseconds();
+ long getTimeIntervalInMilliseconds();
- public long getEpsilonInMilliseconds();
+ long getEpsilonInMilliseconds();
- public boolean getRunOnReboot();
+ boolean getRunOnReboot();
- public Date getFirstRunDateTime();
+ Date getFirstRunDateTime();
- public String[] downloadedFilesInStagingArea();
+ String[] downloadedFilesInStagingArea();
- public String[] downloadingFilesInStagingArea();
+ String[] downloadingFilesInStagingArea();
- public int numberOfFilesDownloadedInStagingArea();
+ int numberOfFilesDownloadedInStagingArea();
- public int numberOfFilesDownloadingInStagingArea();
+ int numberOfFilesDownloadingInStagingArea();
- public String getDataFilesRemoteSite();
+ String getDataFilesRemoteSite();
- public String getDataFilesRenamingConv();
+ String getDataFilesRenamingConv();
- public boolean getDeleteDataFilesFromServer();
+ boolean getDeleteDataFilesFromServer();
- public String getQueryMetadataElementName();
+ String getQueryMetadataElementName();
- public File getDataFilesStagingArea();
+ File getDataFilesStagingArea();
- public boolean getAllowAliasOverride();
+ boolean getAllowAliasOverride();
- public String getPropertyFilesRemoteSite();
+ String getPropertyFilesRemoteSite();
- public String getPropertyFilesRenamingConv();
+ String getPropertyFilesRenamingConv();
- public boolean getDeletePropertyFilesFromServer();
+ boolean getDeletePropertyFilesFromServer();
- public String getPropertyFilesOnSuccessDir();
+ String getPropertyFilesOnSuccessDir();
- public String getPropertyFilesOnFailDir();
+ String getPropertyFilesOnFailDir();
- public File getPropertyFilesLocalDir();
+ File getPropertyFilesLocalDir();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java
index 45a5416..1cb5f53 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java
@@ -36,7 +36,7 @@ public interface DaemonRmiInterface extends Remote {
*
* @return Always true -- done because of XmlRpc communication
*/
- public void resume() throws RemoteException;
+ void resume() throws RemoteException;
/**
* Will terminate the CrawlDaemon. If its Crawler is crawling a site when
@@ -45,7 +45,7 @@ public interface DaemonRmiInterface extends Remote {
*
* @return
*/
- public void quit() throws RemoteException;
+ void quit() throws RemoteException;
/**
* Can be used to determine if Crawler is presently running
@@ -53,35 +53,35 @@ public interface DaemonRmiInterface extends Remote {
* @return true if Crawler is runnning
* @uml.property name="isRunning"
*/
- public boolean isRunning() throws RemoteException;
+ boolean isRunning() throws RemoteException;
/**
* Average runtime for the Crawler
*
* @return average runtime for the Crawler
*/
- public long getAverageRunTime() throws RemoteException;
+ long getAverageRunTime() throws RemoteException;
/**
* Gets the total crawling time of the Crawler
*
* @return Total crawling time of Crawler
*/
- public long getMillisCrawling() throws RemoteException;
+ long getMillisCrawling() throws RemoteException;
/**
* Gets the time between the start of Crawler executions
*
* @return Time interval between Crawler start times
*/
- public long getTimeInterval() throws RemoteException;
+ long getTimeInterval() throws RemoteException;
/**
* Gets the total number of times the Crawler has been run
*
* @return The number of times Crawler has run
*/
- public int getNumCrawls() throws RemoteException;
+ int getNumCrawls() throws RemoteException;
/**
* Gets the time in milliseconds for when the CrawlDaemon constructor was
@@ -90,8 +90,8 @@ public interface DaemonRmiInterface extends Remote {
* @return
* @uml.property name="daemonCreationTime"
*/
- public long getDaemonCreationTime() throws RemoteException;
+ long getDaemonCreationTime() throws RemoteException;
- public boolean getHasBeenToldToQuit() throws RemoteException;
+ boolean getHasBeenToldToQuit() throws RemoteException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java
index 50657fb..729722b 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java
@@ -29,8 +29,8 @@ package org.apache.oodt.cas.pushpull.expressions;
*/
public interface ValidInput {
- public Object getValue();
+ Object getValue();
- public String toString();
+ String toString();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java
index 20a8b9a..2d49fe4 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java
@@ -37,7 +37,7 @@ import org.apache.oodt.cas.pushpull.exceptions.ParserException;
*/
public interface Parser {
- public VirtualFileStructure parse(FileInputStream inputFile, Metadata metadata)
+ VirtualFileStructure parse(FileInputStream inputFile, Metadata metadata)
throws ParserException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RetrievalMethod.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RetrievalMethod.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RetrievalMethod.java
index bd124a1..d34874b 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RetrievalMethod.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RetrievalMethod.java
@@ -38,8 +38,8 @@ import org.apache.oodt.cas.pushpull.retrievalsystem.FileRetrievalSystem;
*/
public interface RetrievalMethod {
- public void processPropFile(FileRetrievalSystem frs,
- Parser propFileParser, File propFile, DataFilesInfo dfi,
- DataFileToPropFileLinker linker) throws Exception;
+ void processPropFile(FileRetrievalSystem frs,
+ Parser propFileParser, File propFile, DataFilesInfo dfi,
+ DataFileToPropFileLinker linker) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadListener.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadListener.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadListener.java
index 985c22a..3db621c 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadListener.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadListener.java
@@ -32,10 +32,10 @@ import org.apache.oodt.cas.protocol.ProtocolFile;
*/
public interface DownloadListener {
- public void downloadStarted(ProtocolFile pFile);
+ void downloadStarted(ProtocolFile pFile);
- public void downloadFinished(ProtocolFile pFile);
+ void downloadFinished(ProtocolFile pFile);
- public void downloadFailed(ProtocolFile pFile, String errorMsg);
+ void downloadFailed(ProtocolFile pFile, String errorMsg);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RemoteFileMetKeys.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RemoteFileMetKeys.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RemoteFileMetKeys.java
index b63107d..1ad95e8 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RemoteFileMetKeys.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RemoteFileMetKeys.java
@@ -28,30 +28,30 @@ package org.apache.oodt.cas.pushpull.retrievalsystem;
*/
public interface RemoteFileMetKeys {
- public static final String PRODUCT_NAME = "ProductName";
+ String PRODUCT_NAME = "ProductName";
- public static final String RETRIEVED_FROM_LOC = "RetrievedFromLoc";
+ String RETRIEVED_FROM_LOC = "RetrievedFromLoc";
- public static final String FILENAME = "Filename";
+ String FILENAME = "Filename";
- public static final String DATA_PROVIDER = "DataProvider";
+ String DATA_PROVIDER = "DataProvider";
- public static final String FILE_SIZE = "FileSize";
+ String FILE_SIZE = "FileSize";
- public static final String RENAMING_STRING = "RenamingString";
+ String RENAMING_STRING = "RenamingString";
- public static final String DOWNLOAD_TO_DIR = "DownloadToDir";
+ String DOWNLOAD_TO_DIR = "DownloadToDir";
- public static final String PRODUCT_TYPE = "ProductType";
+ String PRODUCT_TYPE = "ProductType";
- public static final String MIME_TYPE = "MimeType";
+ String MIME_TYPE = "MimeType";
- public static final String SUPER_TYPE = "SuperType";
+ String SUPER_TYPE = "SuperType";
- public static final String DELETE_AFTER_DOWNLOAD = "DeleteAfterDownload";
+ String DELETE_AFTER_DOWNLOAD = "DeleteAfterDownload";
- public static final String PRODUCT_NAME_GENERATOR = "ProductNameGenerator";
+ String PRODUCT_NAME_GENERATOR = "ProductNameGenerator";
- public static final String UNIQUE_ELEMENT = "UniqueElement";
+ String UNIQUE_ELEMENT = "UniqueElement";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java
index bad50f7..9aea6dd 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java
@@ -52,7 +52,7 @@ public interface Batchmgr {
* If there is an exception executing the job on the remote
* host.
*/
- public boolean executeRemotely(JobSpec job, ResourceNode resNode)
+ boolean executeRemotely(JobSpec job, ResourceNode resNode)
throws JobExecutionException;
/**
@@ -61,7 +61,7 @@ public interface Batchmgr {
* @param monitor
* The {@link Monitor} to be used.
*/
- public void setMonitor(Monitor monitor);
+ void setMonitor(Monitor monitor);
/**
* Sets the {@link JobRepository} that this Batchmgr will use to persist
@@ -69,7 +69,7 @@ public interface Batchmgr {
*
* @param repository
*/
- public void setJobRepository(JobRepository repository);
+ void setJobRepository(JobRepository repository);
/**
@@ -78,7 +78,7 @@ public interface Batchmgr {
* @param node
* @return
*/
- public boolean killJob(String jobId, ResourceNode node);
+ boolean killJob(String jobId, ResourceNode node);
/**
@@ -86,12 +86,12 @@ public interface Batchmgr {
* @param jobId
* @return
*/
- public String getExecutionNode(String jobId);
+ String getExecutionNode(String jobId);
/**
* Get a list of the ids of all jobs that are executing on the given node.
* @return A list of ids of jobs on the given node
*/
- public List getJobsOnNode(String nodeId);
+ List getJobsOnNode(String nodeId);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java
index 0f5a1f2..fbf10e9 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java
@@ -32,5 +32,5 @@ public interface BatchmgrFactory {
/**
* @return A new implementation of the {@link Batchmgr} interface.
*/
- public Batchmgr createBatchmgr();
+ Batchmgr createBatchmgr();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
index 370467b..41ff6f4 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
@@ -46,7 +46,7 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error queueing the {@link JobSpec}.
*/
- public String addJob(JobSpec spec) throws JobQueueException;
+ String addJob(JobSpec spec) throws JobQueueException;
/**
* Re-adds a {@link JobSpec} to the back of the queue.
@@ -56,7 +56,7 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error requeueing the {@link JobSpec}.
*/
- public String requeueJob(JobSpec spec) throws JobQueueException;
+ String requeueJob(JobSpec spec) throws JobQueueException;
/**
* Gets an ordered {@link List} of queued {@link JobSpec}s.
@@ -65,7 +65,7 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error obtaining the queued jobs.
*/
- public List getQueuedJobs() throws JobQueueException;
+ List getQueuedJobs() throws JobQueueException;
/**
* Purges all {@link JobSpec}s from the queue.
@@ -73,14 +73,14 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error purging all the {@link JobSpec}s.
*/
- public void purge() throws JobQueueException;
+ void purge() throws JobQueueException;
/**
* Returns a boolean value representing whether or not the queue is empty.
*
* @return true, if the queue is empty, false otherwise.
*/
- public boolean isEmpty();
+ boolean isEmpty();
/**
* Gets the next {@link JobSpec} from the queue, and correspondingly removes
@@ -90,7 +90,7 @@ public interface JobQueue {
* @throws JobQueueException
* If there is any error getting the next {@link JobSpec}.
*/
- public JobSpec getNextJob() throws JobQueueException;
+ JobSpec getNextJob() throws JobQueueException;
/**
@@ -98,19 +98,19 @@ public interface JobQueue {
* used by this {@link JobQueue}.
* @return The underlying {@link JobRepository}.
*/
- public JobRepository getJobRepository();
+ JobRepository getJobRepository();
/**
* Gets the number of jobs in queue
* @return Number of jobs in queue
*/
- public int getSize();
+ int getSize();
/**
* Gets the max number of jobs allowed in
* queue at any given time
* @return Max number of jobs
*/
- public int getCapacity();
+ int getCapacity();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java
index 1c91d84..6a79ede 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java
@@ -33,5 +33,5 @@ public interface JobQueueFactory {
*
* @return New {@link JobQueue} implementations.
*/
- public JobQueue createQueue();
+ JobQueue createQueue();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java
index d08d074..4a01123 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java
@@ -32,16 +32,16 @@ import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
*/
public interface JobRepository {
- public String addJob(JobSpec spec) throws JobRepositoryException;
+ String addJob(JobSpec spec) throws JobRepositoryException;
- public void updateJob(JobSpec spec) throws JobRepositoryException;
+ void updateJob(JobSpec spec) throws JobRepositoryException;
- public void removeJob(JobSpec spec) throws JobRepositoryException;
+ void removeJob(JobSpec spec) throws JobRepositoryException;
- public JobSpec getJobById(String jobId) throws JobRepositoryException;
+ JobSpec getJobById(String jobId) throws JobRepositoryException;
- public String getStatus(JobSpec spec) throws JobRepositoryException;
+ String getStatus(JobSpec spec) throws JobRepositoryException;
- public boolean jobFinished(JobSpec spec) throws JobRepositoryException;
+ boolean jobFinished(JobSpec spec) throws JobRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java
index d76714a..2eea36e 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java
@@ -33,6 +33,6 @@ public interface JobRepositoryFactory {
*
* @return A new {@link JobRepository} implementation.
*/
- public JobRepository createRepository();
+ JobRepository createRepository();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java b/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java
index 43f7b34..a007a26 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java
@@ -28,8 +28,8 @@ package org.apache.oodt.cas.resource.metadata;
*/
public interface JobMetadata {
- public static final String QUEUE_NAME = "QUEUE_NAME";
+ String QUEUE_NAME = "QUEUE_NAME";
- public static final String LOAD = "LOAD";
+ String LOAD = "LOAD";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java
index 6c5fef2..fd01e12 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java
@@ -47,7 +47,7 @@ public interface Monitor {
* @throws MonitorException
* If there is any error obtaining the load.
*/
- public int getLoad(ResourceNode node) throws MonitorException;
+ int getLoad(ResourceNode node) throws MonitorException;
/**
*
@@ -57,7 +57,7 @@ public interface Monitor {
* If any error occurs getting the {@link List} of
* {@link ResourceNode}s.
*/
- public List getNodes() throws MonitorException;
+ List getNodes() throws MonitorException;
/**
@@ -67,7 +67,7 @@ public interface Monitor {
* @throws MonitorException
* If any error occurs.
*/
- public ResourceNode getNodeById(String nodeId) throws MonitorException;
+ ResourceNode getNodeById(String nodeId) throws MonitorException;
/**
@@ -76,7 +76,7 @@ public interface Monitor {
* @return The {@link ResourceNode} with the given ipAddr.
* @throws MonitorException If any error occurs.
*/
- public ResourceNode getNodeByURL(URL ipAddr) throws MonitorException;
+ ResourceNode getNodeByURL(URL ipAddr) throws MonitorException;
/**
* Reduces the load on a particular {@link ResourceNode} by the given
@@ -87,7 +87,7 @@ public interface Monitor {
* @return True if successfully reduced, false otherwise.
* @throws MonitorException If any error occurs.
*/
- public boolean reduceLoad(ResourceNode node, int loadValue)
+ boolean reduceLoad(ResourceNode node, int loadValue)
throws MonitorException;
@@ -103,7 +103,7 @@ public interface Monitor {
* @throws MonitorException
* If any error occurs assigning the load.
*/
- public boolean assignLoad(ResourceNode node, int loadValue)
+ boolean assignLoad(ResourceNode node, int loadValue)
throws MonitorException;
/**
@@ -113,7 +113,7 @@ public interface Monitor {
* @param node
* The new {@link ResourceNode} to manage
*/
- public void addNode(ResourceNode node) throws MonitorException;
+ void addNode(ResourceNode node) throws MonitorException;
/**
* Remove {@link ResourceNode} from this {@link Monitor}
@@ -121,6 +121,6 @@ public interface Monitor {
* @param nodeId
* The id of the {@link ResourceNode} to remove
*/
- public void removeNodeById(String nodeId) throws MonitorException;
+ void removeNodeById(String nodeId) throws MonitorException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java
index 41f9792..bf180d8 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java
@@ -32,5 +32,5 @@ public interface MonitorFactory {
/**
* @return A new implementation of the {@link Monitor} interface.
*/
- public Monitor createMonitor();
+ Monitor createMonitor();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaMetKeys.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaMetKeys.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaMetKeys.java
index 78a1bf3..092fdd4 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaMetKeys.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaMetKeys.java
@@ -24,46 +24,46 @@ package org.apache.oodt.cas.resource.monitor.ganglia;
public interface GangliaMetKeys {
/* XML specific keys */
- public static final String CLUSTER = "CLUSTER";
- public static final String HOST = "HOST";
- public static final String METRIC = "METRIC";
+ String CLUSTER = "CLUSTER";
+ String HOST = "HOST";
+ String METRIC = "METRIC";
- public static final String NAME = "NAME";
- public static final String VAL = "VAL";
- public static final String TN = "TN";
- public static final String TMAX = "TMAX";
- public static final String DMAX = "DMAX";
+ String NAME = "NAME";
+ String VAL = "VAL";
+ String TN = "TN";
+ String TMAX = "TMAX";
+ String DMAX = "DMAX";
/*Metric specific keys*/
- public static final String TYPE = "TYPE";
- public static final String UNITS = "UNITS";
- public static final String SLOPE = "SLOPE";
- public static final String SOURCE = "SOURCE";
- public static final String EXTRA_ELEMENT = "EXTRA_ELEMENT";
- public static final String GROUP = "GROUP";
- public static final String DESC = "DESC";
- public static final String TITLE = "TITLE";
+ String TYPE = "TYPE";
+ String UNITS = "UNITS";
+ String SLOPE = "SLOPE";
+ String SOURCE = "SOURCE";
+ String EXTRA_ELEMENT = "EXTRA_ELEMENT";
+ String GROUP = "GROUP";
+ String DESC = "DESC";
+ String TITLE = "TITLE";
/*Host specific keys*/
- public static final String IP = "IP";
- public static final String REPORTED = "REPORTED";
- public static final String LOCATION = "LOCATION";
- public static final String GMOND_STARTED = "GMOND_STARTED";
+ String IP = "IP";
+ String REPORTED = "REPORTED";
+ String LOCATION = "LOCATION";
+ String GMOND_STARTED = "GMOND_STARTED";
/*Cluster specific keys*/
- public static final String LOCALTIME = "LOCALTIME";
- public static final String OWNER = "OWNER";
- public static final String LATLONG = "LATLONG";
- public static final String URL = "URL";
+ String LOCALTIME = "LOCALTIME";
+ String OWNER = "OWNER";
+ String LATLONG = "LATLONG";
+ String URL = "URL";
/*Ganglia metric keys*/
- public static String LOAD_ONE = "load_one";
- public static String LOAD_FIVE = "load_five";
- public static String LOAD_FIFTEEN = "load_fifteen";
- public static String CPU_NUM = "cpu_num";
+ String LOAD_ONE = "load_one";
+ String LOAD_FIVE = "load_five";
+ String LOAD_FIFTEEN = "load_fifteen";
+ String CPU_NUM = "cpu_num";
/* Various needed keys */
- public static int MAXIMUM_FRACTION_DIGITS = 3;
+ int MAXIMUM_FRACTION_DIGITS = 3;
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculator.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculator.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculator.java
index 730757a..5a80443 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculator.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculator.java
@@ -32,6 +32,6 @@ public interface LoadCalculator {
* @param metrics status metrics of the resource node
* @return An integer representation of the load within 0 and node's capacity
*/
- public double calculateLoad(Map<String, String> metrics);
+ double calculateLoad(Map<String, String> metrics);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculatorFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculatorFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculatorFactory.java
index cbe816a..c7e1f4d 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculatorFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/loadcalc/LoadCalculatorFactory.java
@@ -26,5 +26,5 @@ public interface LoadCalculatorFactory {
/**
* @return A new implementation of the {@link LoadCalculator} interface.
*/
- public LoadCalculator createLoadCalculator();
+ LoadCalculator createLoadCalculator();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendManager.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendManager.java
index 8b7d296..6aaf4bf 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendManager.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendManager.java
@@ -37,31 +37,31 @@ public interface BackendManager {
* @param batchmgr - batch manager for this set
* @param scheduler - scheduler for this set
*/
- public void addSet(String queue,Monitor monitor, Batchmgr batchmgr, Scheduler scheduler);
+ void addSet(String queue, Monitor monitor, Batchmgr batchmgr, Scheduler scheduler);
/**
* Return monitor for the given queue.
* @param queue - queue to check
* @return montior
* @throws QueueManagerException when queue does not exist
*/
- public Monitor getMonitor(String queue) throws QueueManagerException;
+ Monitor getMonitor(String queue) throws QueueManagerException;
/**
* Return batch manager for the given queue.
* @param queue - queue to check
* @return batchmgr
* @throws QueueManagerException when queue does not exist
*/
- public Batchmgr getBatchmgr(String queue) throws QueueManagerException;
+ Batchmgr getBatchmgr(String queue) throws QueueManagerException;
/**
* Return scheduler for the given queue.
* @param queue - queue to check
* @return scheduler
* @throws QueueManagerException when queue does not exist
*/
- public Scheduler getScheduler(String queue) throws QueueManagerException;
+ Scheduler getScheduler(String queue) throws QueueManagerException;
/**
* Return a list of all monitors.
* @return list of all monitors
*/
- public List<Monitor> getMonitors();
+ List<Monitor> getMonitors();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepository.java
index d759713..c74b37d 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepository.java
@@ -29,5 +29,5 @@ public interface BackendRepository {
* Load the backend.
* @return BackendManager all set up and ready to go.
*/
- public BackendManager load() throws RepositoryException;
+ BackendManager load() throws RepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepositoryFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepositoryFactory.java
index 6850683..52afd73 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepositoryFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/BackendRepositoryFactory.java
@@ -32,5 +32,5 @@ public interface BackendRepositoryFactory {
* Create a backend repository
* @return the newly minted backend repository
*/
- public BackendRepository createBackendRepository();
+ BackendRepository createBackendRepository();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepository.java
index 0b4319e..3e99c9c 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepository.java
@@ -34,6 +34,6 @@ import java.util.List;
*/
public interface NodeRepository {
- public List<ResourceNode> loadNodes();
+ List<ResourceNode> loadNodes();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepositoryFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepositoryFactory.java
index e81bf81..008e849 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepositoryFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/noderepo/NodeRepositoryFactory.java
@@ -32,6 +32,6 @@ public interface NodeRepositoryFactory {
* Creates {@link NodeRepository}
* @return the created {@link NodeRepository}
*/
- public NodeRepository createNodeRepository();
+ NodeRepository createNodeRepository();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepository.java
index 39ef3c2..e7e3f89 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepository.java
@@ -31,6 +31,6 @@ import org.apache.oodt.cas.resource.scheduler.QueueManager;
*/
public interface QueueRepository {
- public QueueManager loadQueues();
+ QueueManager loadQueues();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepositoryFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepositoryFactory.java
index 11720e3..a4e0840 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepositoryFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/QueueRepositoryFactory.java
@@ -28,6 +28,6 @@ package org.apache.oodt.cas.resource.queuerepo;
*/
public interface QueueRepositoryFactory {
- public QueueRepository createQueueRepository();
+ QueueRepository createQueueRepository();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java
index f309d9e..764527e 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java
@@ -48,7 +48,7 @@ public interface Scheduler extends Runnable{
* @throws SchedulerException If there was any error scheduling
* the given {@link JobSpec}.
*/
- public boolean schedule(JobSpec spec) throws SchedulerException;
+ boolean schedule(JobSpec spec) throws SchedulerException;
/**
@@ -58,21 +58,21 @@ public interface Scheduler extends Runnable{
* @return The {@link ResourceNode} best suited to handle this {@link JobSpec}
* @throws SchedulerException If any error occurs.
*/
- public ResourceNode nodeAvailable(JobSpec spec) throws SchedulerException;
+ ResourceNode nodeAvailable(JobSpec spec) throws SchedulerException;
/**
*
* @return The underlying {@link Monitor} used by this
* Scheduler.
*/
- public Monitor getMonitor();
+ Monitor getMonitor();
/**
*
* @return The underlying {@link Batchmgr} used by this
* Scheduler.
*/
- public Batchmgr getBatchmgr();
+ Batchmgr getBatchmgr();
/**
@@ -80,13 +80,13 @@ public interface Scheduler extends Runnable{
* @return The underlying {@link JobQueue} used by this
* Scheduler.
*/
- public JobQueue getJobQueue();
+ JobQueue getJobQueue();
/**
*
* @return The underlying {@link QueueManager} used by this
* Scheduler.
*/
- public QueueManager getQueueManager();
+ QueueManager getQueueManager();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java
index c483114..62d7118 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java
@@ -32,5 +32,5 @@ public interface SchedulerFactory {
/**
* @return A new implementation of the {@link Scheduler} interface.
*/
- public Scheduler createScheduler();
+ Scheduler createScheduler();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java b/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java
index 4114ea1..fc6011d 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java
@@ -37,6 +37,6 @@ public interface JobInput extends XmlRpcWriteable, Configurable {
*
* @return The string identifier of this JobInput object.
*/
- public String getId();
+ String getId();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java b/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java
index 882cf96..93b3798 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java
@@ -26,16 +26,16 @@ package org.apache.oodt.cas.resource.structs;
*/
public interface JobStatus {
- public static final String QUEUED = "__Queued__";
+ String QUEUED = "__Queued__";
- public static final String EXECUTED = "__Executed__";
+ String EXECUTED = "__Executed__";
- public static final String SCHEDULED = "__Scheduled__";
+ String SCHEDULED = "__Scheduled__";
- public static final String SUCCESS = "__Success__";
+ String SUCCESS = "__Success__";
- public static final String FAILURE = "__Failure__";
+ String FAILURE = "__Failure__";
- public static final String KILLED = "__Killed__";
+ String KILLED = "__Killed__";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java
index 510d3c5..b97f946 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java
@@ -38,6 +38,6 @@ public interface Configurable {
* @param props
* Properties to use to configure the Object.
*/
- public void configure(Properties props);
+ void configure(Properties props);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java
index 79371f6..79320ab 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java
@@ -29,26 +29,26 @@ package org.apache.oodt.cas.resource.util;
*/
public interface UlimitMetKeys {
- public static final String CORE_FILE_SIZE = "core file size";
+ String CORE_FILE_SIZE = "core file size";
- public static final String DATA_SEGMENT_SIZE = "data seg size";
+ String DATA_SEGMENT_SIZE = "data seg size";
- public static final String FILE_SIZE = "file size";
+ String FILE_SIZE = "file size";
- public static final String MAX_LOCKED_MEMORY = "max locked memory";
+ String MAX_LOCKED_MEMORY = "max locked memory";
- public static final String MAX_MEMORY_SIZE = "max memory size";
+ String MAX_MEMORY_SIZE = "max memory size";
- public static final String MAX_OPEN_FILES = "open files";
+ String MAX_OPEN_FILES = "open files";
- public static final String MAX_PIPE_SIZE = "pipe size";
+ String MAX_PIPE_SIZE = "pipe size";
- public static final String MAX_STACK_SIZE = "stack size";
+ String MAX_STACK_SIZE = "stack size";
- public static final String MAX_CPU_TIME = "cpu time";
+ String MAX_CPU_TIME = "cpu time";
- public static final String MAX_USER_PROCESSES = "max user processes";
+ String MAX_USER_PROCESSES = "max user processes";
- public static final String MAX_VIRTUAL_MEMORY = "virtual memory";
+ String MAX_VIRTUAL_MEMORY = "virtual memory";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java
index 0807710..0e4b14c 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java
@@ -38,13 +38,13 @@ public interface XmlRpcWriteable {
* The {@link Object} to read in and instantiate the implementation
* of this class with.
*/
- public void read(Object in);
+ void read(Object in);
/**
*
* @return An XML-RPC safe serialization {@link Object} of the implementing
* class for this interface.
*/
- public Object write();
+ Object write();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOn.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOn.java b/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOn.java
index 3df2dc9..3835bf8 100644
--- a/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOn.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/SingleSignOn.java
@@ -37,14 +37,14 @@ public interface SingleSignOn {
*
* @return A string representation of the current SSO username.
*/
- public String getCurrentUsername();
+ String getCurrentUsername();
/**
* Returns <code>true</code> when the user is logged in, or false otherwise.
*
* @return True if the user is logged in, false otherwise.
*/
- public boolean isLoggedIn();
+ boolean isLoggedIn();
/**
* Logs the user with the provided <code>username</code> and
@@ -56,12 +56,12 @@ public interface SingleSignOn {
* The password credentials.
* @return True if the login was successful, false otherwise.
*/
- public boolean login(String username, String password);
+ boolean login(String username, String password);
/**
* Logs the current SSO user out of her session.
*/
- public void logout();
+ void logout();
/**
* Should provide information (true or false) as to whether the last
@@ -69,7 +69,7 @@ public interface SingleSignOn {
*
* @return True if the last authentication was successful, false otherwise.
*/
- public boolean getLastConnectionStatus();
+ boolean getLastConnectionStatus();
/**
* Obtains a user's groups from the security principal that this SSO object
@@ -80,6 +80,6 @@ public interface SingleSignOn {
* @return A {@link List} of string group names obtained from the security
* principal.
**/
- public List<String> retrieveGroupsForUser(String username);
+ List<String> retrieveGroupsForUser(String username);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOMetKeys.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOMetKeys.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOMetKeys.java
index 7d866f7..0e97221 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOMetKeys.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOMetKeys.java
@@ -25,57 +25,57 @@ package org.apache.oodt.security.sso.opensso;
public interface SSOMetKeys {
/* service endpoints */
- public static final String AUTHENTICATE_ENDPOINT = "https://host/opensso/identity/authenticate";
+ String AUTHENTICATE_ENDPOINT = "https://host/opensso/identity/authenticate";
- public static final String IDENTITY_READ_ENDPOINT = "https://host/opensso/identity/read";
+ String IDENTITY_READ_ENDPOINT = "https://host/opensso/identity/read";
- public static final String IDENTITY_ATTRIBUTES_ENDPOINT = "https://host/opensso/identity/attributes";
+ String IDENTITY_ATTRIBUTES_ENDPOINT = "https://host/opensso/identity/attributes";
- public static final String LOGOUT_ENDPOINT = "https://host/opensso/identity/logout";
+ String LOGOUT_ENDPOINT = "https://host/opensso/identity/logout";
/* cookie names */
- public static final String SSO_COOKIE_KEY = "iPlanetDirectoryPro";
+ String SSO_COOKIE_KEY = "iPlanetDirectoryPro";
- public static final String USER_COOKIE_KEY = "curationWebapp";
+ String USER_COOKIE_KEY = "curationWebapp";
/* Identity Details response object */
- public static final String IDENTITY_DETAILS_NAME = "identitydetails.name";
+ String IDENTITY_DETAILS_NAME = "identitydetails.name";
- public static final String IDENTITY_DETAILS_TYPE = "identitydetails.type";
+ String IDENTITY_DETAILS_TYPE = "identitydetails.type";
- public static final String IDENTITY_DETAILS_REALM = "identitydetails.realm";
+ String IDENTITY_DETAILS_REALM = "identitydetails.realm";
- public static final String IDENTITY_DETAILS_GROUP = "identitydetails.group";
+ String IDENTITY_DETAILS_GROUP = "identitydetails.group";
- public static final String IDENTITY_DETAILS_ATTR_NAME = "identitydetails.attribute.name";
+ String IDENTITY_DETAILS_ATTR_NAME = "identitydetails.attribute.name";
- public static final String IDENTITY_DETAILS_ATTR_VALUE = "identitydetails.attribute.value";
+ String IDENTITY_DETAILS_ATTR_VALUE = "identitydetails.attribute.value";
- public static final String IDENTITY_DETAILS_ATTR_SKIP_LINE = "identitydetails.attribute=";
+ String IDENTITY_DETAILS_ATTR_SKIP_LINE = "identitydetails.attribute=";
/* User Details response object */
- public static final String USER_DETAILS_TOKEN = "userdetails.token.id";
+ String USER_DETAILS_TOKEN = "userdetails.token.id";
- public static final String USER_DETAILS_ROLE = "userdetails.role=id";
+ String USER_DETAILS_ROLE = "userdetails.role=id";
- public static final String USER_DETAILS_ATTR_NAME = "userdetails.attribute.name";
+ String USER_DETAILS_ATTR_NAME = "userdetails.attribute.name";
- public static final String USER_DETAILS_ATTR_VALUE = "userdetails.attribute.value";
+ String USER_DETAILS_ATTR_VALUE = "userdetails.attribute.value";
- public static final String UID_ATTRIBUTE_NAME = "uid";
+ String UID_ATTRIBUTE_NAME = "uid";
/* commands available from SSOProxy command line */
- public static final String AUTH_COMMAND = "authenticate";
+ String AUTH_COMMAND = "authenticate";
- public static final String IDENTITY_COMMAND = "identity";
+ String IDENTITY_COMMAND = "identity";
- public static final String ATTRIBUTES_COMMAND = "attributes";
+ String ATTRIBUTES_COMMAND = "attributes";
- public static final String LOGOUT_COMMAND = "logout";
+ String LOGOUT_COMMAND = "logout";
/* general stuff */
- public static final String UNKNOWN_USER = "Unknown";
+ String UNKNOWN_USER = "Unknown";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandlerMetKeys.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandlerMetKeys.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandlerMetKeys.java
index 8275c70..1ab97cd 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandlerMetKeys.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandlerMetKeys.java
@@ -26,10 +26,10 @@ package org.apache.oodt.cas.product;
*/
public interface CASProductHandlerMetKeys {
- public static final String FILE_HEADER = "File";
+ String FILE_HEADER = "File";
- public static final String CAS_PROFILE_ID = "CAS.Profile.Id";
+ String CAS_PROFILE_ID = "CAS.Profile.Id";
- public static final String UNKNOWN = "UNKNOWN";
+ String UNKNOWN = "UNKNOWN";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryKeys.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryKeys.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryKeys.java
index 1d4e41e..0a3aedb 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryKeys.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryKeys.java
@@ -26,12 +26,12 @@ package org.apache.oodt.cas.product.data;
*/
public interface DataDeliveryKeys {
- public static final String FORMAT_ZIP = "application/x-zip";
+ String FORMAT_ZIP = "application/x-zip";
- public static final String CONTENT_TYPE_HDR = "Content-Type";
+ String CONTENT_TYPE_HDR = "Content-Type";
- public static final String CONTENT_LENGTH_HDR = "Content-Length";
+ String CONTENT_LENGTH_HDR = "Content-Length";
- public static final String CONTENT_DISPOSITION_HDR = "Content-Disposition";
+ String CONTENT_DISPOSITION_HDR = "Content-Disposition";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigMetKeys.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigMetKeys.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigMetKeys.java
index f9f3784..a3b0b00 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigMetKeys.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigMetKeys.java
@@ -28,6 +28,6 @@ package org.apache.oodt.cas.product.rdf;
*/
public interface RDFConfigMetKeys {
- public static final String RDF_CONTEXT_CONF_KEY = "filemgr.rdfconf.file";
+ String RDF_CONTEXT_CONF_KEY = "filemgr.rdfconf.file";
}
[2/5] oodt git commit: OODT-896 remove interface modifier
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReaderMetKeys.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReaderMetKeys.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReaderMetKeys.java
index 2a88023..fed2a85 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReaderMetKeys.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReaderMetKeys.java
@@ -28,48 +28,48 @@ package org.apache.oodt.cas.product.rdf;
*/
public interface RDFConfigReaderMetKeys {
- public static final String NS_OUTER_TAG = "namespaces";
+ String NS_OUTER_TAG = "namespaces";
- public static final String NS_TAG = "ns";
+ String NS_TAG = "ns";
- public static final String NS_NAME_ATTR = "name";
+ String NS_NAME_ATTR = "name";
- public static final String NS_VALUE_ATTR = "value";
+ String NS_VALUE_ATTR = "value";
- public static final String REWRITE_OUTER_TAG = "rewrite";
+ String REWRITE_OUTER_TAG = "rewrite";
- public static final String REWRITE_KEY_TAG = "key";
+ String REWRITE_KEY_TAG = "key";
- public static final String REWRITE_FROM_ATTR = "from";
+ String REWRITE_FROM_ATTR = "from";
- public static final String REWRITE_TO_ATTR = "to";
+ String REWRITE_TO_ATTR = "to";
- public static final String RESOURCE_LINK_TAG = "resourcelinks";
+ String RESOURCE_LINK_TAG = "resourcelinks";
- public static final String RESLINK_KEY_TAG = "key";
+ String RESLINK_KEY_TAG = "key";
- public static final String RESLINK_KEY_TAG_NAME_ATTR = "name";
+ String RESLINK_KEY_TAG_NAME_ATTR = "name";
- public static final String RESLINK_KEY_TAG_LINK_ATTR = "link";
+ String RESLINK_KEY_TAG_LINK_ATTR = "link";
- public static final String KEY_NSMAP_TAG = "keynsmap";
+ String KEY_NSMAP_TAG = "keynsmap";
- public static final String KEY_NSMAP_DEFAULT_ATTR = "default";
+ String KEY_NSMAP_DEFAULT_ATTR = "default";
- public static final String KEY_NSMAP_KEY_TAG = "key";
+ String KEY_NSMAP_KEY_TAG = "key";
- public static final String KEY_NSMAP_KEY_TAG_NAME_ATTR = "name";
+ String KEY_NSMAP_KEY_TAG_NAME_ATTR = "name";
- public static final String KEY_NSMAP_KEY_TAG_NS_ATTR = "ns";
+ String KEY_NSMAP_KEY_TAG_NS_ATTR = "ns";
- public static final String TYPE_NSMAP_TAG = "typesnsmap";
+ String TYPE_NSMAP_TAG = "typesnsmap";
- public static final String TYPE_NSMAP_DEFAULT_ATTR = "default";
+ String TYPE_NSMAP_DEFAULT_ATTR = "default";
- public static final String TYPE_NSMAP_TYPE_TAG = "type";
+ String TYPE_NSMAP_TYPE_TAG = "type";
- public static final String TYPE_NSMAP_TYPE_NAME_ATTR = "name";
+ String TYPE_NSMAP_TYPE_NAME_ATTR = "name";
- public static final String TYPE_NSMAP_TYPE_NS_ATTR = "ns";
+ String TYPE_NSMAP_TYPE_NS_ATTR = "ns";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigMetKeys.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigMetKeys.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigMetKeys.java
index 929d435..bc83d32 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigMetKeys.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigMetKeys.java
@@ -29,6 +29,6 @@ package org.apache.oodt.cas.product.rss;
*/
public interface RSSConfigMetKeys {
- public static final String RSS_CONTEXT_CONF_KEY = "filemgr.rssconf.file";
- public static final String RSS_TRANSFER_CONF_KEY = "filemgr.rss-transfer-conf.file";
+ String RSS_CONTEXT_CONF_KEY = "filemgr.rssconf.file";
+ String RSS_TRANSFER_CONF_KEY = "filemgr.rss-transfer-conf.file";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReaderMetKeys.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReaderMetKeys.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReaderMetKeys.java
index 77001c7..8b6c708 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReaderMetKeys.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReaderMetKeys.java
@@ -28,24 +28,24 @@ package org.apache.oodt.cas.product.rss;
*/
public interface RSSConfigReaderMetKeys {
- public static final String CHANNEL_LINK_ATTR = "channelLink";
+ String CHANNEL_LINK_ATTR = "channelLink";
- public static final String NAMESPACE_TAG = "namespace";
+ String NAMESPACE_TAG = "namespace";
- public static final String NAMESPACE_ATTR_PREFIX = "prefix";
+ String NAMESPACE_ATTR_PREFIX = "prefix";
- public static final String NAMESPACE_ATTR_URI = "uri";
+ String NAMESPACE_ATTR_URI = "uri";
- public static final String TAG_TAG = "tag";
+ String TAG_TAG = "tag";
- public static final String TAG_ATTR_NAME = "name";
+ String TAG_ATTR_NAME = "name";
- public static final String TAG_ATTR_SOURCE = "source";
+ String TAG_ATTR_SOURCE = "source";
- public static final String ATTRIBUTE_TAG = "attribute";
+ String ATTRIBUTE_TAG = "attribute";
- public static final String ATTRIBUTE_ATTR_NAME = "name";
+ String ATTRIBUTE_ATTR_NAME = "name";
- public static final String ATTRIBUTE_ATTR_VALUE = "value";
+ String ATTRIBUTE_ATTR_VALUE = "value";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
index a730026..94a9a63 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
@@ -35,7 +35,7 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface WorkflowEngine {
- public static final String X_POINT_ID = WorkflowEngine.class.getName();
+ String X_POINT_ID = WorkflowEngine.class.getName();
/**
@@ -57,7 +57,7 @@ public interface WorkflowEngine {
* @throws EngineException
* If any error occurs.
*/
- public WorkflowInstance startWorkflow(Workflow workflow, Metadata metadata)
+ WorkflowInstance startWorkflow(Workflow workflow, Metadata metadata)
throws EngineException;
/**
@@ -67,7 +67,7 @@ public interface WorkflowEngine {
* @param workflowInstId
* The identifier of the {@link WorkflowInstance} to stop.
*/
- public void stopWorkflow(String workflowInstId);
+ void stopWorkflow(String workflowInstId);
/**
* <p>
@@ -78,7 +78,7 @@ public interface WorkflowEngine {
* @param workflowInstId
* The ID of the Workflow Instance to pause.
*/
- public void pauseWorkflowInstance(String workflowInstId);
+ void pauseWorkflowInstance(String workflowInstId);
/**
* <p>
@@ -89,7 +89,7 @@ public interface WorkflowEngine {
* @param workflowInstId
* The ID of the {@link WorkflowInstance} to resume.
*/
- public void resumeWorkflowInstance(String workflowInstId);
+ void resumeWorkflowInstance(String workflowInstId);
/**
* Gets the {@link WorkflowInstanceRepository} used by this
@@ -98,7 +98,7 @@ public interface WorkflowEngine {
* @return The {@link WorkflowInstanceRepository} used by this
* {@link WorkflowEngine}.
*/
- public WorkflowInstanceRepository getInstanceRepository();
+ WorkflowInstanceRepository getInstanceRepository();
/**
* Updates the {@link Metadata} context for the {@link WorkflowInstance}
@@ -111,7 +111,7 @@ public interface WorkflowEngine {
* The new {@link Metadata} context.
* @return true if the update was successful, false otherwise.
*/
- public boolean updateMetadata(String workflowInstId, Metadata met);
+ boolean updateMetadata(String workflowInstId, Metadata met);
/**
* Sets a pointer to the Workflow Manager that this {@link WorkflowEngine}
@@ -121,7 +121,7 @@ public interface WorkflowEngine {
* The {@link URL} pointer to the Workflow Manager that this
* {@link WorkflowEngine} belongs to.
*/
- public void setWorkflowManagerUrl(URL url);
+ void setWorkflowManagerUrl(URL url);
/**
* Gets the amount of wall clock minutes that a particular
@@ -136,7 +136,7 @@ public interface WorkflowEngine {
* @return The amount of wall clock minutes that a particular
* {@link WorkflowInstance} has been executing for.
*/
- public double getWallClockMinutes(String workflowInstId);
+ double getWallClockMinutes(String workflowInstId);
/**
* Gets the amount of wall clock minutes that the particular
@@ -150,7 +150,7 @@ public interface WorkflowEngine {
* {@link WorkflowInstance}'s current {@link WorkflowTask} has been
* executing for.
*/
- public double getCurrentTaskWallClockMinutes(String workflowInstId);
+ double getCurrentTaskWallClockMinutes(String workflowInstId);
/**
* Gets the {@link Metadata} associated with the {@link WorkflowInstance}
@@ -163,6 +163,6 @@ public interface WorkflowEngine {
* {@link WorkflowInstance} with the given identifier.
*
*/
- public Metadata getWorkflowInstanceMetadata(String workflowInstId);
+ Metadata getWorkflowInstanceMetadata(String workflowInstId);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java
index 072c693..f3cd068 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java
@@ -29,5 +29,5 @@ public interface WorkflowEngineFactory {
*
* @return An implementation of the {@link WorkflowEngine} interface
*/
- public WorkflowEngine createWorkflowEngine();
+ WorkflowEngine createWorkflowEngine();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java
index b02ae6b..a8eab11 100755
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java
@@ -30,6 +30,6 @@ import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
*/
public interface WorkflowProcessorListener {
- public void notifyChange(WorkflowProcessor processor, ChangeType changeType);
+ void notifyChange(WorkflowProcessor processor, ChangeType changeType);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java
index a11a884..35c7303 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java
@@ -23,5 +23,5 @@ package org.apache.oodt.cas.workflow.engine.runner;
*/
public interface EngineRunnerFactory {
- public EngineRunner createEngineRunner();
+ EngineRunner createEngineRunner();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMapKeys.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMapKeys.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMapKeys.java
index 433c0ed..f52d2ed 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMapKeys.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMapKeys.java
@@ -26,17 +26,17 @@ package org.apache.oodt.cas.workflow.instrepo;
*/
public interface WorkflowInstanceMetMapKeys {
- public static final String DEFAULT_WORKFLOW_MAP = "default";
+ String DEFAULT_WORKFLOW_MAP = "default";
/* this is a RESERVED keyword: DON'T give your workflows this ID! */
- public static final String DEFAULT_WORKFLOW_ID = "__default__";
+ String DEFAULT_WORKFLOW_ID = "__default__";
- public static final String FIELD_TAG = "field";
+ String FIELD_TAG = "field";
- public static final String FIELD_TAG_NAME_ATTR = "name";
+ String FIELD_TAG_NAME_ATTR = "name";
- public static final String WORKFLOW_TAG_NAME = "workflow";
+ String WORKFLOW_TAG_NAME = "workflow";
- public static final String WORKFLOW_TAG_ID_ATTR = "id";
+ String WORKFLOW_TAG_ID_ATTR = "id";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepository.java
index 8abeec5..d6e0fd0 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepository.java
@@ -36,7 +36,7 @@ import org.apache.oodt.cas.workflow.util.Pagination;
*/
public interface WorkflowInstanceRepository extends Pagination {
- public static final String X_POINT_ID = WorkflowInstanceRepository.class
+ String X_POINT_ID = WorkflowInstanceRepository.class
.getName();
/**
@@ -48,7 +48,7 @@ public interface WorkflowInstanceRepository extends Pagination {
* @throws InstanceRepositoryException
* If any error occurs.
*/
- public void addWorkflowInstance(WorkflowInstance wInst)
+ void addWorkflowInstance(WorkflowInstance wInst)
throws InstanceRepositoryException;
/**
@@ -60,7 +60,7 @@ public interface WorkflowInstanceRepository extends Pagination {
* @throws InstanceRepositoryException
* If any error occurs.
*/
- public void updateWorkflowInstance(WorkflowInstance wInst)
+ void updateWorkflowInstance(WorkflowInstance wInst)
throws InstanceRepositoryException;
/**
@@ -72,7 +72,7 @@ public interface WorkflowInstanceRepository extends Pagination {
* @throws InstanceRepositoryException
* If any error occurs.
*/
- public void removeWorkflowInstance(WorkflowInstance wInst)
+ void removeWorkflowInstance(WorkflowInstance wInst)
throws InstanceRepositoryException;
/**
@@ -87,7 +87,7 @@ public interface WorkflowInstanceRepository extends Pagination {
* @throws InstanceRepositoryException
* If any error occurs.
*/
- public WorkflowInstance getWorkflowInstanceById(String workflowInstId)
+ WorkflowInstance getWorkflowInstanceById(String workflowInstId)
throws InstanceRepositoryException;
/**
@@ -96,7 +96,7 @@ public interface WorkflowInstanceRepository extends Pagination {
* @throws InstanceRepositoryException
* If any error occurs.
*/
- public List getWorkflowInstances() throws InstanceRepositoryException;
+ List getWorkflowInstances() throws InstanceRepositoryException;
/**
* <p>
@@ -112,7 +112,7 @@ public interface WorkflowInstanceRepository extends Pagination {
* @throws InstanceRepositoryException
* If there is any error that occurs.
*/
- public List getWorkflowInstancesByStatus(String status)
+ List getWorkflowInstancesByStatus(String status)
throws InstanceRepositoryException;
/**
@@ -123,7 +123,7 @@ public interface WorkflowInstanceRepository extends Pagination {
* <code>status</code> being managed by this
* WorkflowInstanceRepository.
*/
- public int getNumWorkflowInstances() throws InstanceRepositoryException;
+ int getNumWorkflowInstances() throws InstanceRepositoryException;
/**
* Gets the number of {@link WorkflowInstances} with the given
@@ -136,6 +136,6 @@ public interface WorkflowInstanceRepository extends Pagination {
* <code>status</code>.
* @throws InstanceRepositoryException If there is any error that occurs.
*/
- public int getNumWorkflowInstancesByStatus(String status) throws InstanceRepositoryException;
+ int getNumWorkflowInstancesByStatus(String status) throws InstanceRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepositoryFactory.java
index 4357622..7847217 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepositoryFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepositoryFactory.java
@@ -33,5 +33,5 @@ public interface WorkflowInstanceRepositoryFactory {
* @return An implementation of the
* {@link WorkflowInstanceRepository} interface.
*/
- public WorkflowInstanceRepository createInstanceRepository();
+ WorkflowInstanceRepository createInstanceRepository();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleMetKeys.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleMetKeys.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleMetKeys.java
index 07eb96c..425abb7 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleMetKeys.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleMetKeys.java
@@ -28,15 +28,15 @@ package org.apache.oodt.cas.workflow.lifecycle;
*/
public interface WorkflowLifecycleMetKeys {
- public static final String DEFAULT_LIFECYCLE = "default";
+ String DEFAULT_LIFECYCLE = "default";
- public static final String LIFECYCLE_TAG_NAME_ATTR = "name";
+ String LIFECYCLE_TAG_NAME_ATTR = "name";
- public static final String STAGE_TAG_NAME_ATTR = "name";
+ String STAGE_TAG_NAME_ATTR = "name";
- public static final String STATUS_TAG_NAME = "status";
+ String STATUS_TAG_NAME = "status";
- public static final String STAGE_ELEM_NAME = "stage";
+ String STAGE_ELEM_NAME = "stage";
- public static final String LIFECYCLE_TAG_NAME = "lifecycle";
+ String LIFECYCLE_TAG_NAME = "lifecycle";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java
index 3c62a8b..5951094 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java
@@ -28,18 +28,18 @@ package org.apache.oodt.cas.workflow.metadata;
*/
public interface CoreMetKeys {
- public static final String TASK_ID = "TaskId";
+ String TASK_ID = "TaskId";
- public static final String WORKFLOW_INST_ID = "WorkflowInstId";
+ String WORKFLOW_INST_ID = "WorkflowInstId";
- public static final String JOB_ID = "JobId";
+ String JOB_ID = "JobId";
- public static final String PROCESSING_NODE = "ProcessingNode";
+ String PROCESSING_NODE = "ProcessingNode";
- public static final String WORKFLOW_MANAGER_URL = "WorkflowManagerUrl";
+ String WORKFLOW_MANAGER_URL = "WorkflowManagerUrl";
- public static final String QUEUE_NAME = "QueueName";
+ String QUEUE_NAME = "QueueName";
- public static final String TASK_LOAD = "TaskLoad";
+ String TASK_LOAD = "TaskLoad";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepository.java
index 3f5585b..cb069ae 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepository.java
@@ -49,7 +49,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public Workflow getWorkflowByName(String workflowName)
+ Workflow getWorkflowByName(String workflowName)
throws RepositoryException;
/**
@@ -63,7 +63,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public Workflow getWorkflowById(String workflowId) throws RepositoryException;
+ Workflow getWorkflowById(String workflowId) throws RepositoryException;
/**
* <p>
@@ -74,7 +74,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List getWorkflows() throws RepositoryException;
+ List getWorkflows() throws RepositoryException;
/**
* <p>
@@ -90,7 +90,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List getTasksByWorkflowId(String workflowId)
+ List getTasksByWorkflowId(String workflowId)
throws RepositoryException;
/**
@@ -107,7 +107,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List getTasksByWorkflowName(String workflowName)
+ List getTasksByWorkflowName(String workflowName)
throws RepositoryException;
/**
@@ -123,7 +123,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List getWorkflowsForEvent(String eventName) throws RepositoryException;
+ List getWorkflowsForEvent(String eventName) throws RepositoryException;
/**
* <p>
@@ -138,7 +138,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List getConditionsByTaskName(String taskName)
+ List getConditionsByTaskName(String taskName)
throws RepositoryException;
/**
@@ -154,7 +154,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List getConditionsByTaskId(String taskId) throws RepositoryException;
+ List getConditionsByTaskId(String taskId) throws RepositoryException;
/**
* <p>
@@ -170,7 +170,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public WorkflowTaskConfiguration getConfigurationByTaskId(String taskId)
+ WorkflowTaskConfiguration getConfigurationByTaskId(String taskId)
throws RepositoryException;
/**
@@ -184,7 +184,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public WorkflowTask getWorkflowTaskById(String taskId)
+ WorkflowTask getWorkflowTaskById(String taskId)
throws RepositoryException;
/**
@@ -200,7 +200,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public WorkflowCondition getWorkflowConditionById(String conditionId)
+ WorkflowCondition getWorkflowConditionById(String conditionId)
throws RepositoryException;
/**
@@ -215,7 +215,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List getRegisteredEvents() throws RepositoryException;
+ List getRegisteredEvents() throws RepositoryException;
/**
* Adds the specified new {@link Workflow} to this Repository.
@@ -227,7 +227,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public String addWorkflow(Workflow workflow) throws RepositoryException;
+ String addWorkflow(Workflow workflow) throws RepositoryException;
/**
*
@@ -243,7 +243,7 @@ public interface WorkflowRepository {
* @throws RepositoryException
* If any error occurs.
*/
- public List<WorkflowCondition> getConditionsByWorkflowId(String workflowId)
+ List<WorkflowCondition> getConditionsByWorkflowId(String workflowId)
throws RepositoryException;
@@ -256,7 +256,7 @@ public interface WorkflowRepository {
* this function to return that same identifier back.
* @throws RepositoryException If any error occurs.
*/
- public String addTask(WorkflowTask task) throws RepositoryException;
+ String addTask(WorkflowTask task) throws RepositoryException;
/**
* Returns the {@link WorkflowTask} identified by the given taskId.
@@ -265,6 +265,6 @@ public interface WorkflowRepository {
* @return The {@link WorkflowTask} identified by the given taskId.
* @throws RepositoryException If any error occurs.
*/
- public WorkflowTask getTaskById(String taskId) throws RepositoryException;
+ WorkflowTask getTaskById(String taskId) throws RepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepositoryFactory.java
index d711b4d..bc93f19 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepositoryFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepositoryFactory.java
@@ -32,5 +32,5 @@ public interface WorkflowRepositoryFactory {
/**
* @return A new implementation of the {@link WorkflowRepository} interface.
*/
- public WorkflowRepository createRepository();
+ WorkflowRepository createRepository();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java
index 5cd7c60..7675558 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java
@@ -43,6 +43,6 @@ public interface PrioritySorter {
* The {@link List} of {@link WorkflowProcessor}s to sort in priority
* order.
*/
- public void sort(List<WorkflowProcessor> candidates);
+ void sort(List<WorkflowProcessor> candidates);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowConditionInstance.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowConditionInstance.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowConditionInstance.java
index 48a107f..9fd6d8e 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowConditionInstance.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowConditionInstance.java
@@ -43,6 +43,6 @@ public interface WorkflowConditionInstance {
* satisfaction.
* @return true if the condition is satisfied, otherwise, false.
*/
- public boolean evaluate(Metadata metadata, WorkflowConditionConfiguration config);
+ boolean evaluate(Metadata metadata, WorkflowConditionConfiguration config);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowStatus.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowStatus.java
index 832b75a..277af9c 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowStatus.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowStatus.java
@@ -28,20 +28,20 @@ package org.apache.oodt.cas.workflow.structs;
public interface WorkflowStatus {
/* A set of final Strings representing the status of a workflow, or Process */
- public static final String STARTED = "STARTED";
+ String STARTED = "STARTED";
- public static final String FINISHED = "FINISHED";
+ String FINISHED = "FINISHED";
- public static final String PAUSED = "PAUSED";
+ String PAUSED = "PAUSED";
- public static final String ERROR = "ERROR";
+ String ERROR = "ERROR";
- public static final String QUEUED = "QUEUED";
+ String QUEUED = "QUEUED";
- public static final String CREATED = "CREATED";
+ String CREATED = "CREATED";
- public static final String RESMGR_SUBMIT = "RSUBMIT";
+ String RESMGR_SUBMIT = "RSUBMIT";
- public static final String METADATA_MISSING = "METMISS";
+ String METADATA_MISSING = "METMISS";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTaskInstance.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTaskInstance.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTaskInstance.java
index 0b03776..acf951a 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTaskInstance.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTaskInstance.java
@@ -41,5 +41,5 @@ public interface WorkflowTaskInstance {
*
* @param config The static configuration metadata for this task.
*/
- public void run(Metadata metadata, WorkflowTaskConfiguration config) throws WorkflowTaskInstanceException;
+ void run(Metadata metadata, WorkflowTaskConfiguration config) throws WorkflowTaskInstanceException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/workflow/src/main/java/org/apache/oodt/cas/workflow/util/Pagination.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/Pagination.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/Pagination.java
index f862ff1..8dbb14c 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/Pagination.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/Pagination.java
@@ -35,13 +35,13 @@ public interface Pagination {
/**
* @return The first page of products for a particular {@link ProductType}.
*/
- public WorkflowInstancePage getFirstPage();
+ WorkflowInstancePage getFirstPage();
/**
*
* @return The last page of products for a particular {@link ProductType}.
*/
- public WorkflowInstancePage getLastPage();
+ WorkflowInstancePage getLastPage();
/**
*
@@ -51,7 +51,7 @@ public interface Pagination {
* @return The next page in the ProductType product list, given the
* currentPage.
*/
- public WorkflowInstancePage getNextPage(WorkflowInstancePage currentPage);
+ WorkflowInstancePage getNextPage(WorkflowInstancePage currentPage);
/**
*
@@ -61,7 +61,7 @@ public interface Pagination {
* @return The previous page in the ProductType product list, given the
* currentPage.
*/
- public WorkflowInstancePage getPrevPage(WorkflowInstancePage currentPage);
+ WorkflowInstancePage getPrevPage(WorkflowInstancePage currentPage);
/**
* Gets the {@link WorkflowInstancePage} identified by its
@@ -74,7 +74,7 @@ public interface Pagination {
* @throws InstanceRepositoryException
* If any error occurs.
*/
- public WorkflowInstancePage getPagedWorkflows(int pageNum)
+ WorkflowInstancePage getPagedWorkflows(int pageNum)
throws InstanceRepositoryException;
/**
@@ -92,7 +92,7 @@ public interface Pagination {
* @throws InstanceRepositoryException
* If any error occurs.
*/
- public WorkflowInstancePage getPagedWorkflows(int pageNum, String status)
+ WorkflowInstancePage getPagedWorkflows(int pageNum, String status)
throws InstanceRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReaderMetKeys.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReaderMetKeys.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReaderMetKeys.java
index c1f3337..09e617f 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReaderMetKeys.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReaderMetKeys.java
@@ -26,40 +26,40 @@ package org.apache.oodt.xmlps.mapping;
*/
public interface MappingReaderMetKeys {
- public static final String FIELD_TAG = "field";
+ String FIELD_TAG = "field";
- public static final String TABLES_OUTER_TAG = "tables";
+ String TABLES_OUTER_TAG = "tables";
- public static final String TABLE_TAG = "table";
+ String TABLE_TAG = "table";
- public static final String TABLE_ATTR_JOIN_FLD = "join";
+ String TABLE_ATTR_JOIN_FLD = "join";
- public static final String TABLE_ATTR_BASE_TBL_JOIN_TABLE = "to";
+ String TABLE_ATTR_BASE_TBL_JOIN_TABLE = "to";
- public static final String TABLE_ATTR_BASE_TBL_JOIN_FLD = "tofld";
+ String TABLE_ATTR_BASE_TBL_JOIN_FLD = "tofld";
- public static final String TABLE_ATTR_NAME = "name";
+ String TABLE_ATTR_NAME = "name";
- public static final String FIELD_ATTR_TYPE = "type";
+ String FIELD_ATTR_TYPE = "type";
- public static final String FIELD_ATTR_NAME = "name";
+ String FIELD_ATTR_NAME = "name";
- public static final String FIELD_ATTR_DBNAME = "dbname";
+ String FIELD_ATTR_DBNAME = "dbname";
- public static final String FIELD_ATTR_SCOPE = "scope";
+ String FIELD_ATTR_SCOPE = "scope";
- public static final String FIELD_ATTR_VALUE = "value";
+ String FIELD_ATTR_VALUE = "value";
- public static final String FIELD_ATTR_TABLE = "table";
+ String FIELD_ATTR_TABLE = "table";
- public static final String FIELD_ATTR_STRING = "string";
+ String FIELD_ATTR_STRING = "string";
- public static final String FIELD_TRANSLATE_TAG = "translate";
+ String FIELD_TRANSLATE_TAG = "translate";
- public static final String FUNC_TAG = "func";
+ String FUNC_TAG = "func";
- public static final String FUNC_ATTR_CLASS = "class";
+ String FUNC_ATTR_CLASS = "class";
- public static final String FIELD_ATTR_APPEND_TABLE_NAME = "appendTableName";
+ String FIELD_ATTR_APPEND_TABLE_NAME = "appendTableName";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/funcs/MappingFunc.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/funcs/MappingFunc.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/funcs/MappingFunc.java
index f03d52c..6849349 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/funcs/MappingFunc.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/funcs/MappingFunc.java
@@ -40,7 +40,7 @@ public interface MappingFunc {
* The original {@link CDEValue} to translate.
* @return The translated {@link CDEValue}.
*/
- public CDEValue translate(CDEValue orig);
+ CDEValue translate(CDEValue orig);
/**
* Translates the local site's SDE {@link CDEValue} back into its CDE
@@ -51,7 +51,7 @@ public interface MappingFunc {
* a CDE.
* @return The translated {@link CDEValue}.
*/
- public CDEValue inverseTranslate(CDEValue orig);
+ CDEValue inverseTranslate(CDEValue orig);
/**
* Configures the MappingFunc with the appropriate {@link Properties}.
@@ -59,6 +59,6 @@ public interface MappingFunc {
* @param props
* The {@link Properties} to use to configure the MappingFunc.
*/
- public void configure(Properties props);
+ void configure(Properties props);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/Expression.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/Expression.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/Expression.java
index 5673354..6aece62 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/Expression.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/Expression.java
@@ -29,6 +29,6 @@ public interface Expression {
*
* @return A String-readable version of this Expression.
*/
- public String evaluate();
+ String evaluate();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/ParseConstants.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/ParseConstants.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/ParseConstants.java
index abba47b..b26de5c 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/ParseConstants.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/ParseConstants.java
@@ -23,43 +23,43 @@ package org.apache.oodt.xmlps.queryparser;
*/
public interface ParseConstants {
- public final static String XMLQUERY_LOGOP = "LOGOP";
+ String XMLQUERY_LOGOP = "LOGOP";
- public final static String XMLQUERY_AND = "AND";
+ String XMLQUERY_AND = "AND";
- public final static String XMLQUERY_OR = "OR";
+ String XMLQUERY_OR = "OR";
- public final static String XMLQUERY_RELOP = "RELOP";
+ String XMLQUERY_RELOP = "RELOP";
- public final static String XMLQUERY_EQUAL = "EQ";
+ String XMLQUERY_EQUAL = "EQ";
- public final static String XMLQUERY_LIKE = "LIKE";
+ String XMLQUERY_LIKE = "LIKE";
- public final static String XMLQUERY_GREATER_THAN = "GT";
+ String XMLQUERY_GREATER_THAN = "GT";
- public final static String XMLQUERY_GREATER_THAN_OR_EQUAL_TO = "GE";
+ String XMLQUERY_GREATER_THAN_OR_EQUAL_TO = "GE";
- public final static String XMLQUERY_LESS_THAN = "LT";
+ String XMLQUERY_LESS_THAN = "LT";
- public final static String XMLQUERY_LESS_THAN_OR_EQUAL_TO = "LE";
+ String XMLQUERY_LESS_THAN_OR_EQUAL_TO = "LE";
- public final static String XMLQUERY_LITERAL = "LITERAL";
+ String XMLQUERY_LITERAL = "LITERAL";
- public final static String SQL_LIKE = "LIKE";
+ String SQL_LIKE = "LIKE";
- public final static String SQL_EQUAL = "=";
+ String SQL_EQUAL = "=";
- public final static String SQL_AND = "AND";
+ String SQL_AND = "AND";
- public final static String SQL_OR = "OR";
+ String SQL_OR = "OR";
- public final static String SQL_GREATER_THAN_OR_EQUAL_TO = ">=";
+ String SQL_GREATER_THAN_OR_EQUAL_TO = ">=";
- public final static String SQL_GREATER_THAN = ">";
+ String SQL_GREATER_THAN = ">";
- public final static String SQL_LESS_THAN = "<";
+ String SQL_LESS_THAN = "<";
- public final static String SQL_LESS_THAN_OR_EQUAL_TO = "<=";
+ String SQL_LESS_THAN_OR_EQUAL_TO = "<=";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/xmlps/src/main/java/org/apache/oodt/xmlps/util/XMLQueryKeys.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/util/XMLQueryKeys.java b/xmlps/src/main/java/org/apache/oodt/xmlps/util/XMLQueryKeys.java
index b15e3f6..137e54b 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/util/XMLQueryKeys.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/util/XMLQueryKeys.java
@@ -23,8 +23,8 @@ package org.apache.oodt.xmlps.util;
*/
public interface XMLQueryKeys {
- public static final String ROLE_LITERAL = "LITERAL";
+ String ROLE_LITERAL = "LITERAL";
- public static final String ROLE_ELEMNAME = "elemName";
+ String ROLE_ELEMNAME = "elemName";
}
[4/5] oodt git commit: OODT-896 remove interface modifier
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
index 0b6110a..ac9958f 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java
@@ -30,14 +30,14 @@ import java.io.File;
*/
public interface IngestStatus {
- public static enum Result {
+ enum Result {
SUCCESS, FAILURE, SKIPPED, PRECONDS_FAILED;
}
- public File getProduct();
+ File getProduct();
- public Result getResult();
+ Result getResult();
- public String getMessage();
+ String getMessage();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java
index fa8ca4d..8c3b6ec 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigMetKeys.java
@@ -29,36 +29,36 @@ package org.apache.oodt.cas.crawl.typedetection;
*/
public interface MimeExtractorConfigMetKeys {
- public static final String MAGIC_ATTR = "magic";
+ String MAGIC_ATTR = "magic";
- public static final String MIME_REPO_ATTR = "mimeRepo";
+ String MIME_REPO_ATTR = "mimeRepo";
- public static final String DEFAULT_EXTRACTOR_TAG = "default";
+ String DEFAULT_EXTRACTOR_TAG = "default";
- public static final String EXTRACTOR_TAG = "extractor";
+ String EXTRACTOR_TAG = "extractor";
- public static final String NAMING_CONVENTION_TAG = "namingConvention";
+ String NAMING_CONVENTION_TAG = "namingConvention";
- public static final String EXTRACTOR_CLASS_TAG = "extractorClass";
+ String EXTRACTOR_CLASS_TAG = "extractorClass";
- public static final String EXTRACTOR_CONFIG_TAG = "config";
+ String EXTRACTOR_CONFIG_TAG = "config";
- public static final String EXTRACTOR_PRECONDITIONS_TAG = "preconditions";
+ String EXTRACTOR_PRECONDITIONS_TAG = "preconditions";
- public static final String MIME_TAG = "mime";
+ String MIME_TAG = "mime";
- public static final String MIME_TYPE_ATTR = "type";
+ String MIME_TYPE_ATTR = "type";
- public static final String CLASS_ATTR = "class";
+ String CLASS_ATTR = "class";
- public static final String FILE_ATTR = "file";
+ String FILE_ATTR = "file";
- public static final String ENV_REPLACE_ATTR = "envReplace";
+ String ENV_REPLACE_ATTR = "envReplace";
- public static final String PRECONDITION_COMPARATORS_TAG = "preCondComparators";
+ String PRECONDITION_COMPARATORS_TAG = "preCondComparators";
- public static final String PRECONDITION_COMPARATOR_TAG = "preCondComparator";
+ String PRECONDITION_COMPARATOR_TAG = "preCondComparator";
- public static final String ID_ATTR = "id";
+ String ID_ATTR = "id";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
index 465a51d..c1556c5 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
@@ -29,24 +29,24 @@ package org.apache.oodt.cas.curation.metadata;
*/
public interface CuratorConfMetKeys {
- final String MET_EXTRACTOR_CONF_UPLOAD_PATH = "org.apache.oodt.cas.curator.metExtractorConf.uploadPath";
+ String MET_EXTRACTOR_CONF_UPLOAD_PATH = "org.apache.oodt.cas.curator.metExtractorConf.uploadPath";
- final String POLICY_UPLOAD_PATH = "org.apache.oodt.cas.curator.dataDefinition.uploadPath";
+ String POLICY_UPLOAD_PATH = "org.apache.oodt.cas.curator.dataDefinition.uploadPath";
- final String FM_URL = "org.apache.oodt.cas.fm.url";
+ String FM_URL = "org.apache.oodt.cas.fm.url";
- final String DEFAULT_TRANSFER_FACTORY = "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
+ String DEFAULT_TRANSFER_FACTORY = "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
- final String CRAWLER_CONF_FILE = "classpath:/org.apache/oodt/cas/crawl/crawler-config.xml";
+ String CRAWLER_CONF_FILE = "classpath:/org.apache/oodt/cas/crawl/crawler-config.xml";
- final String STAGING_AREA_PATH = "org.apache.oodt.cas.curator.stagingAreaPath";
+ String STAGING_AREA_PATH = "org.apache.oodt.cas.curator.stagingAreaPath";
- final String MET_AREA_PATH = "org.apache.oodt.cas.curator.metAreaPath";
+ String MET_AREA_PATH = "org.apache.oodt.cas.curator.metAreaPath";
- final String MET_EXTENSION = "org.apache.oodt.cas.curator.metExtension";
+ String MET_EXTENSION = "org.apache.oodt.cas.curator.metExtension";
- final String FM_PROPS = "org.apache.oodt.cas.curator.fmProps";
+ String FM_PROPS = "org.apache.oodt.cas.curator.fmProps";
- final String CATALOG_FACTORY_CLASS = "org.apache.oodt.cas.curator.catalogFactoryClass";
+ String CATALOG_FACTORY_CLASS = "org.apache.oodt.cas.curator.catalogFactoryClass";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java
index 7527060..9d806df 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java
@@ -28,9 +28,9 @@ package org.apache.oodt.cas.curation.structs;
*/
public interface IngestionTaskStatus {
- public static final String FINISHED = "Finished";
+ String FINISHED = "Finished";
- public static final String STARTED = "Started";
+ String STARTED = "Started";
- public static final String NOT_STARTED = "Not Started";
+ String NOT_STARTED = "Not Started";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
index 841633e..0a10fed 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
@@ -46,7 +46,7 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface Catalog extends Pagination {
- public final static String X_POINT_ID = Catalog.class.getName();
+ String X_POINT_ID = Catalog.class.getName();
/**
* <p>
@@ -61,7 +61,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any general error occurs.
*/
- public void addMetadata(Metadata m, Product product)
+ void addMetadata(Metadata m, Product product)
throws CatalogException;
/**
@@ -77,7 +77,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any general error occurs.
*/
- public void removeMetadata(Metadata m, Product product)
+ void removeMetadata(Metadata m, Product product)
throws CatalogException;
/**
@@ -90,7 +90,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs during the add.
*/
- public void addProduct(Product product) throws CatalogException;
+ void addProduct(Product product) throws CatalogException;
/**
* <p>
@@ -103,7 +103,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public void modifyProduct(Product product) throws CatalogException;
+ void modifyProduct(Product product) throws CatalogException;
/**
* <p>
@@ -115,7 +115,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public void removeProduct(Product product) throws CatalogException;
+ void removeProduct(Product product) throws CatalogException;
/**
* <p>
@@ -127,7 +127,7 @@ public interface Catalog extends Pagination {
* caller should make sure that the product ID field is set.
* @throws CatalogException
*/
- public void setProductTransferStatus(Product product)
+ void setProductTransferStatus(Product product)
throws CatalogException;
/**
@@ -143,7 +143,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If anything goes wrong.
*/
- public void addProductReferences(Product product) throws CatalogException;
+ void addProductReferences(Product product) throws CatalogException;
/**
* <p>
@@ -158,7 +158,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public Product getProductById(String productId) throws CatalogException;
+ Product getProductById(String productId) throws CatalogException;
/**
* <p>
@@ -172,7 +172,7 @@ public interface Catalog extends Pagination {
* populated as well.
* @throws CatalogException
*/
- public Product getProductByName(String productName) throws CatalogException;
+ Product getProductByName(String productName) throws CatalogException;
/**
* <p>
@@ -185,7 +185,7 @@ public interface Catalog extends Pagination {
* specified Product.
* @throws CatalogException
*/
- public List getProductReferences(Product product) throws CatalogException;
+ List getProductReferences(Product product) throws CatalogException;
/**
* <p>
@@ -196,7 +196,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public List<Product> getProducts() throws CatalogException;
+ List<Product> getProducts() throws CatalogException;
/**
* <p>
@@ -211,7 +211,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public List<Product> getProductsByProductType(ProductType type)
+ List<Product> getProductsByProductType(ProductType type)
throws CatalogException;
/**
@@ -226,7 +226,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public Metadata getMetadata(Product product) throws CatalogException;
+ Metadata getMetadata(Product product) throws CatalogException;
/**
* <p>
@@ -241,7 +241,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public Metadata getReducedMetadata(Product product, List<String> elements)
+ Metadata getReducedMetadata(Product product, List<String> elements)
throws CatalogException;
/**
@@ -258,7 +258,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public List<String> query(Query query, ProductType type) throws CatalogException;
+ List<String> query(Query query, ProductType type) throws CatalogException;
/**
* <p>
@@ -282,7 +282,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
+ ProductPage pagedQuery(Query query, ProductType type, int pageNum)
throws CatalogException;
/**
@@ -298,7 +298,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public List<Product> getTopNProducts(int n) throws CatalogException;
+ List<Product> getTopNProducts(int n) throws CatalogException;
/**
* <p>
@@ -315,7 +315,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public List<Product> getTopNProducts(int n, ProductType type)
+ List<Product> getTopNProducts(int n, ProductType type)
throws CatalogException;
/**
@@ -324,7 +324,7 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs (e.g., the layer isn't initialized).
*/
- public ValidationLayer getValidationLayer() throws CatalogException;
+ ValidationLayer getValidationLayer() throws CatalogException;
/**
*
@@ -335,6 +335,6 @@ public interface Catalog extends Pagination {
* @throws CatalogException
* If any error occurs.
*/
- public int getNumProducts(ProductType type) throws CatalogException;
+ int getNumProducts(ProductType type) throws CatalogException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java
index 46a0f75..933f009 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java
@@ -31,5 +31,5 @@ public interface CatalogFactory {
/**
* @return A new {@link Catalog} object implementation.
*/
- public Catalog createCatalog();
+ Catalog createCatalog();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java
index c1577f4..a0ee611 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/ProductIdGenerator.java
@@ -26,6 +26,6 @@ import org.apache.oodt.cas.filemgr.structs.Product;
*/
public interface ProductIdGenerator {
- public String generateId(Product product);
+ String generateId(Product product);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java
index b4708e2..fee3078 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java
@@ -38,14 +38,14 @@ import java.net.URL;
*/
public interface DataTransfer {
/* extension point ID */
- public static final String X_POINT_ID = DataTransfer.class.getName();
+ String X_POINT_ID = DataTransfer.class.getName();
/**
*
* @param url The URL to the File Manager that this transferer will be
* transferring Products to.
*/
- public void setFileManagerUrl(URL url);
+ void setFileManagerUrl(URL url);
/**
*
@@ -58,7 +58,7 @@ public interface DataTransfer {
* @throws IOException
* If there is an IO eerror when performing the transfer.
*/
- public void transferProduct(Product product) throws DataTransferException,
+ void transferProduct(Product product) throws DataTransferException,
IOException;
/**
@@ -70,8 +70,8 @@ public interface DataTransfer {
* @throws IOException
* If there is an IO eerror when performing the transfer.
*/
- public void retrieveProduct(Product product, File directory) throws DataTransferException,
+ void retrieveProduct(Product product, File directory) throws DataTransferException,
IOException;
- public void deleteProduct(Product product) throws DataTransferException, IOException;
+ void deleteProduct(Product product) throws DataTransferException, IOException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java
index 0f09d1b..9acab13 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java
@@ -29,5 +29,5 @@ public interface DataTransferFactory {
/**
* @return A new {@link DataTransfer} implementation.
*/
- public DataTransfer createDataTransfer();
+ DataTransfer createDataTransfer();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java
index 66a8578..44b627f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java
@@ -36,14 +36,14 @@ import java.util.List;
*/
public interface Cache {
- public static final String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName";
+ String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName";
/**
* Clears the current cache. This should be used before a re-{@link #sync(String, String))}
* occurs.
*
*/
- public void clear();
+ void clear();
/**
* Checks the cache to determine if a {@link Product} with the given
@@ -54,7 +54,7 @@ public interface Cache {
* @return True if the {@link Product} is foudn in the Cache, False,
* otherwise.
*/
- public boolean contains(String productName);
+ boolean contains(String productName);
/**
* Specifies the {@link URL} to the File Manager to connect this Cache to.
@@ -63,13 +63,13 @@ public interface Cache {
* The {@link URL} of the File Manager to cache {@link Product}s
* from.
*/
- public void setFileManager(URL fmUrl);
+ void setFileManager(URL fmUrl);
/**
*
* @return The size of the current {@link Product} cache.
*/
- public int size();
+ int size();
/**
* Synchronizes this Cache with the File Manager specified by the
@@ -81,7 +81,7 @@ public interface Cache {
* @throws CacheException
* If there is any error.
*/
- public void sync(List<String> uniqueElementProductTypeNames) throws CacheException;
+ void sync(List<String> uniqueElementProductTypeNames) throws CacheException;
/**
* Synchronizes this Cache with the File Manager specified by the
@@ -96,8 +96,8 @@ public interface Cache {
* @throws CacheException
* If there is any error.
*/
- public void sync(String uniqueElementName,
- List<String> uniqueElementProductTypeNames) throws CacheException;
+ void sync(String uniqueElementName,
+ List<String> uniqueElementProductTypeNames) throws CacheException;
/**
* Synchronizes this Cache with the File Manager specified by the
@@ -109,7 +109,7 @@ public interface Cache {
* @throws CacheException
* If any error occurs.
*/
- public void sync() throws CacheException;
+ void sync() throws CacheException;
/**
* Sets the names of the {@link ProductType}s to cache.
@@ -118,8 +118,8 @@ public interface Cache {
* A {@link List} of java.util.String names of
* {@link ProductType}s.
*/
- public void setUniqueElementProductTypeNames(
- List<String> uniqueElementProductTypeNames);
+ void setUniqueElementProductTypeNames(
+ List<String> uniqueElementProductTypeNames);
/**
* Sets the name of the met element to use as the identifier of a
@@ -130,7 +130,7 @@ public interface Cache {
* The name of the met element used to uniquely identify
* {@link Product}s.
*/
- public void setUniqueElementName(String uniqueElementName);
+ void setUniqueElementName(String uniqueElementName);
/**
* Gets the {@link URL} of the File Manager that this Cache communicates
@@ -139,5 +139,5 @@ public interface Cache {
* @return The {@link URL} of the File Manager that this Cache communicates
* with.
*/
- public URL getFileManagerUrl();
+ URL getFileManagerUrl();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java
index a901ada..68bdd7b 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java
@@ -34,6 +34,6 @@ public interface CacheFactory {
* @throws InstantiationException If the the particular {@link Cache} can
* not be created for some reason.
*/
- public Cache createCache() throws InstantiationException;
+ Cache createCache() throws InstantiationException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
index 45e71d4..c2251ea 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
@@ -58,8 +58,8 @@ public interface Ingester {
* @throws IngestException
* If there is an error ingesting the {@link Product}
*/
- public String ingest(URL fmUrl, File prodFile, MetExtractor extractor,
- File metConfFile) throws IngestException;
+ String ingest(URL fmUrl, File prodFile, MetExtractor extractor,
+ File metConfFile) throws IngestException;
/**
* Ingests a {@link Product} to the file manager service object identified
@@ -78,7 +78,7 @@ public interface Ingester {
* @throws IngestException
* If there is an error ingesting the {@link Product}
*/
- public String ingest(URL fmUrl, File prodFile, Metadata met)
+ String ingest(URL fmUrl, File prodFile, Metadata met)
throws IngestException;
/**
@@ -96,8 +96,8 @@ public interface Ingester {
* @throws IngestException
* If there is an error ingesting the {@link Product}s.
*/
- public void ingest(URL fmUrl, List<String> prodFiles, MetExtractor extractor,
- File metConfFile) throws IngestException;
+ void ingest(URL fmUrl, List<String> prodFiles, MetExtractor extractor,
+ File metConfFile) throws IngestException;
/**
* Checks the file manager at the given {@link URL} to see whether or not it
@@ -111,7 +111,7 @@ public interface Ingester {
* @url The {@link URL} pointer to the file manager service.
* @return
*/
- public boolean hasProduct(URL fmUrl, File prodFile) throws CatalogException;
+ boolean hasProduct(URL fmUrl, File prodFile) throws CatalogException;
/**
* Checks the file manager at the given {@link URL} to see whether or not it
@@ -127,6 +127,6 @@ public interface Ingester {
* not unique) name.
* @return True if the file manager has the product, false otherwise.
*/
- public boolean hasProduct(URL fmUrl, String productName) throws CatalogException;
+ boolean hasProduct(URL fmUrl, String productName) throws CatalogException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java
index ab5ad93..c6ea595 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java
@@ -35,14 +35,14 @@ import java.util.List;
*/
public interface RemoteableCache extends Remote{
- public static final String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName";
+ String DEFAULT_UNIQUE_MET_KEY = "CAS.ProductName";
/**
* Clears the current cache. This should be used before a re-{@link #sync(String, String))}
* occurs.
*
*/
- public void clear() throws RemoteException;
+ void clear() throws RemoteException;
/**
* Checks the cache to determine if a {@link Product} with the given
@@ -53,7 +53,7 @@ public interface RemoteableCache extends Remote{
* @return True if the {@link Product} is foudn in the Cache, False,
* otherwise.
*/
- public boolean contains(String productName) throws RemoteException;
+ boolean contains(String productName) throws RemoteException;
/**
* Specifies the {@link URL} to the File Manager to connect this Cache to.
@@ -62,13 +62,13 @@ public interface RemoteableCache extends Remote{
* The {@link URL} of the File Manager to cache {@link Product}s
* from.
*/
- public void setFileManager(URL fmUrl) throws RemoteException;
+ void setFileManager(URL fmUrl) throws RemoteException;
/**
*
* @return The size of the current {@link Product} cache.
*/
- public int size() throws RemoteException;
+ int size() throws RemoteException;
/**
* Synchronizes this Cache with the File Manager specified by the
@@ -80,7 +80,7 @@ public interface RemoteableCache extends Remote{
* @throws RemoteException
* If there is any error.
*/
- public void sync(List<String> uniqueElementProductTypeNames) throws RemoteException;
+ void sync(List<String> uniqueElementProductTypeNames) throws RemoteException;
/**
* Synchronizes this Cache with the File Manager specified by the
@@ -95,8 +95,8 @@ public interface RemoteableCache extends Remote{
* @throws RemoteException
* If there is any error.
*/
- public void sync(String uniqueElementName,
- List<String> uniqueElementProductTypeNames) throws RemoteException;
+ void sync(String uniqueElementName,
+ List<String> uniqueElementProductTypeNames) throws RemoteException;
/**
* Synchronizes this Cache with the File Manager specified by the
@@ -108,7 +108,7 @@ public interface RemoteableCache extends Remote{
* @throws RemoteException
* If any error occurs.
*/
- public void sync() throws RemoteException;
+ void sync() throws RemoteException;
/**
* Sets the names of the {@link ProductType}s to cache.
@@ -117,8 +117,8 @@ public interface RemoteableCache extends Remote{
* A {@link List} of java.util.String names of
* {@link ProductType}s.
*/
- public void setUniqueElementProductTypeNames(
- List<String> uniqueElementProductTypeNames) throws RemoteException;
+ void setUniqueElementProductTypeNames(
+ List<String> uniqueElementProductTypeNames) throws RemoteException;
/**
* Sets the name of the met element to use as the identifier of a
@@ -129,7 +129,7 @@ public interface RemoteableCache extends Remote{
* The name of the met element used to uniquely identify
* {@link Product}s.
*/
- public void setUniqueElementName(String uniqueElementName)
+ void setUniqueElementName(String uniqueElementName)
throws RemoteException;
/**
@@ -139,5 +139,5 @@ public interface RemoteableCache extends Remote{
* @return The {@link URL} of the File Manager that this Cache communicates
* with.
*/
- public URL getFileManagerUrl() throws RemoteException;
+ URL getFileManagerUrl() throws RemoteException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
index edd14d5..d23a7f5 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
@@ -26,22 +26,22 @@ package org.apache.oodt.cas.filemgr.metadata;
*/
public interface CoreMetKeys {
- public static final String PRODUCT_NAME = "ProductName";
+ String PRODUCT_NAME = "ProductName";
- public static final String PRODUCT_ID = "ProductId";
+ String PRODUCT_ID = "ProductId";
- public static final String PRODUCT_RECEVIED_TIME = "ProductReceivedTime";
+ String PRODUCT_RECEVIED_TIME = "ProductReceivedTime";
- public static final String FILE_LOCATION = "FileLocation";
+ String FILE_LOCATION = "FileLocation";
- public static final String FILENAME = "Filename";
+ String FILENAME = "Filename";
- public static final String FILE_SIZE = "FileSize";
+ String FILE_SIZE = "FileSize";
- public static final String PRODUCT_TYPE = "ProductType";
+ String PRODUCT_TYPE = "ProductType";
- public static final String PRODUCT_STRUCTURE = "ProductStructure";
+ String PRODUCT_STRUCTURE = "ProductStructure";
- public static final String MIME_TYPE = "MimeType";
+ String MIME_TYPE = "MimeType";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java
index b725da2..558c6eb 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/ProductMetKeys.java
@@ -31,22 +31,22 @@ package org.apache.oodt.cas.filemgr.metadata;
*/
public interface ProductMetKeys {
- public static final String PRODUCT_ID = "ProductId";
+ String PRODUCT_ID = "ProductId";
- public static final String PRODUCT_NAME = "ProductName";
+ String PRODUCT_NAME = "ProductName";
- public static final String PRODUCT_STRUCTURE = "ProductStructure";
+ String PRODUCT_STRUCTURE = "ProductStructure";
- public static final String PRODUCT_TRANSFER_STATUS = "ProductTransferStatus";
+ String PRODUCT_TRANSFER_STATUS = "ProductTransferStatus";
- public static final String PRODUCT_ROOT_REFERENCE = "ProductRootReference";
+ String PRODUCT_ROOT_REFERENCE = "ProductRootReference";
- public static final String PRODUCT_DATASTORE_REFS = "ProductDataStoreReferences";
+ String PRODUCT_DATASTORE_REFS = "ProductDataStoreReferences";
- public static final String PRODUCT_ORIG_REFS = "ProductOrigReferences";
+ String PRODUCT_ORIG_REFS = "ProductOrigReferences";
- public static final String PRODUCT_MIME_TYPES = "ProductMimeType";
+ String PRODUCT_MIME_TYPES = "ProductMimeType";
- public static final String PRODUCT_FILE_SIZES = "ProductFileSize";
+ String PRODUCT_FILE_SIZES = "ProductFileSize";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java
index 64f1e87..e2ee1c4 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java
@@ -46,7 +46,7 @@ public interface FilemgrMetExtractor {
* @return Extracted {@link Metadata} derived from the existing
* {@link Metadata} and {@link Product} provided.
*/
- public Metadata extractMetadata(Product product, Metadata met)
+ Metadata extractMetadata(Product product, Metadata met)
throws MetExtractionException;
/**
@@ -56,5 +56,5 @@ public interface FilemgrMetExtractor {
* The {@link Properties} object to configure this Metadata
* extractor with.
*/
- public void configure(Properties props);
+ void configure(Properties props);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java
index 0bd4e84..f5c56b2 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java
@@ -40,7 +40,7 @@ import java.util.List;
public interface RepositoryManager {
/* extension point ID */
- public static String X_POINT_ID = RepositoryManager.class.getName();
+ String X_POINT_ID = RepositoryManager.class.getName();
/**
* <p>
@@ -51,7 +51,7 @@ public interface RepositoryManager {
* The {@link ProductType} to add.
* @throws RepositoryManagerException
*/
- public void addProductType(ProductType productType)
+ void addProductType(ProductType productType)
throws RepositoryManagerException;
/**
@@ -65,7 +65,7 @@ public interface RepositoryManager {
* @throws RepositoryManagerException
* If any error occurs.
*/
- public void modifyProductType(ProductType productType)
+ void modifyProductType(ProductType productType)
throws RepositoryManagerException;
/**
@@ -78,7 +78,7 @@ public interface RepositoryManager {
* @throws RepositoryManagerException
* If any error occurs during the removal.
*/
- public void removeProductType(ProductType productType)
+ void removeProductType(ProductType productType)
throws RepositoryManagerException;
/**
@@ -94,7 +94,7 @@ public interface RepositoryManager {
* @throws RepositoryManagerException
* If any error occurs.
*/
- public ProductType getProductTypeById(String productTypeId)
+ ProductType getProductTypeById(String productTypeId)
throws RepositoryManagerException;
/**
@@ -109,7 +109,7 @@ public interface RepositoryManager {
* @throws RepositoryManagerException
* If any error occurs.
*/
- public ProductType getProductTypeByName(String productTypeName)
+ ProductType getProductTypeByName(String productTypeName)
throws RepositoryManagerException;
/**
@@ -121,5 +121,5 @@ public interface RepositoryManager {
* @throws RepositoryManagerException
* If any error occurs.
*/
- public List<ProductType> getProductTypes() throws RepositoryManagerException;
+ List<ProductType> getProductTypes() throws RepositoryManagerException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java
index d533d5e..db38bd8 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java
@@ -28,5 +28,5 @@ package org.apache.oodt.cas.filemgr.repository;
*/
public interface RepositoryManagerFactory {
- public RepositoryManager createRepositoryManager();
+ RepositoryManager createRepositoryManager();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java
index 91cb252..4d7ef8f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java
@@ -28,6 +28,6 @@ package org.apache.oodt.cas.filemgr.structs.query.conv;
*/
public interface VersionConverter {
- public double convertToPriority(String version) throws Exception;
+ double convertToPriority(String version) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
index 5dd68ca..5e5e564 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Dispatcher.java
@@ -45,6 +45,6 @@ public interface Dispatcher {
* @throws Exception
* If any error occurs.
*/
- public Result handleRequest(String methodSpecifier, List params,
- String user, String password) throws Exception;
+ Result handleRequest(String methodSpecifier, List params,
+ String user, String password) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java
index 9c04840..7e9f85a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java
@@ -38,7 +38,7 @@ public interface Pagination {
* The ProductType to obtain the first {@link ProductPage} for.
* @return The first page of products for a particular {@link ProductType}.
*/
- public ProductPage getFirstPage(ProductType type);
+ ProductPage getFirstPage(ProductType type);
/**
*
@@ -46,7 +46,7 @@ public interface Pagination {
* The ProductType to obtain the last {@link ProductPage} for.
* @return The last page of products for a particular {@link ProductType}.
*/
- public ProductPage getLastProductPage(ProductType type);
+ ProductPage getLastProductPage(ProductType type);
/**
*
@@ -59,7 +59,7 @@ public interface Pagination {
* @return The next page in the ProductType product list, given the
* currentPage.
*/
- public ProductPage getNextPage(ProductType type, ProductPage currentPage);
+ ProductPage getNextPage(ProductType type, ProductPage currentPage);
/**
*
@@ -72,5 +72,5 @@ public interface Pagination {
* @return The previous page in the ProductType product list, given the
* currentPage.
*/
- public ProductPage getPrevPage(ProductType type, ProductPage currentPage);
+ ProductPage getPrevPage(ProductType type, ProductPage currentPage);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java
index a901bc2..59a4b5d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java
@@ -48,7 +48,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs during the add.
*/
- public void addElement(Element element) throws ValidationLayerException;
+ void addElement(Element element) throws ValidationLayerException;
/**
* <p>
@@ -60,7 +60,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public void modifyElement(Element element) throws ValidationLayerException;
+ void modifyElement(Element element) throws ValidationLayerException;
/**
* <p>
@@ -71,7 +71,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public void removeElement(Element element) throws ValidationLayerException;
+ void removeElement(Element element) throws ValidationLayerException;
/**
* <p>
@@ -86,7 +86,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public void addElementToProductType(ProductType type, Element element)
+ void addElementToProductType(ProductType type, Element element)
throws ValidationLayerException;
/**
@@ -104,7 +104,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public void removeElementFromProductType(ProductType type, Element element)
+ void removeElementFromProductType(ProductType type, Element element)
throws ValidationLayerException;
/**
@@ -120,7 +120,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public List<Element> getElements(ProductType type)
+ List<Element> getElements(ProductType type)
throws ValidationLayerException;
/**
@@ -129,7 +129,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public List<Element> getElements() throws ValidationLayerException;
+ List<Element> getElements() throws ValidationLayerException;
/**
* Gets an element by its String identifier.
@@ -140,7 +140,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public Element getElementById(String elementId)
+ Element getElementById(String elementId)
throws ValidationLayerException;
/**
@@ -152,7 +152,7 @@ public interface ValidationLayer {
* @throws ValidationLayerException
* If any error occurs.
*/
- public Element getElementByName(String elementName)
+ Element getElementByName(String elementName)
throws ValidationLayerException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java
index 73b89ff..014cde0 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java
@@ -28,5 +28,5 @@ package org.apache.oodt.cas.filemgr.validation;
*/
public interface ValidationLayerFactory {
- public ValidationLayer createValidationLayer();
+ ValidationLayer createValidationLayer();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java
index 2b274f3..1c1b0c1 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java
@@ -34,9 +34,9 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface Versioner {
- public static final String X_POINT_ID = Versioner.class.getName();
+ String X_POINT_ID = Versioner.class.getName();
- public void createDataStoreReferences(Product product, Metadata metadata)
+ void createDataStoreReferences(Product product, Metadata metadata)
throws VersioningException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java
index 699d7c6..ee2f4b6 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java
@@ -51,7 +51,7 @@ public interface MetExtractor {
* @throws MetExtractionException
* If any error occurs.
*/
- public Metadata extractMetadata(File f) throws MetExtractionException;
+ Metadata extractMetadata(File f) throws MetExtractionException;
/**
* Extracts {@link Metadata} from a given <code>/path/to/some/file</code>.
@@ -62,7 +62,7 @@ public interface MetExtractor {
* @throws MetExtractionException
* If any error occurs.
*/
- public Metadata extractMetadata(String filePath)
+ Metadata extractMetadata(String filePath)
throws MetExtractionException;
/**
@@ -75,7 +75,7 @@ public interface MetExtractor {
* @throws MetExtractionException
* If any error occurs.
*/
- public Metadata extractMetadata(URL fileUrl) throws MetExtractionException;
+ Metadata extractMetadata(URL fileUrl) throws MetExtractionException;
/**
* Sets the config file for this MetExtractor to the specified {@link File}
@@ -85,7 +85,7 @@ public interface MetExtractor {
* The config file for this MetExtractor.
* @throws MetExtractionException
*/
- public void setConfigFile(File f) throws MetExtractionException;
+ void setConfigFile(File f) throws MetExtractionException;
/**
* Sets the config file for this MetExtractor to the specified {@link File}
@@ -95,7 +95,7 @@ public interface MetExtractor {
* The config file path for this MetExtractor.
* @throws MetExtractionException
*/
- public void setConfigFile(String filePath) throws MetExtractionException;
+ void setConfigFile(String filePath) throws MetExtractionException;
/**
* Sets the MetExtractorConfig for the MetExtractor
@@ -103,7 +103,7 @@ public interface MetExtractor {
* @param config
* The MetExtractorConfig
*/
- public void setConfigFile(MetExtractorConfig config);
+ void setConfigFile(MetExtractorConfig config);
/**
* Extracts {@link Metadata} from the given {@link File} using the specified
@@ -118,7 +118,7 @@ public interface MetExtractor {
* @throws MetExtractionException
* If any error occurs.
*/
- public Metadata extractMetadata(File f, File configFile)
+ Metadata extractMetadata(File f, File configFile)
throws MetExtractionException;
/**
@@ -134,7 +134,7 @@ public interface MetExtractor {
* @throws MetExtractionException
* If any error occurs.
*/
- public Metadata extractMetadata(File f, String configFilePath)
+ Metadata extractMetadata(File f, String configFilePath)
throws MetExtractionException;
/**
@@ -150,7 +150,7 @@ public interface MetExtractor {
* @throws MetExtractionException
* If any error occurs
*/
- public Metadata extractMetadata(File f, MetExtractorConfig config)
+ Metadata extractMetadata(File f, MetExtractorConfig config)
throws MetExtractionException;
/**
@@ -166,6 +166,6 @@ public interface MetExtractor {
* @throws MetExtractionException
* If any error occurs
*/
- public Metadata extractMetadata(URL fileUrl, MetExtractorConfig config)
+ Metadata extractMetadata(URL fileUrl, MetExtractorConfig config)
throws MetExtractionException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java
index 9f982b1..bb972ee 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java
@@ -46,7 +46,7 @@ public interface MetExtractorConfigReader {
* @throws MetExtractorConfigReaderException
* If any error occurs
*/
- public MetExtractorConfig parseConfigFile(File configFile)
+ MetExtractorConfig parseConfigFile(File configFile)
throws MetExtractorConfigReaderException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java
index d638977..9b2b82f 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java
@@ -28,26 +28,26 @@ package org.apache.oodt.cas.metadata.extractors;
*/
public interface ExternConfigReaderMetKeys {
- public static final String EXEC_TAG = "exec";
+ String EXEC_TAG = "exec";
- public static final String WORKING_DIR_ATTR = "workingDir";
+ String WORKING_DIR_ATTR = "workingDir";
- public static final String MET_FILE_EXT_ATTR = "metFileExt";
+ String MET_FILE_EXT_ATTR = "metFileExt";
- public static final String EXTRACTOR_BIN_PATH_TAG = "extractorBinPath";
+ String EXTRACTOR_BIN_PATH_TAG = "extractorBinPath";
- public static final String ENV_REPLACE_ATTR = "envReplace";
+ String ENV_REPLACE_ATTR = "envReplace";
- public static final String ARGS_TAG = "args";
+ String ARGS_TAG = "args";
- public static final String ARG_TAG = "arg";
+ String ARG_TAG = "arg";
- public static final String IS_DATA_FILE_ATTR = "isDataFile";
+ String IS_DATA_FILE_ATTR = "isDataFile";
- public static final String IS_MET_FILE_ATTR = "isMetFile";
+ String IS_MET_FILE_ATTR = "isMetFile";
- public static final String APPEND_EXT_ATTR = "appendExt";
+ String APPEND_EXT_ATTR = "appendExt";
- public static final String IS_PATH_ATTR = "isPath";
+ String IS_PATH_ATTR = "isPath";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java
index 85702dd..a8fb93e 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java
@@ -29,10 +29,10 @@ package org.apache.oodt.cas.metadata.extractors;
*/
public interface ExternMetExtractorMetKeys {
- public static final String DATA_FILE_PLACE_HOLDER = "<DATA_FILE_PLACE_HOLDER>";
+ String DATA_FILE_PLACE_HOLDER = "<DATA_FILE_PLACE_HOLDER>";
- public static final String MET_FILE_PLACE_HOLDER = "<MET_FILE_PLACE_HOLDER>";
+ String MET_FILE_PLACE_HOLDER = "<MET_FILE_PLACE_HOLDER>";
- public static final String DEFAULT_MET_FILE_EXTENSION = "met";
+ String DEFAULT_MET_FILE_EXTENSION = "met";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java
index 46b24ce..11bce23 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java
@@ -28,20 +28,20 @@ package org.apache.oodt.cas.metadata.extractors;
*/
public interface FilenameTokenExtractorMetKeys {
- public static final String TIME_FORMAT_STRING_SCALAR = "TimeFormatString";
+ String TIME_FORMAT_STRING_SCALAR = "TimeFormatString";
- public static final String SUBSTRING_OFFSET_GROUP = "SubstringOffsetGroup";
+ String SUBSTRING_OFFSET_GROUP = "SubstringOffsetGroup";
- public static final String TOKEN_LIST_GROUP = "TokenNameListGroup";
+ String TOKEN_LIST_GROUP = "TokenNameListGroup";
- public static final String TOKEN_DELIMETER_SCALAR = "Delimeter";
+ String TOKEN_DELIMETER_SCALAR = "Delimeter";
- public static final String TOKEN_MET_KEYS_VECTOR = "TokenMetKeys";
+ String TOKEN_MET_KEYS_VECTOR = "TokenMetKeys";
- public static final String PRODUCTION_DATE_TIME_GROUP = "ProductionDateTimeGroup";
+ String PRODUCTION_DATE_TIME_GROUP = "ProductionDateTimeGroup";
- public static final String DATETIME_SCALAR = "DateTimeFormat";
+ String DATETIME_SCALAR = "DateTimeFormat";
- public static final String COMMON_METADATA_GROUP = "CommonMetadata";
+ String COMMON_METADATA_GROUP = "CommonMetadata";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java
index 4d6a73d..25882af 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/filenaming/NamingConvention.java
@@ -30,6 +30,6 @@ import org.apache.oodt.cas.metadata.exceptions.NamingConventionException;
*/
public interface NamingConvention {
- public File rename(File file, Metadata metadata)
+ File rename(File file, Metadata metadata)
throws NamingConventionException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java
index 32938f0..96160f7 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java
@@ -30,12 +30,12 @@ package org.apache.oodt.cas.metadata.preconditions;
*/
public interface PreConditionOperatorMetKeys {
- public static String EQUAL_TO = "EQUAL_TO";
+ String EQUAL_TO = "EQUAL_TO";
- public static String NOT_EQUAL_TO = "NOT_EQUAL_TO";
+ String NOT_EQUAL_TO = "NOT_EQUAL_TO";
- public static String GREATER_THAN = "GREATER_THAN";
+ String GREATER_THAN = "GREATER_THAN";
- public static String LESS_THAN = "LESS_THAN";
+ String LESS_THAN = "LESS_THAN";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java
----------------------------------------------------------------------
diff --git a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java
index 806eafe..c4ca432 100644
--- a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java
+++ b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDirMetKeys.java
@@ -28,15 +28,15 @@ package org.apache.oodt.cas.install;
*/
public interface CASInstallDirMetKeys {
- public static final String POLICY_DIR_NAME = "policy";
+ String POLICY_DIR_NAME = "policy";
- public static final String CONFIG_DIR_NAME = "etc";
+ String CONFIG_DIR_NAME = "etc";
- public static final String LIB_DIR_NAME = "lib";
+ String LIB_DIR_NAME = "lib";
- public static final String BIN_DIR_NAME = "bin";
+ String BIN_DIR_NAME = "bin";
- public static final String[] FM_CONFIG_FILES = { "filemgr.properties",
+ String[] FM_CONFIG_FILES = { "filemgr.properties",
"logging.properties" };
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java b/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java
index 1fba636..6ee2378 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java
@@ -26,12 +26,12 @@ package org.apache.oodt.opendapps;
*/
public interface DapNames {
- public static final String ACTUAL_RANGE = "actual_range";
+ String ACTUAL_RANGE = "actual_range";
- public static final String UNITS = "units";
+ String UNITS = "units";
- public static final String START = "start";
+ String START = "start";
- public static final String END = "end";
+ String END = "end";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java
index 6be8298..cf68dab 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapConfigMetKeys.java
@@ -24,64 +24,64 @@ package org.apache.oodt.opendapps.config;
*/
public interface OpendapConfigMetKeys {
- public static final String RES_ATTR_SPEC_TYPE = "resAttr";
+ String RES_ATTR_SPEC_TYPE = "resAttr";
- public static final String PROF_ATTR_SPEC_TYPE = "profAttr";
+ String PROF_ATTR_SPEC_TYPE = "profAttr";
- public static final String PROF_ELEM_SPEC_TYPE = "profElem";
+ String PROF_ELEM_SPEC_TYPE = "profElem";
- public static final String ENUM_ELEMENT_TYPE = "EnumeratedProfileElement";
+ String ENUM_ELEMENT_TYPE = "EnumeratedProfileElement";
- public static final String RANGED_ELEMENT_TYPE = "RangedProfileElement";
+ String RANGED_ELEMENT_TYPE = "RangedProfileElement";
- public static final String DAP_ROOT_TAG = "root";
+ String DAP_ROOT_TAG = "root";
- public static final String DATASET_URL_ATTR = "datasetURL";
+ String DATASET_URL_ATTR = "datasetURL";
- public static final String CATALOG_URL_ATTR = "catalogURL";
+ String CATALOG_URL_ATTR = "catalogURL";
- public static final String FILTER_ATTR = "filter";
+ String FILTER_ATTR = "filter";
- public static final String REWRITE_ROOT_TAG = "rewrite";
+ String REWRITE_ROOT_TAG = "rewrite";
- public static final String REWRITE_VAR_TAG = "var";
+ String REWRITE_VAR_TAG = "var";
- public static final String REWRITE_VAR_NAME_ATTR = "name";
+ String REWRITE_VAR_NAME_ATTR = "name";
- public static final String REWRITE_VAR_RENAME_ATTR = "rename";
+ String REWRITE_VAR_RENAME_ATTR = "rename";
- public static final String REWRITE_VAR_TYPE_ATTR = "type";
+ String REWRITE_VAR_TYPE_ATTR = "type";
- public static final String CONSTANT_ROOT_TAG = "constants";
+ String CONSTANT_ROOT_TAG = "constants";
- public static final String CONSTANT_TAG = "const";
+ String CONSTANT_TAG = "const";
- public static final String CONSTANT_NAME_ATTR = "name";
+ String CONSTANT_NAME_ATTR = "name";
- public static final String CONSTANT_TYPE_ATTR = "type";
+ String CONSTANT_TYPE_ATTR = "type";
- public static final String CONSTANT_VALUE_ATTR = "value";
+ String CONSTANT_VALUE_ATTR = "value";
- public static final String DATASET_MET_ROOT_TAG = "datasetMetadata";
+ String DATASET_MET_ROOT_TAG = "datasetMetadata";
- public static final String DATASET_MET_ELEM_TAG = "elem";
+ String DATASET_MET_ELEM_TAG = "elem";
- public static final String DATASET_MET_NAME_ATTR = "name";
+ String DATASET_MET_NAME_ATTR = "name";
- public static final String DATASET_MET_VALUE_ATTR = "value";
+ String DATASET_MET_VALUE_ATTR = "value";
- public static final String RES_LOCATION_ATTR = "resLocation";
+ String RES_LOCATION_ATTR = "resLocation";
- public static final String PROCESSING_INSTRUCTIONS_TAG = "processingInstructions";
+ String PROCESSING_INSTRUCTIONS_TAG = "processingInstructions";
- public static final String PROCESSING_INSTRUCTION_TAG = "processingInstruction";
+ String PROCESSING_INSTRUCTION_TAG = "processingInstruction";
- public static final String PROCESSING_INSTRUCTION_NAME_ATTR = "name";
+ String PROCESSING_INSTRUCTION_NAME_ATTR = "name";
- public static final String PROCESSING_INSTRUCTION_VALUE_ATTR = "value";
+ String PROCESSING_INSTRUCTION_VALUE_ATTR = "value";
- public static final String EXCLUDE_VARIABLES_ATTR = "excludeVariables";
+ String EXCLUDE_VARIABLES_ATTR = "excludeVariables";
- public static final String DATETIME_FORMAT_ATTR = "datetimeFormat";
+ String DATETIME_FORMAT_ATTR = "datetimeFormat";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java
index d060b57..f833be8 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/config/OpendapProfileMetKeys.java
@@ -24,13 +24,13 @@ package org.apache.oodt.opendapps.config;
*/
public interface OpendapProfileMetKeys {
- public static final String VARIABLES = "Variables";
+ String VARIABLES = "Variables";
- public static final String COORDINATES = "Coordinates";
+ String COORDINATES = "Coordinates";
- public static final String VARIABLES_LONG_NAMES = "Variable Long Names";
+ String VARIABLES_LONG_NAMES = "Variable Long Names";
- public static final String CF_STANDARD_NAMES = "CF Standard Names";
+ String CF_STANDARD_NAMES = "CF Standard Names";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java
index 411dd8d..535d1f2 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerPropertiesMetKeys.java
@@ -26,10 +26,10 @@ package org.apache.oodt.pcs.health;
*/
public interface CrawlerPropertiesMetKeys {
- public static final String CRAWLER_INFO_GROUP = "CrawlerInfo";
+ String CRAWLER_INFO_GROUP = "CrawlerInfo";
- public static final String CRAWLER_PROPERTIES_GROUP = "CrawlProperties";
+ String CRAWLER_PROPERTIES_GROUP = "CrawlProperties";
- public static final String CRAWLER_HOST_NAME = "Hostname";
+ String CRAWLER_HOST_NAME = "Hostname";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java
index c28feb5..245e0da 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorMetKeys.java
@@ -25,28 +25,28 @@ package org.apache.oodt.pcs.health;
*/
public interface PCSHealthMonitorMetKeys {
- public static final String HEADER_AND_FOOTER = "--------------------------------------";
+ String HEADER_AND_FOOTER = "--------------------------------------";
- public static final String SECTION_SEPARATOR = "--------";
+ String SECTION_SEPARATOR = "--------";
- public static final String REPORT_BANNER = "PCS Health Monitor Report";
+ String REPORT_BANNER = "PCS Health Monitor Report";
- public static final String FILE_MANAGER_DAEMON_NAME = "File Manager";
+ String FILE_MANAGER_DAEMON_NAME = "File Manager";
- public static final String WORKFLOW_MANAGER_DAEMON_NAME = "Workflow Manager";
+ String WORKFLOW_MANAGER_DAEMON_NAME = "Workflow Manager";
- public static final String RESOURCE_MANAGER_DAEMON_NAME = "Resource Manager";
+ String RESOURCE_MANAGER_DAEMON_NAME = "Resource Manager";
- public static final String BATCH_STUB_DAEMON_NAME = "batch stub";
+ String BATCH_STUB_DAEMON_NAME = "batch stub";
- public static final String STATUS_UP = "UP";
+ String STATUS_UP = "UP";
- public static final String STATUS_DOWN = "DOWN";
+ String STATUS_DOWN = "DOWN";
- public static final int TOP_N_PRODUCTS = 20;
+ int TOP_N_PRODUCTS = 20;
- public static final int CRAWLER_DOWN_INT = -1;
+ int CRAWLER_DOWN_INT = -1;
- public static final double CRAWLER_DOWN_DOUBLE = -1.0;
+ double CRAWLER_DOWN_DOUBLE = -1.0;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java
index e4c1e55..d4837f3 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/WorkflowStatesMetKeys.java
@@ -26,8 +26,8 @@ package org.apache.oodt.pcs.health;
*/
public interface WorkflowStatesMetKeys {
- public static final String WORKFLOW_STATES_GROUP = "WorkflowStatesGroup";
+ String WORKFLOW_STATES_GROUP = "WorkflowStatesGroup";
- public static final String WORKFLOW_STATES_VECTOR = "States";
+ String WORKFLOW_STATES_VECTOR = "States";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java b/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java
index 114052d..54a8437 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConfKeys.java
@@ -27,16 +27,16 @@ package org.apache.oodt.pcs.listing;
*/
public interface ListingConfKeys {
- public static final String MET_FIELD_COLS_GROUP = "MetFieldColumns";
+ String MET_FIELD_COLS_GROUP = "MetFieldColumns";
- public static final String MET_FIELDS_ORDER_VECTOR = "OrderedMetKeys";
+ String MET_FIELDS_ORDER_VECTOR = "OrderedMetKeys";
- public static final String COLLECTION_FIELDS_GROUP = "CollectionFields";
+ String COLLECTION_FIELDS_GROUP = "CollectionFields";
- public static final String COLLECTION_FIELDS_NAMES = "FieldNames";
+ String COLLECTION_FIELDS_NAMES = "FieldNames";
- public static final String EXCLUDED_PRODUCT_TYPE_GROUP = "ExcludedProductTypeList";
+ String EXCLUDED_PRODUCT_TYPE_GROUP = "ExcludedProductTypeList";
- public static final String EXCLUDED_VECTOR = "ProductTypes";
+ String EXCLUDED_VECTOR = "ProductTypes";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java
index 9e4f894..1bc5487 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSConfigMetadata.java
@@ -26,54 +26,54 @@ package org.apache.oodt.pcs.metadata;
*/
public interface PCSConfigMetadata {
- public static final String PGE_TASK_TYPE = "PCS_PGETaskType";
+ String PGE_TASK_TYPE = "PCS_PGETaskType";
- public static final String NUM_JAVA_EXT_DIRS = "PCS_NumJavaExtDirs";
+ String NUM_JAVA_EXT_DIRS = "PCS_NumJavaExtDirs";
// use this key like: JAVA_EXT_DIR+"1", or JAVA_EXT_DIR+"2"
- public static final String JAVA_EXT_DIR = "PCS_JavaExtDir";
+ String JAVA_EXT_DIR = "PCS_JavaExtDir";
- public static final String JAVA_MAIN_CLASS = "PCS_JavaMainClass";
+ String JAVA_MAIN_CLASS = "PCS_JavaMainClass";
- public static final String FILE_MANAGER_URL = "PCS_FileManagerUrl";
+ String FILE_MANAGER_URL = "PCS_FileManagerUrl";
- public static final String SCF_FILE_MANAGER_URL = "SCF_FileManagerUrl";
+ String SCF_FILE_MANAGER_URL = "SCF_FileManagerUrl";
- public static final String WORKFLOW_MANAGER_URL = "PCS_WorkflowManagerUrl";
+ String WORKFLOW_MANAGER_URL = "PCS_WorkflowManagerUrl";
- public static final String PGE_CONFIG_FILE_PROPERTY_ADDER_CLASS = "PCS_PGEConfigPropertyAdderClass";
+ String PGE_CONFIG_FILE_PROPERTY_ADDER_CLASS = "PCS_PGEConfigPropertyAdderClass";
- public static final String CLIENT_TRANSFER_SERVICE_FACTORY = "PCS_ClientTransferServiceFactory";
+ String CLIENT_TRANSFER_SERVICE_FACTORY = "PCS_ClientTransferServiceFactory";
- public static final String CRAWLER_CLEANUP = "PCS_CrawlerCleanup";
+ String CRAWLER_CLEANUP = "PCS_CrawlerCleanup";
- public static final String CRAWLER_CRAWLDIRS = "PCS_CrawlerCrawlForDirs";
+ String CRAWLER_CRAWLDIRS = "PCS_CrawlerCrawlForDirs";
- public static final String CONFIG_FILE_SCHEMA_PATH = "PCS_ConfigFileSchemaPath";
+ String CONFIG_FILE_SCHEMA_PATH = "PCS_ConfigFileSchemaPath";
- public static final String PGE_CONFIG_FILE_NAME = "PCS_PGEConfigFileName";
+ String PGE_CONFIG_FILE_NAME = "PCS_PGEConfigFileName";
- public static final String PGE_LOG_FILE_NAME = "PCS_PGELogFileName";
+ String PGE_LOG_FILE_NAME = "PCS_PGELogFileName";
- public static final String PGE_TYPE_GDS_ADAPTOR = "GDSAdaptor";
+ String PGE_TYPE_GDS_ADAPTOR = "GDSAdaptor";
- public static final String PGE_TYPE_GDS_PGE = "GDSPge";
+ String PGE_TYPE_GDS_PGE = "GDSPge";
- public static final String UNKNOWN = "UNKNOWN";
+ String UNKNOWN = "UNKNOWN";
- public static final String WORKFLOW_MGR_URL = "WorkflowManagerUrl";
+ String WORKFLOW_MGR_URL = "WorkflowManagerUrl";
- public static final String WORKFLOW_INST_ID = "WorkflowInstId";
+ String WORKFLOW_INST_ID = "WorkflowInstId";
- public static final String MAX_ALLOWABLE_GAP_MINUTES = "PCS_MaxAllowableTimeGapMinutes";
+ String MAX_ALLOWABLE_GAP_MINUTES = "PCS_MaxAllowableTimeGapMinutes";
/* PGE task statuses */
- public static final String STAGING_INPUT = "STAGING INPUT";
+ String STAGING_INPUT = "STAGING INPUT";
- public static final String CONF_FILE_BUILD = "BUILDING CONFIG FILE";
+ String CONF_FILE_BUILD = "BUILDING CONFIG FILE";
- public static final String RUNNING_PGE = "PGE EXEC";
+ String RUNNING_PGE = "PGE EXEC";
- public static final String CRAWLING = "CRAWLING";
+ String CRAWLING = "CRAWLING";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java
index 7f107b2..7f72271 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/metadata/PCSMetadata.java
@@ -25,54 +25,54 @@ package org.apache.oodt.pcs.metadata;
public interface PCSMetadata {
/* Met Fields */
- public static final String APPLICATION_SUCCESS_FLAG = "ApplicationSuccessFlag";
+ String APPLICATION_SUCCESS_FLAG = "ApplicationSuccessFlag";
- public static final String ON_DISK = "OnDisk";
+ String ON_DISK = "OnDisk";
- public static final String TAPE_LOCATION = "TapeLocation";
+ String TAPE_LOCATION = "TapeLocation";
- public static final String PRODUCTION_LOCATION = "ProductionLocation";
+ String PRODUCTION_LOCATION = "ProductionLocation";
- public static final String PRODUCTION_LOCATION_CODE = "ProductionLocationCode";
+ String PRODUCTION_LOCATION_CODE = "ProductionLocationCode";
- public static final String DATA_VERSION = "DataVersion";
+ String DATA_VERSION = "DataVersion";
- public static final String DATA_PROVIDER = "DataProvider";
+ String DATA_PROVIDER = "DataProvider";
- public static final String COLLECTION_LABEL = "CollectionLabel";
+ String COLLECTION_LABEL = "CollectionLabel";
- public static final String COMMENTS = "Comments";
+ String COMMENTS = "Comments";
- public static final String EXECUTABLE_PATHNAMES = "ExecutablePathnames";
+ String EXECUTABLE_PATHNAMES = "ExecutablePathnames";
- public static final String EXECUTABLE_VERSIONS = "ExecutableVersions";
+ String EXECUTABLE_VERSIONS = "ExecutableVersions";
- public static final String PROCESSING_LEVEL = "ProcessingLevel";
+ String PROCESSING_LEVEL = "ProcessingLevel";
- public static final String JOB_ID = "JobId";
+ String JOB_ID = "JobId";
- public static final String TASK_ID = "TaskId";
+ String TASK_ID = "TaskId";
- public static final String PRODUCTION_DATE_TIME = "ProductionDateTime";
+ String PRODUCTION_DATE_TIME = "ProductionDateTime";
- public static final String INPUT_FILES = "InputFiles";
+ String INPUT_FILES = "InputFiles";
- public static final String PGE_NAME = "PGEName";
+ String PGE_NAME = "PGEName";
- public static final String OUTPUT_FILES = "OutputFiles";
+ String OUTPUT_FILES = "OutputFiles";
- public static final String TEST_TAG = "TestTag";
+ String TEST_TAG = "TestTag";
- public static final String SUB_TEST_TAG = "SubTestTag";
+ String SUB_TEST_TAG = "SubTestTag";
- public static final String TEST_LOCATION = "TestLocation";
+ String TEST_LOCATION = "TestLocation";
- public static final String TEST_COUNTER = "TestCounter";
+ String TEST_COUNTER = "TestCounter";
- public static final String TEST_DATE = "TestDate";
+ String TEST_DATE = "TestDate";
- public static final String START_DATE_TIME = "StartDateTime";
+ String START_DATE_TIME = "StartDateTime";
- public static final String END_DATE_TIME = "EndDateTime";
+ String END_DATE_TIME = "EndDateTime";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java b/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java
index 78ef1b6..59d8f3f 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java
@@ -39,6 +39,6 @@ public interface PCSQuery extends PCSMetadata, CoreMetKeys {
*
* @return A filemgr compliant {@link Query} object.
*/
- public Query buildQuery();
+ Query buildQuery();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java
index 1c0b4db..47623f2 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java
@@ -26,34 +26,34 @@ package org.apache.oodt.pcs.input;
*/
public interface PGEConfigFileKeys {
- public static final String RECORDED_AUX_INPUT_FILES_GROUP = "RecordedAuxiliaryInputFiles";
+ String RECORDED_AUX_INPUT_FILES_GROUP = "RecordedAuxiliaryInputFiles";
- public static final String DYNAMIC_AUX_INPUT_FILES_GROUP = "DynamicAuxiliaryInputFiles";
+ String DYNAMIC_AUX_INPUT_FILES_GROUP = "DynamicAuxiliaryInputFiles";
- public static final String INPUT_PRODUCT_FILES_GROUP = "InputProductFiles";
+ String INPUT_PRODUCT_FILES_GROUP = "InputProductFiles";
- public static final String PRODUCT_PATH_GROUP = "ProductPathGroup";
+ String PRODUCT_PATH_GROUP = "ProductPathGroup";
- public static final String PGE_NAME_GROUP = "PGENameGroup";
+ String PGE_NAME_GROUP = "PGENameGroup";
- public static final String MODE_GROUP = "ModeGroup";
+ String MODE_GROUP = "ModeGroup";
- public static final String GEOMETRY_GROUP = "Geometry";
+ String GEOMETRY_GROUP = "Geometry";
- public static final String PRIMARY_EXECUTABLE_GROUP = "PrimaryExecutable";
+ String PRIMARY_EXECUTABLE_GROUP = "PrimaryExecutable";
- public static final String SFIF_FILE_GROUP = "StaticFileIdentificationFiles";
+ String SFIF_FILE_GROUP = "StaticFileIdentificationFiles";
- public static final String JOB_IDENTIFICATION_GROUP = "JobIdentification";
+ String JOB_IDENTIFICATION_GROUP = "JobIdentification";
- public static final String SCF_IDENTIFICATION_GROUP = "SCFIdentification";
+ String SCF_IDENTIFICATION_GROUP = "SCFIdentification";
- public static final String MONITOR_GROUP = "MonitorGroup";
+ String MONITOR_GROUP = "MonitorGroup";
- public static final String MONITOR_LEVEL_GROUP = "MonitorLevel";
+ String MONITOR_LEVEL_GROUP = "MonitorLevel";
- public static final String LOG_METADATA_GROUP = "LogMetadata";
+ String LOG_METADATA_GROUP = "LogMetadata";
- public static final String COMMAND_LINE_PARAMETERS_GROUP = "CommandLineParameters";
+ String COMMAND_LINE_PARAMETERS_GROUP = "CommandLineParameters";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java
index 795e063..72615b6 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java
@@ -27,33 +27,33 @@ package org.apache.oodt.pcs.input;
*/
public interface PGEDataParseKeys {
- public static final int PARSING_VEC = -10;
+ int PARSING_VEC = -10;
- public static final int PARSING_SCALAR = -20;
+ int PARSING_SCALAR = -20;
- public static final int PARSING_MATRIX = -30;
+ int PARSING_MATRIX = -30;
- public static final int UNSET = -1;
+ int UNSET = -1;
- public static final String GROUP_TAG_NAME = "group";
+ String GROUP_TAG_NAME = "group";
- public static final String SCALAR_TAG_NAME = "scalar";
+ String SCALAR_TAG_NAME = "scalar";
- public static final String VECTOR_TAG_NAME = "vector";
+ String VECTOR_TAG_NAME = "vector";
- public static final String MATRIX_TAG_NAME = "matrix";
+ String MATRIX_TAG_NAME = "matrix";
- public static final String PGE_INPUT_TAG_NAME = "input";
+ String PGE_INPUT_TAG_NAME = "input";
- public static final String VECTOR_ELEMENT_TAG = "element";
+ String VECTOR_ELEMENT_TAG = "element";
- public static final String MATRIX_ROW_TAG = "tr";
+ String MATRIX_ROW_TAG = "tr";
- public static final String MATRIX_COL_TAG = "td";
+ String MATRIX_COL_TAG = "td";
- public static final String NAME_ATTR = "name";
+ String NAME_ATTR = "name";
- public static final String ROWS_ATTR = "rows";
+ String ROWS_ATTR = "rows";
- public static final String COLS_ATTR = "cols";
+ String COLS_ATTR = "cols";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java
----------------------------------------------------------------------
diff --git a/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java b/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java
index 167cdd3..653126f 100644
--- a/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java
+++ b/pcs/services/src/main/java/org/apache/oodt/pcs/services/config/PCSServiceConfMetKeys.java
@@ -27,20 +27,20 @@ package org.apache.oodt.pcs.services.config;
*/
public interface PCSServiceConfMetKeys {
- public static final String FM_URL = "org.apache.oodt.cas.fm.url";
+ String FM_URL = "org.apache.oodt.cas.fm.url";
- public static final String WM_URL = "org.apache.oodt.cas.wm.url";
+ String WM_URL = "org.apache.oodt.cas.wm.url";
- public static final String RM_URL = "org.apache.oodt.cas.rm.url";
+ String RM_URL = "org.apache.oodt.cas.rm.url";
- public static final String PCS_LL_CONF_FILE_PATH = "org.apache.oodt.pcs.ll.conf.filePath";
+ String PCS_LL_CONF_FILE_PATH = "org.apache.oodt.pcs.ll.conf.filePath";
- public static final String PCS_HEALTH_CRAWLER_CONF_PATH = "org.apache.oodt.pcs.health.crawler.conf.filePath";
+ String PCS_HEALTH_CRAWLER_CONF_PATH = "org.apache.oodt.pcs.health.crawler.conf.filePath";
- public static final String PCS_HEALTH_WORKFLOW_STATUS_PATH = "org.apache.oodt.pcs.health.workflow.statuses.filePath";
+ String PCS_HEALTH_WORKFLOW_STATUS_PATH = "org.apache.oodt.pcs.health.workflow.statuses.filePath";
- public static final String PCS_TRACE_ENABLE_NON_CAT = "org.apache.oodt.pcs.trace.enableNonCat";
+ String PCS_TRACE_ENABLE_NON_CAT = "org.apache.oodt.pcs.trace.enableNonCat";
- public static final String PCS_TRACE_PTYPE_EXCLUDE_LIST = "org.apache.oodt.pcs.trace.productTypeExcludeList";
+ String PCS_TRACE_PTYPE_EXCLUDE_LIST = "org.apache.oodt.pcs.trace.productTypeExcludeList";
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java b/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java
index 2170925..b6df211 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/ConfigFilePropertyAdder.java
@@ -35,6 +35,6 @@ import org.apache.oodt.cas.pge.metadata.PgeMetadata;
*/
public interface ConfigFilePropertyAdder {
- public void addConfigProperties(PgeMetadata metadata, Object... objs);
+ void addConfigProperties(PgeMetadata metadata, Object... objs);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java b/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java
index 0bde153..b2e05e4 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/config/PgeConfigBuilder.java
@@ -26,5 +26,5 @@ import org.apache.oodt.cas.pge.metadata.PgeMetadata;
*/
public interface PgeConfigBuilder {
- public PgeConfig build(PgeMetadata pgeMetadata) throws Exception;
+ PgeConfig build(PgeMetadata pgeMetadata) throws Exception;
}
[5/5] oodt git commit: OODT-896 remove interface modifier
Posted by ma...@apache.org.
OODT-896 remove interface modifier
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d7bbba08
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d7bbba08
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d7bbba08
Branch: refs/heads/master
Commit: d7bbba0823aee35272755ad8eb9aee34c072d1d0
Parents: d95d4c7
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 10:24:45 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 10:24:45 2015 +0000
----------------------------------------------------------------------
.../gui/perspective/view/ViewListener.java | 2 +-
.../oodt/cas/catalog/mapping/IngestMapper.java | 40 +++++-----
.../catalog/mapping/IngestMapperFactory.java | 2 +-
.../filter/time/conv/VersionConverter.java | 2 +-
.../oodt/cas/catalog/query/parser/Node.java | 14 ++--
.../query/parser/QueryParserTreeConstants.java | 20 ++---
.../catalog/repository/CatalogRepository.java | 12 +--
.../repository/CatalogRepositoryFactory.java | 2 +-
.../channel/CommunicationChannelClient.java | 78 +++++++++---------
.../CommunicationChannelClientFactory.java | 6 +-
.../channel/CommunicationChannelServer.java | 82 +++++++++----------
.../CommunicationChannelServerFactory.java | 8 +-
.../RmiCommunicationChannelClientInterface.java | 66 +++++++--------
.../oodt/cas/catalog/struct/Dictionary.java | 6 +-
.../cas/catalog/struct/DictionaryFactory.java | 2 +-
.../apache/oodt/cas/catalog/struct/Index.java | 10 +--
.../oodt/cas/catalog/struct/IndexFactory.java | 2 +-
.../oodt/cas/catalog/struct/IngestService.java | 8 +-
.../oodt/cas/catalog/struct/QueryService.java | 10 +--
.../catalog/struct/TransactionIdFactory.java | 4 +-
.../oodt/cas/catalog/system/CatalogService.java | 84 ++++++++++----------
.../catalog/system/CatalogServiceFactory.java | 2 +-
.../cli/action/store/CmdLineActionStore.java | 2 +-
.../action/store/CmdLineActionStoreFactory.java | 2 +-
.../spring/SpringSetContextInjectionType.java | 4 +-
.../cas/cli/construct/CmdLineConstructor.java | 4 +-
.../oodt/cas/cli/option/CmdLineOption.java | 50 ++++++------
.../cas/cli/option/HandleableCmdLineOption.java | 6 +-
.../cli/option/ValidatableCmdLineOption.java | 4 +-
.../option/handler/CmdLineOptionHandler.java | 12 +--
.../cas/cli/option/require/RequirementRule.java | 4 +-
.../cli/option/store/CmdLineOptionStore.java | 2 +-
.../option/store/CmdLineOptionStoreFactory.java | 2 +-
.../validator/CmdLineOptionValidator.java | 4 +-
.../oodt/cas/cli/parser/CmdLineParser.java | 2 +-
.../cas/cli/presenter/CmdLinePresenter.java | 10 +--
.../oodt/cas/cli/printer/CmdLinePrinter.java | 14 ++--
.../spring/SpringSetIdInjectionType.java | 4 +-
.../oodt/cas/crawl/status/IngestStatus.java | 8 +-
.../MimeExtractorConfigMetKeys.java | 32 ++++----
.../curation/metadata/CuratorConfMetKeys.java | 20 ++---
.../curation/structs/IngestionTaskStatus.java | 6 +-
.../oodt/cas/filemgr/catalog/Catalog.java | 42 +++++-----
.../cas/filemgr/catalog/CatalogFactory.java | 2 +-
.../catalog/solr/ProductIdGenerator.java | 2 +-
.../cas/filemgr/datatransfer/DataTransfer.java | 10 +--
.../datatransfer/DataTransferFactory.java | 2 +-
.../apache/oodt/cas/filemgr/ingest/Cache.java | 26 +++---
.../oodt/cas/filemgr/ingest/CacheFactory.java | 2 +-
.../oodt/cas/filemgr/ingest/Ingester.java | 14 ++--
.../cas/filemgr/ingest/RemoteableCache.java | 26 +++---
.../oodt/cas/filemgr/metadata/CoreMetKeys.java | 18 ++---
.../cas/filemgr/metadata/ProductMetKeys.java | 18 ++---
.../extractors/FilemgrMetExtractor.java | 4 +-
.../filemgr/repository/RepositoryManager.java | 14 ++--
.../repository/RepositoryManagerFactory.java | 2 +-
.../structs/query/conv/VersionConverter.java | 2 +-
.../cas/filemgr/system/auth/Dispatcher.java | 4 +-
.../oodt/cas/filemgr/util/Pagination.java | 8 +-
.../cas/filemgr/validation/ValidationLayer.java | 18 ++---
.../validation/ValidationLayerFactory.java | 2 +-
.../oodt/cas/filemgr/versioning/Versioner.java | 4 +-
.../apache/oodt/cas/metadata/MetExtractor.java | 20 ++---
.../cas/metadata/MetExtractorConfigReader.java | 2 +-
.../extractors/ExternConfigReaderMetKeys.java | 22 ++---
.../extractors/ExternMetExtractorMetKeys.java | 6 +-
.../FilenameTokenExtractorMetKeys.java | 16 ++--
.../metadata/filenaming/NamingConvention.java | 2 +-
.../PreConditionOperatorMetKeys.java | 8 +-
.../oodt/cas/install/CASInstallDirMetKeys.java | 10 +--
.../org/apache/oodt/opendapps/DapNames.java | 8 +-
.../opendapps/config/OpendapConfigMetKeys.java | 60 +++++++-------
.../opendapps/config/OpendapProfileMetKeys.java | 8 +-
.../pcs/health/CrawlerPropertiesMetKeys.java | 6 +-
.../pcs/health/PCSHealthMonitorMetKeys.java | 24 +++---
.../oodt/pcs/health/WorkflowStatesMetKeys.java | 4 +-
.../oodt/pcs/listing/ListingConfKeys.java | 12 +--
.../oodt/pcs/metadata/PCSConfigMetadata.java | 48 +++++------
.../apache/oodt/pcs/metadata/PCSMetadata.java | 50 ++++++------
.../org/apache/oodt/pcs/query/PCSQuery.java | 2 +-
.../oodt/pcs/input/PGEConfigFileKeys.java | 30 +++----
.../apache/oodt/pcs/input/PGEDataParseKeys.java | 30 +++----
.../services/config/PCSServiceConfMetKeys.java | 16 ++--
.../oodt/cas/pge/ConfigFilePropertyAdder.java | 2 +-
.../oodt/cas/pge/config/PgeConfigBuilder.java | 2 +-
.../oodt/cas/pge/config/PgeConfigMetKeys.java | 70 ++++++++--------
.../cas/pge/writers/SciPgeConfigFileWriter.java | 4 +-
.../product/handlers/ofsn/OFSNGetHandler.java | 6 +-
.../product/handlers/ofsn/OFSNListHandler.java | 4 +-
.../handlers/ofsn/metadata/OFSNMetKeys.java | 10 +--
.../ofsn/metadata/OFSNXMLConfigMetKeys.java | 22 ++---
.../handlers/ofsn/metadata/OFSNXMLMetKeys.java | 12 +--
.../handlers/ofsn/metadata/OODTMetKeys.java | 2 +-
.../handlers/ofsn/metadata/XMLQueryMetKeys.java | 4 +-
.../org/apache/oodt/cas/protocol/Protocol.java | 24 +++---
.../oodt/cas/protocol/ProtocolFactory.java | 4 +-
.../oodt/cas/protocol/auth/Authentication.java | 4 +-
.../cas/protocol/config/ProtocolConfig.java | 4 +-
.../cas/protocol/util/ProtocolFileFilter.java | 2 +-
.../cas/protocol/verify/ProtocolVerifier.java | 2 +-
.../verify/ProtocolVerifierFactory.java | 2 +-
.../oodt/cas/pushpull/config/ConfigMetKeys.java | 40 +++++-----
.../pushpull/config/ConfigParserMetKeys.java | 82 +++++++++----------
.../pushpull/daemon/DaemonLauncherMBean.java | 8 +-
.../cas/pushpull/daemon/DaemonListener.java | 8 +-
.../oodt/cas/pushpull/daemon/DaemonMBean.java | 46 +++++------
.../cas/pushpull/daemon/DaemonRmiInterface.java | 18 ++---
.../cas/pushpull/expressions/ValidInput.java | 4 +-
.../cas/pushpull/filerestrictions/Parser.java | 2 +-
.../retrievalmethod/RetrievalMethod.java | 6 +-
.../retrievalsystem/DownloadListener.java | 6 +-
.../retrievalsystem/RemoteFileMetKeys.java | 26 +++---
.../oodt/cas/resource/batchmgr/Batchmgr.java | 12 +--
.../cas/resource/batchmgr/BatchmgrFactory.java | 2 +-
.../oodt/cas/resource/jobqueue/JobQueue.java | 18 ++---
.../cas/resource/jobqueue/JobQueueFactory.java | 2 +-
.../cas/resource/jobrepo/JobRepository.java | 12 +--
.../resource/jobrepo/JobRepositoryFactory.java | 2 +-
.../oodt/cas/resource/metadata/JobMetadata.java | 4 +-
.../oodt/cas/resource/monitor/Monitor.java | 16 ++--
.../cas/resource/monitor/MonitorFactory.java | 2 +-
.../monitor/ganglia/GangliaMetKeys.java | 58 +++++++-------
.../ganglia/loadcalc/LoadCalculator.java | 2 +-
.../ganglia/loadcalc/LoadCalculatorFactory.java | 2 +-
.../oodt/cas/resource/mux/BackendManager.java | 10 +--
.../cas/resource/mux/BackendRepository.java | 2 +-
.../resource/mux/BackendRepositoryFactory.java | 2 +-
.../cas/resource/noderepo/NodeRepository.java | 2 +-
.../noderepo/NodeRepositoryFactory.java | 2 +-
.../cas/resource/queuerepo/QueueRepository.java | 2 +-
.../queuerepo/QueueRepositoryFactory.java | 2 +-
.../oodt/cas/resource/scheduler/Scheduler.java | 12 +--
.../resource/scheduler/SchedulerFactory.java | 2 +-
.../oodt/cas/resource/structs/JobInput.java | 2 +-
.../oodt/cas/resource/structs/JobStatus.java | 12 +--
.../oodt/cas/resource/util/Configurable.java | 2 +-
.../oodt/cas/resource/util/UlimitMetKeys.java | 22 ++---
.../oodt/cas/resource/util/XmlRpcWriteable.java | 4 +-
.../apache/oodt/security/sso/SingleSignOn.java | 12 +--
.../oodt/security/sso/opensso/SSOMetKeys.java | 46 +++++------
.../cas/product/CASProductHandlerMetKeys.java | 6 +-
.../oodt/cas/product/data/DataDeliveryKeys.java | 8 +-
.../oodt/cas/product/rdf/RDFConfigMetKeys.java | 2 +-
.../cas/product/rdf/RDFConfigReaderMetKeys.java | 44 +++++-----
.../oodt/cas/product/rss/RSSConfigMetKeys.java | 4 +-
.../cas/product/rss/RSSConfigReaderMetKeys.java | 20 ++---
.../cas/workflow/engine/WorkflowEngine.java | 22 ++---
.../workflow/engine/WorkflowEngineFactory.java | 2 +-
.../processor/WorkflowProcessorListener.java | 2 +-
.../engine/runner/EngineRunnerFactory.java | 2 +-
.../instrepo/WorkflowInstanceMetMapKeys.java | 12 +--
.../instrepo/WorkflowInstanceRepository.java | 18 ++---
.../WorkflowInstanceRepositoryFactory.java | 2 +-
.../lifecycle/WorkflowLifecycleMetKeys.java | 12 +--
.../oodt/cas/workflow/metadata/CoreMetKeys.java | 14 ++--
.../workflow/repository/WorkflowRepository.java | 32 ++++----
.../repository/WorkflowRepositoryFactory.java | 2 +-
.../cas/workflow/structs/PrioritySorter.java | 2 +-
.../structs/WorkflowConditionInstance.java | 2 +-
.../cas/workflow/structs/WorkflowStatus.java | 16 ++--
.../workflow/structs/WorkflowTaskInstance.java | 2 +-
.../oodt/cas/workflow/util/Pagination.java | 12 +--
.../xmlps/mapping/MappingReaderMetKeys.java | 36 ++++-----
.../oodt/xmlps/mapping/funcs/MappingFunc.java | 6 +-
.../oodt/xmlps/queryparser/Expression.java | 2 +-
.../oodt/xmlps/queryparser/ParseConstants.java | 38 ++++-----
.../apache/oodt/xmlps/util/XMLQueryKeys.java | 4 +-
167 files changed, 1142 insertions(+), 1134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
index da88b27..29f855a 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/ViewListener.java
@@ -27,6 +27,6 @@ package org.apache.oodt.cas.workflow.gui.perspective.view;
*/
public interface ViewListener {
- public void stateChangeNotify(ViewChange<?> change);
+ void stateChangeNotify(ViewChange<?> change);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
index 556c161..865f2f2 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
@@ -50,22 +50,22 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any error
*/
- public void storeTransactionIdMapping(
- TransactionId<?> catalogServiceTransactionId, TransactionIdFactory catalogServiceTransactionIdFactory,
- CatalogReceipt catalogReceipt, TransactionIdFactory catalogTransactionIdFactory)
+ void storeTransactionIdMapping(
+ TransactionId<?> catalogServiceTransactionId, TransactionIdFactory catalogServiceTransactionIdFactory,
+ CatalogReceipt catalogReceipt, TransactionIdFactory catalogTransactionIdFactory)
throws CatalogRepositoryException;
- public Set<TransactionId<?>> getPageOfCatalogTransactionIds(IndexPager indexPager,
- String catalogId) throws CatalogRepositoryException;
+ Set<TransactionId<?>> getPageOfCatalogTransactionIds(IndexPager indexPager,
+ String catalogId) throws CatalogRepositoryException;
- public void deleteTransactionIdMapping(TransactionId<?> catalogTransactionId,
- String catalogId) throws CatalogRepositoryException;
+ void deleteTransactionIdMapping(TransactionId<?> catalogTransactionId,
+ String catalogId) throws CatalogRepositoryException;
- public void deleteAllMappingsForCatalogServiceTransactionId(
- TransactionId<?> catalogServiceTransactionId)
+ void deleteAllMappingsForCatalogServiceTransactionId(
+ TransactionId<?> catalogServiceTransactionId)
throws CatalogRepositoryException;
- public void deleteAllMappingsForCatalog(String catalogId)
+ void deleteAllMappingsForCatalog(String catalogId)
throws CatalogRepositoryException;
/**
@@ -79,8 +79,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any error
*/
- public boolean hasCatalogServiceTransactionId(
- TransactionId<?> catalogServiceTransactionId)
+ boolean hasCatalogServiceTransactionId(
+ TransactionId<?> catalogServiceTransactionId)
throws CatalogRepositoryException;
/**
@@ -96,8 +96,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any Error
*/
- public TransactionId<?> getCatalogServiceTransactionId(
- TransactionId<?> catalogTransactionId, String catalogId)
+ TransactionId<?> getCatalogServiceTransactionId(
+ TransactionId<?> catalogTransactionId, String catalogId)
throws CatalogRepositoryException;
/**
@@ -113,8 +113,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any Error
*/
- public TransactionId<?> getCatalogTransactionId(
- TransactionId<?> catalogServiceTransactionId, String catalogId)
+ TransactionId<?> getCatalogTransactionId(
+ TransactionId<?> catalogServiceTransactionId, String catalogId)
throws CatalogRepositoryException;
/**
@@ -126,8 +126,8 @@ public interface IngestMapper {
* @throws CatalogRepositoryException
* Any Error
*/
- public Set<String> getCatalogIds(
- TransactionId<?> catalogServiceTransactionId)
+ Set<String> getCatalogIds(
+ TransactionId<?> catalogServiceTransactionId)
throws CatalogRepositoryException;
/**
@@ -137,8 +137,8 @@ public interface IngestMapper {
* @return
* @throws CatalogRepositoryException
*/
- public CatalogReceipt getCatalogReceipt(
- TransactionId<?> catalogServiceTransactionId, String catalogId)
+ CatalogReceipt getCatalogReceipt(
+ TransactionId<?> catalogServiceTransactionId, String catalogId)
throws CatalogRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
index 1127a01..964a0dd 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
@@ -26,6 +26,6 @@ package org.apache.oodt.cas.catalog.mapping;
*/
public interface IngestMapperFactory {
- public IngestMapper createMapper();
+ IngestMapper createMapper();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
index 29f2314..7f19ac8 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
@@ -27,6 +27,6 @@ package org.apache.oodt.cas.catalog.query.filter.time.conv;
*/
public interface VersionConverter {
- public double convertToPriority(String version) throws Exception;
+ double convertToPriority(String version) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
index 09710a8..a2e88e7 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
@@ -11,26 +11,26 @@ interface Node {
/** This method is called after the node has been made the current
node. It indicates that child nodes can now be added to it. */
- public void jjtOpen();
+ void jjtOpen();
/** This method is called after all the child nodes have been
added. */
- public void jjtClose();
+ void jjtClose();
/** This pair of methods are used to inform the node of its
parent. */
- public void jjtSetParent(Node n);
- public Node jjtGetParent();
+ void jjtSetParent(Node n);
+ Node jjtGetParent();
/** This method tells the node to add its argument to the node's
list of children. */
- public void jjtAddChild(Node n, int i);
+ void jjtAddChild(Node n, int i);
/** This method returns a child node. The children are numbered
from zero, left to right. */
- public Node jjtGetChild(int i);
+ Node jjtGetChild(int i);
/** Return the number of children the node has. */
- public int jjtGetNumChildren();
+ int jjtGetNumChildren();
}
/* JavaCC - OriginalChecksum=d803b99b9dbe9f48568711ddba598d1d (do not edit this line) */
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
index cf3628b..4b13120 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
@@ -4,18 +4,18 @@ package org.apache.oodt.cas.catalog.query.parser;
public interface QueryParserTreeConstants
{
- public int JJTPARSEINPUT = 0;
- public int JJTQUERY = 1;
- public int JJTQUERYEXPRESSION = 2;
- public int JJTSTDQUERYEXPRESSION = 3;
- public int JJTCOMPARISONQUERYEXPRESSION = 4;
- public int JJTPRIORITYQUERYEXPRESSION = 5;
- public int JJTCUSTOMQUERYEXPRESSION = 6;
- public int JJTGETVALUES = 7;
- public int JJTGETPROPERTIES = 8;
+ int JJTPARSEINPUT = 0;
+ int JJTQUERY = 1;
+ int JJTQUERYEXPRESSION = 2;
+ int JJTSTDQUERYEXPRESSION = 3;
+ int JJTCOMPARISONQUERYEXPRESSION = 4;
+ int JJTPRIORITYQUERYEXPRESSION = 5;
+ int JJTCUSTOMQUERYEXPRESSION = 6;
+ int JJTGETVALUES = 7;
+ int JJTGETPROPERTIES = 8;
- public String[] jjtNodeName = {
+ String[] jjtNodeName = {
"parseInput",
"Query",
"QueryExpression",
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
index 12b90e0..a05015e 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
@@ -58,7 +58,7 @@ public interface CatalogRepository {
* @throws CatalogRepositoryException
* Any Error
*/
- public void serializeCatalog(Catalog catalog)
+ void serializeCatalog(Catalog catalog)
throws CatalogRepositoryException;
//
// /**
@@ -83,7 +83,7 @@ public interface CatalogRepository {
* @throws CatalogRepositoryException
* Any Error
*/
- public void deleteSerializedCatalog(String catalogUrn)
+ void deleteSerializedCatalog(String catalogUrn)
throws CatalogRepositoryException;
/**
@@ -93,15 +93,15 @@ public interface CatalogRepository {
* @throws CatalogRepositoryException
* Any Error
*/
- public Set<Catalog> deserializeAllCatalogs()
+ Set<Catalog> deserializeAllCatalogs()
throws CatalogRepositoryException;
- public void serializePluginURLs(List<PluginURL> urls)
+ void serializePluginURLs(List<PluginURL> urls)
throws CatalogRepositoryException;
- public List<PluginURL> deserializePluginURLs()
+ List<PluginURL> deserializePluginURLs()
throws CatalogRepositoryException;
- public boolean isModifiable() throws CatalogRepositoryException;
+ boolean isModifiable() throws CatalogRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
index e171154..3bb09ea 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
@@ -29,6 +29,6 @@ import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
*/
public interface CatalogRepositoryFactory {
- public CatalogRepository createRepository() throws CatalogRepositoryException;
+ CatalogRepository createRepository() throws CatalogRepositoryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
index cfd9b3b..1d06251 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
@@ -47,13 +47,13 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface CommunicationChannelClient {
- public void shutdown() throws Exception;
+ void shutdown() throws Exception;
- public boolean isRestrictQueryPermissions() throws Exception;
+ boolean isRestrictQueryPermissions() throws Exception;
// public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws Exception;
- public boolean isRestrictIngestPermissions() throws Exception;
+ boolean isRestrictIngestPermissions() throws Exception;
// public void setHasIngestPermissions(boolean restrictIngestPermissions) throws Exception;
@@ -62,90 +62,92 @@ public interface CommunicationChannelClient {
// public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws Exception;
//
- public void addCatalog(Catalog catalog) throws Exception;
+ void addCatalog(Catalog catalog) throws Exception;
- public void replaceCatalog(Catalog catalog) throws Exception;
+ void replaceCatalog(Catalog catalog) throws Exception;
- public void addCatalog(String catalogId, Index index) throws Exception;
+ void addCatalog(String catalogId, Index index) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission,
+ boolean restrictIngestPermission) throws Exception;
- public void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
+ void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
- public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
+ void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
- public void replaceIndex(String catalogId, Index index) throws Exception;
+ void replaceIndex(String catalogId, Index index) throws Exception;
- public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
+ void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
- public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
+ void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
- public void removeCatalog(String catalogUrn) throws Exception;
+ void removeCatalog(String catalogUrn) throws Exception;
// public void removeCatalog(String catalogUrn, boolean preserveMapping) throws Exception;
- public List<PluginURL> getPluginUrls() throws Exception;
+ List<PluginURL> getPluginUrls() throws Exception;
- public void addPluginUrls(List<PluginURL> pluginUrls) throws Exception;
+ void addPluginUrls(List<PluginURL> pluginUrls) throws Exception;
- public URL getPluginStorageDir() throws Exception;
+ URL getPluginStorageDir() throws Exception;
- public void transferUrl(URL fromUrl, URL toUrl) throws Exception;
+ void transferUrl(URL fromUrl, URL toUrl) throws Exception;
// public Set<Catalog> getCurrentCatalogList() throws Exception;
//
// public Catalog getCatalog(String catalogUrn) throws Exception;
- public Set<String> getCurrentCatalogIds() throws Exception;
+ Set<String> getCurrentCatalogIds() throws Exception;
- public TransactionReceipt ingest(Metadata metadata) throws Exception;
+ TransactionReceipt ingest(Metadata metadata) throws Exception;
- public void delete(Metadata metadata) throws Exception;
+ void delete(Metadata metadata) throws Exception;
- public List<String> getProperty(String key) throws Exception;
+ List<String> getProperty(String key) throws Exception;
- public Properties getCalalogProperties() throws Exception;
+ Properties getCalalogProperties() throws Exception;
- public Properties getCalalogProperties(String catalogUrn) throws Exception;
+ Properties getCalalogProperties(String catalogUrn) throws Exception;
// public Page getFirstPage(QueryExpression queryExpression) throws Exception;
//
// public Page getFirstPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public Page getNextPage(Page page) throws Exception;
+ Page getNextPage(Page page) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public Page getLastPage(QueryExpression queryExpression) throws Exception;
//
// public Page getLastPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public List<TransactionalMetadata> getMetadata(Page page) throws Exception;
+ List<TransactionalMetadata> getMetadata(Page page) throws Exception;
- public QueryPager query(QueryExpression queryExpression) throws Exception;
+ QueryPager query(QueryExpression queryExpression) throws Exception;
- public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws Exception;
- public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
- public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws Exception;
+ List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
- public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws Exception;
+ List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
index 2bc3c58..24d0eb7 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
@@ -26,10 +26,10 @@ package org.apache.oodt.cas.catalog.server.channel;
*/
public interface CommunicationChannelClientFactory {
- public CommunicationChannelClient createCommunicationChannelClient();
+ CommunicationChannelClient createCommunicationChannelClient();
- public void setServerUrl(String url);
+ void setServerUrl(String url);
- public String getServerUrl();
+ String getServerUrl();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
index 825cfc7..681208d 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
@@ -43,21 +43,21 @@ import java.util.Set;
*/
public interface CommunicationChannelServer {
- public void setCatalogService(CatalogService catalogService) throws Exception;
+ void setCatalogService(CatalogService catalogService) throws Exception;
- public void setPort(int port) throws Exception;
+ void setPort(int port) throws Exception;
- public int getPort();
+ int getPort();
- public void startup() throws Exception;
+ void startup() throws Exception;
- public void shutdown() throws Exception;
+ void shutdown() throws Exception;
- public boolean isRestrictQueryPermissions() throws Exception;
+ boolean isRestrictQueryPermissions() throws Exception;
//
// public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws Exception;
//
- public boolean isRestrictIngestPermissions() throws Exception;
+boolean isRestrictIngestPermissions() throws Exception;
//
// public void setHasIngestPermissions(boolean restrictIngestPermissions) throws Exception;
@@ -65,88 +65,90 @@ public interface CommunicationChannelServer {
//
// public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws Exception;
//
- public void addCatalog(Catalog catalog) throws Exception;
+void addCatalog(Catalog catalog) throws Exception;
- public void replaceCatalog(Catalog catalog) throws Exception;
+ void replaceCatalog(Catalog catalog) throws Exception;
- public void addCatalog(String catalogId, Index index) throws Exception;
+ void addCatalog(String catalogId, Index index) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) throws Exception;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission,
+ boolean restrictIngestPermission) throws Exception;
- public void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
+ void addDictionary(String catalogId, Dictionary dictionary) throws Exception;
- public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
+ void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception;
- public void replaceIndex(String catalogId, Index index) throws Exception;
+ void replaceIndex(String catalogId, Index index) throws Exception;
- public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
+ void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception;
- public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
+ void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception;
- public void removeCatalog(String catalogUrn) throws Exception;
+ void removeCatalog(String catalogUrn) throws Exception;
// public void removeCatalog(String catalogUrn, boolean preserveMapping) throws Exception;
- public List<PluginURL> getPluginUrls() throws Exception;
+ List<PluginURL> getPluginUrls() throws Exception;
- public void addPluginUrls(List<PluginURL> pluginURLs) throws Exception;
+ void addPluginUrls(List<PluginURL> pluginURLs) throws Exception;
- public URL getPluginStorageDir() throws Exception;
+ URL getPluginStorageDir() throws Exception;
// public Set<Catalog> getCurrentCatalogList() throws Exception;
//
// public Catalog getCatalog(String catalogUrn) throws Exception;
- public Set<String> getCurrentCatalogIds() throws Exception;
+ Set<String> getCurrentCatalogIds() throws Exception;
- public TransactionReceipt ingest(Metadata metadata) throws Exception;
+ TransactionReceipt ingest(Metadata metadata) throws Exception;
- public void delete(Metadata metadata) throws Exception;
+ void delete(Metadata metadata) throws Exception;
- public List<String> getProperty(String key) throws Exception;
+ List<String> getProperty(String key) throws Exception;
- public Properties getCalalogProperties() throws Exception;
+ Properties getCalalogProperties() throws Exception;
- public Properties getCalalogProperties(String catalogUrn) throws Exception;
+ Properties getCalalogProperties(String catalogUrn) throws Exception;
// public Page getFirstPage(QueryExpression queryExpression) throws Exception;
//
// public Page getFirstPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public Page getNextPage(Page page) throws Exception;
+ Page getNextPage(Page page) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public Page getLastPage(QueryExpression queryExpression) throws Exception;
//
// public Page getLastPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
- public List<TransactionalMetadata> getMetadata(Page page) throws Exception;
+ List<TransactionalMetadata> getMetadata(Page page) throws Exception;
- public QueryPager query(QueryExpression queryExpression) throws Exception;
+ QueryPager query(QueryExpression queryExpression) throws Exception;
- public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
+ QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
// public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws Exception;
- public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception;
// public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
+ List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception;
- public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
+ List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception;
- public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws Exception;
+ List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception;
- public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
+ TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
index 8f74fe9..db6116b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
@@ -29,12 +29,12 @@ import org.apache.oodt.cas.catalog.system.CatalogServiceFactory;
*/
public interface CommunicationChannelServerFactory {
- public CommunicationChannelServer createCommunicationChannelServer();
+ CommunicationChannelServer createCommunicationChannelServer();
- public void setPort(int port);
+ void setPort(int port);
- public int getPort();
+ int getPort();
- public void setCatalogServiceFactory(CatalogServiceFactory catalogServiceFactory);
+ void setCatalogServiceFactory(CatalogServiceFactory catalogServiceFactory);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
index 1bd14ed..28a2d1a 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
@@ -41,67 +41,69 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface RmiCommunicationChannelClientInterface extends Remote {
- public void setCatalogRepository(CatalogRepository catalogRepository);
+ void setCatalogRepository(CatalogRepository catalogRepository);
- public CatalogRepository getCatalogRepository() throws Exception;
+ CatalogRepository getCatalogRepository() throws Exception;
- public IngestMapper getIngestMapper() throws RemoteException;
+ IngestMapper getIngestMapper() throws RemoteException;
- public void setIngestMapper(IngestMapper ingestMapper) throws RemoteException;
+ void setIngestMapper(IngestMapper ingestMapper) throws RemoteException;
- public boolean isRestrictQueryPermissions() throws RemoteException;
+ boolean isRestrictQueryPermissions() throws RemoteException;
- public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws RemoteException;
+ void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws RemoteException;
- public boolean isHasIngestPermissions() throws RemoteException;
+ boolean isHasIngestPermissions() throws RemoteException;
- public void setHasIngestPermissions(boolean restrictIngestPermissions) throws RemoteException;
+ void setHasIngestPermissions(boolean restrictIngestPermissions) throws RemoteException;
- public Class<? extends TransactionId<?>> getTransactionIdClass() throws RemoteException;
+ Class<? extends TransactionId<?>> getTransactionIdClass() throws RemoteException;
- public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws RemoteException;
+ void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws RemoteException;
- public void addCatalog(Catalog catalog) throws RemoteException;
+ void addCatalog(Catalog catalog) throws RemoteException;
- public void addCatalog(Catalog catalog, boolean allowOverride) throws RemoteException;
+ void addCatalog(Catalog catalog, boolean allowOverride) throws RemoteException;
- public void removeCatalog(String catalogUrn) throws RemoteException;
+ void removeCatalog(String catalogUrn) throws RemoteException;
- public void removeCatalog(String catalogUrn, boolean preserveMapping) throws RemoteException;
+ void removeCatalog(String catalogUrn, boolean preserveMapping) throws RemoteException;
- public Set<Catalog> getCurrentCatalogList() throws RemoteException;
+ Set<Catalog> getCurrentCatalogList() throws RemoteException;
- public Catalog getCatalog(String catalogUrn) throws RemoteException;
+ Catalog getCatalog(String catalogUrn) throws RemoteException;
- public Set<String> getCurrentCatalogIds() throws RemoteException;
+ Set<String> getCurrentCatalogIds() throws RemoteException;
- public TransactionId<?> ingest(Metadata metadata) throws RemoteException;
+ TransactionId<?> ingest(Metadata metadata) throws RemoteException;
- public void delete(Metadata metadata) throws RemoteException;
+ void delete(Metadata metadata) throws RemoteException;
- public List<String> getProperty(String key) throws RemoteException;
+ List<String> getProperty(String key) throws RemoteException;
- public Properties getCalalogProperties() throws RemoteException;
+ Properties getCalalogProperties() throws RemoteException;
- public Properties getCalalogProperties(String catalogUrn) throws RemoteException;
+ Properties getCalalogProperties(String catalogUrn) throws RemoteException;
- public QueryPager query(QueryExpression queryExpression) throws RemoteException;
+ QueryPager query(QueryExpression queryExpression) throws RemoteException;
- public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws RemoteException;
+ QueryPager query(QueryExpression queryExpression, boolean sortResults) throws RemoteException;
- public Set<TransactionalMetadata> getNextPage(QueryPager queryPager) throws RemoteException;
+ Set<TransactionalMetadata> getNextPage(QueryPager queryPager) throws RemoteException;
- public Set<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws RemoteException;
+ Set<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws RemoteException;
- public Set<TransactionalMetadata> getAllPages(QueryPager queryPager) throws RemoteException;
+ Set<TransactionalMetadata> getAllPages(QueryPager queryPager) throws RemoteException;
- public Set<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws RemoteException;
+ Set<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws RemoteException;
- public Set<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws RemoteException;
+ Set<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws RemoteException;
- public Set<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws RemoteException;
+ Set<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws RemoteException;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws RemoteException;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws RemoteException;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn, boolean generateNew) throws RemoteException;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn,
+ boolean generateNew) throws RemoteException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
index 4d9d512..e5281fd 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
@@ -41,7 +41,7 @@ public interface Dictionary {
* @return TermBucket representing the given Metadata for this Dictionary or
* null if Metadata is not recognized by this Dictionary
*/
- public TermBucket lookup(Metadata metadata) throws CatalogDictionaryException;
+ TermBucket lookup(Metadata metadata) throws CatalogDictionaryException;
/**
* Generates Metadata for the given TermBucket. A call to lookup(Metadata) and
@@ -52,7 +52,7 @@ public interface Dictionary {
* @return Metadata for the given TermBucket. If the TermBucket is not understood,
* then an empty Metadata object should be returned.
*/
- public Metadata reverseLookup(TermBucket termBucket) throws CatalogDictionaryException;
+ Metadata reverseLookup(TermBucket termBucket) throws CatalogDictionaryException;
/**
*
@@ -60,6 +60,6 @@ public interface Dictionary {
* @return
* @throws CatalogDictionaryException
*/
- public boolean understands(QueryExpression queryExpression) throws CatalogDictionaryException;
+ boolean understands(QueryExpression queryExpression) throws CatalogDictionaryException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
index ed89e41..55e7947 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
@@ -24,6 +24,6 @@ package org.apache.oodt.cas.catalog.struct;
*/
public interface DictionaryFactory {
- public Dictionary createDictionary();
+ Dictionary createDictionary();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
index ed33efc..c6d293e 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
@@ -36,9 +36,9 @@ import org.apache.oodt.cas.catalog.page.IndexPager;
*/
public interface Index {
- public Properties getProperties() throws CatalogIndexException;
+ Properties getProperties() throws CatalogIndexException;
- public String getProperty(String key) throws CatalogIndexException;
+ String getProperty(String key) throws CatalogIndexException;
/**
* Returns a list of TransactionIds associated with the
@@ -47,13 +47,13 @@ public interface Index {
* @return A page of TransactionIds, if page does not exist,
* then returns null.
*/
- public List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException;
+ List<TransactionId<?>> getPage(IndexPager indexPage) throws CatalogIndexException;
/**
*
* @return
*/
- public TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException;
+ TransactionIdFactory getTransactionIdFactory() throws CatalogIndexException;
/**
*
@@ -61,6 +61,6 @@ public interface Index {
* @return
* @throws CatalogIndexException
*/
- public boolean hasTransactionId(TransactionId<?> transactionid) throws CatalogIndexException;
+ boolean hasTransactionId(TransactionId<?> transactionid) throws CatalogIndexException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
index 184eed5..5dd4098 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
@@ -24,6 +24,6 @@ package org.apache.oodt.cas.catalog.struct;
*/
public interface IndexFactory {
- public Index createIndex();
+ Index createIndex();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
index 7704edb..161d004 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
@@ -42,7 +42,7 @@ public interface IngestService {
* @return IngestReceipt Receipt of ingest
* @throws IngestServiceException Any error
*/
- public IngestReceipt ingest(List<TermBucket> termBuckets) throws IngestServiceException;
+ IngestReceipt ingest(List<TermBucket> termBuckets) throws IngestServiceException;
/**
* TermBucket updates to given TransactionId. A new TransactionId can be returned in IngestReceipt
@@ -53,7 +53,7 @@ public interface IngestService {
* @param termBuckets
* @throws IngestServiceException
*/
- public IngestReceipt update(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
+ IngestReceipt update(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
/**
* Deletes all TermBuckets attached to given TransactionId -- there should be no trace of
@@ -61,7 +61,7 @@ public interface IngestService {
* @param transactionId The ID for given transaction which should be erased
* @throws IngestServiceException Any error
*/
- public boolean delete(TransactionId<?> transactionId) throws IngestServiceException;
+ boolean delete(TransactionId<?> transactionId) throws IngestServiceException;
/**
* Deletes only the Terms in the given TermBuckets from the given TransactionId
@@ -69,6 +69,6 @@ public interface IngestService {
* @param termBuckets The reduction set of Terms for each TermBucket
* @throws IngestServiceException Any error
*/
- public boolean reduce(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
+ boolean reduce(TransactionId<?> transactionId, List<TermBucket> termBuckets) throws IngestServiceException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java
index 2fd5cf6..ffef5d5 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java
@@ -42,7 +42,7 @@ public interface QueryService {
* @return Returns a List of TransactionIds that meet the query, otherwise
* an empty List is no TransactionIds are found for the given query
*/
- public List<IngestReceipt> query(QueryExpression queryExpression) throws QueryServiceException;
+ List<IngestReceipt> query(QueryExpression queryExpression) throws QueryServiceException;
/**
* Returns the results of the given query such that: [startIndex, endIndex)
@@ -52,7 +52,7 @@ public interface QueryService {
* @return The results of the given query such that: [startIndex, endIndex)
* @throws QueryServiceException on an error
*/
- public List<IngestReceipt> query(QueryExpression queryExpression, int startIndex, int endIndex) throws QueryServiceException;
+ List<IngestReceipt> query(QueryExpression queryExpression, int startIndex, int endIndex) throws QueryServiceException;
/**
* Returns the number of results found for the given query
@@ -60,7 +60,7 @@ public interface QueryService {
* @return The number of results found for the given query
* @throws QueryServiceException on an error
*/
- public int sizeOf(QueryExpression queryExpression) throws QueryServiceException;
+ int sizeOf(QueryExpression queryExpression) throws QueryServiceException;
/**
* Returns a List of TermBuckets ingested for a given TransactionId
@@ -68,7 +68,7 @@ public interface QueryService {
* @return A List of TermBuckets for the given TransactionId or empty list
* if no record of the give TranactionId exists
*/
- public List<TermBucket> getBuckets(TransactionId<?> transactionId) throws QueryServiceException;
+ List<TermBucket> getBuckets(TransactionId<?> transactionId) throws QueryServiceException;
/**
* Does the same as getBuckets(TransactionId), except is performed over a list
@@ -76,6 +76,6 @@ public interface QueryService {
* @param transactionIds A List of TransactionIds for which TermBuckets are wanted
* @return A Map of TransactionIds to TermBuckets
*/
- public Map<TransactionId<?>, List<TermBucket>> getBuckets(List<TransactionId<?>> transactionIds) throws QueryServiceException;
+ Map<TransactionId<?>, List<TermBucket>> getBuckets(List<TransactionId<?>> transactionIds) throws QueryServiceException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
index 587383d..eb5d42b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
@@ -24,8 +24,8 @@ package org.apache.oodt.cas.catalog.struct;
*/
public interface TransactionIdFactory {
- public TransactionId<?> createNewTransactionId();
+ TransactionId<?> createNewTransactionId();
- public TransactionId<?> createTransactionId(String transactionIdString);
+ TransactionId<?> createTransactionId(String transactionIdString);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
index 05374d4..28d8ebb 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
@@ -47,82 +47,84 @@ import org.apache.oodt.cas.metadata.Metadata;
*/
public interface CatalogService {
- public static final String CATALOG_SERVICE_TRANSACTION_ID_MET_KEY = "urn:CatalogService:TransactionId";
- public static final String CATALOG_IDS_MET_KEY = "urn:CatalogService:CatalogIds";
- public static final String ENABLE_UPDATE_MET_KEY = "urn:CatalogService:EnableUpdate";
- public static final String CATALOG_TRANSACTION_ID_MET_KEY = "urn:Catalog:TransactionId";
- public static final String CATALOG_ID_MET_KEY = "urn:Catalog:Id";
+ String CATALOG_SERVICE_TRANSACTION_ID_MET_KEY = "urn:CatalogService:TransactionId";
+ String CATALOG_IDS_MET_KEY = "urn:CatalogService:CatalogIds";
+ String ENABLE_UPDATE_MET_KEY = "urn:CatalogService:EnableUpdate";
+ String CATALOG_TRANSACTION_ID_MET_KEY = "urn:Catalog:TransactionId";
+ String CATALOG_ID_MET_KEY = "urn:Catalog:Id";
- public void shutdown() throws CatalogServiceException;
+ void shutdown() throws CatalogServiceException;
- public boolean isRestrictQueryPermissions() throws CatalogServiceException;
+ boolean isRestrictQueryPermissions() throws CatalogServiceException;
- public boolean isRestrictIngestPermissions() throws CatalogServiceException;
+ boolean isRestrictIngestPermissions() throws CatalogServiceException;
- public void addCatalog(Catalog catalog) throws CatalogServiceException;
+ void addCatalog(Catalog catalog) throws CatalogServiceException;
- public void replaceCatalog(Catalog catalog) throws CatalogServiceException;
+ void replaceCatalog(Catalog catalog) throws CatalogServiceException;
- public void addCatalog(String catalogId, Index index) throws CatalogServiceException;
+ void addCatalog(String catalogId, Index index) throws CatalogServiceException;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws CatalogServiceException;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws CatalogServiceException;
- public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) throws CatalogServiceException;
+ void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission,
+ boolean restrictIngestPermission) throws CatalogServiceException;
- public void addDictionary(String catalogId, Dictionary dictionary) throws CatalogServiceException;
+ void addDictionary(String catalogId, Dictionary dictionary) throws CatalogServiceException;
- public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws CatalogServiceException;
+ void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws CatalogServiceException;
- public void replaceIndex(String catalogId, Index index) throws CatalogServiceException;
+ void replaceIndex(String catalogId, Index index) throws CatalogServiceException;
- public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws CatalogServiceException;
+ void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws CatalogServiceException;
- public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws CatalogServiceException;
+ void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws CatalogServiceException;
- public void removeCatalog(String catalogId) throws CatalogServiceException;
+ void removeCatalog(String catalogId) throws CatalogServiceException;
- public URL getPluginStorageDir() throws CatalogServiceException;
+ URL getPluginStorageDir() throws CatalogServiceException;
- public List<PluginURL> getPluginUrls() throws CatalogServiceException;
+ List<PluginURL> getPluginUrls() throws CatalogServiceException;
- public void addPluginUrls(List<PluginURL> pluginURLs) throws CatalogServiceException;
+ void addPluginUrls(List<PluginURL> pluginURLs) throws CatalogServiceException;
- public Set<String> getCurrentCatalogIds() throws CatalogServiceException;
+ Set<String> getCurrentCatalogIds() throws CatalogServiceException;
- public TransactionReceipt ingest(Metadata metadata) throws CatalogServiceException;
+ TransactionReceipt ingest(Metadata metadata) throws CatalogServiceException;
- public void delete(Metadata metadata) throws CatalogServiceException;
+ void delete(Metadata metadata) throws CatalogServiceException;
- public List<String> getProperty(String key) throws CatalogServiceException;
+ List<String> getProperty(String key) throws CatalogServiceException;
- public Properties getCalalogProperties() throws CatalogServiceException;
+ Properties getCalalogProperties() throws CatalogServiceException;
- public Properties getCalalogProperties(String catalogUrn) throws CatalogServiceException;
+ Properties getCalalogProperties(String catalogUrn) throws CatalogServiceException;
- public Page getNextPage(Page page) throws CatalogServiceException;
+ Page getNextPage(Page page) throws CatalogServiceException;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws CatalogServiceException;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws CatalogServiceException;
- public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
+ Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
- public List<TransactionalMetadata> getMetadata(Page page) throws CatalogServiceException;
+ List<TransactionalMetadata> getMetadata(Page page) throws CatalogServiceException;
- public QueryPager query(QueryExpression queryExpression) throws CatalogServiceException;
+ QueryPager query(QueryExpression queryExpression) throws CatalogServiceException;
- public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
+ QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws CatalogServiceException;
- public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws CatalogServiceException;
+ List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws CatalogServiceException;
- public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws CatalogServiceException;
+ List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws CatalogServiceException;
- public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws CatalogServiceException;
+ List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws CatalogServiceException;
- public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws CatalogServiceException;
+ List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws CatalogServiceException;
- public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws CatalogServiceException;
+ List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
+ String catalogUrn) throws CatalogServiceException;
- public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws CatalogServiceException;
+ TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws CatalogServiceException;
- public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws CatalogServiceException;
+ TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws CatalogServiceException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
index 7ced6ce..360e098 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
@@ -26,6 +26,6 @@ package org.apache.oodt.cas.catalog.system;
*/
public interface CatalogServiceFactory {
- public CatalogService createCatalogService();
+ CatalogService createCatalogService();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
index a92b4f1..1d12f7f 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStore.java
@@ -30,6 +30,6 @@ import org.apache.oodt.cas.cli.exception.CmdLineActionStoreException;
*/
public interface CmdLineActionStore {
- public Set<CmdLineAction> loadSupportedActions()
+ Set<CmdLineAction> loadSupportedActions()
throws CmdLineActionStoreException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
index 2b90387..d372d65 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/CmdLineActionStoreFactory.java
@@ -23,5 +23,5 @@ package org.apache.oodt.cas.cli.action.store;
*/
public interface CmdLineActionStoreFactory {
- public CmdLineActionStore createStore();
+ CmdLineActionStore createStore();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
index e251b70..950773f 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/action/store/spring/SpringSetContextInjectionType.java
@@ -28,7 +28,7 @@ import org.springframework.context.ApplicationContext;
*/
public interface SpringSetContextInjectionType {
- public void setContext(ApplicationContext appContext);
+ void setContext(ApplicationContext appContext);
- public ApplicationContext getContext();
+ ApplicationContext getContext();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java b/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
index 50c4612..3736951 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/construct/CmdLineConstructor.java
@@ -34,7 +34,7 @@ import org.apache.oodt.cas.cli.util.ParsedArg;
*/
public interface CmdLineConstructor {
- public Set<CmdLineOptionInstance> construct(CmdLineIterable<ParsedArg> parsedArgs,
- Set<CmdLineOption> validOptions) throws CmdLineConstructionException;
+ Set<CmdLineOptionInstance> construct(CmdLineIterable<ParsedArg> parsedArgs,
+ Set<CmdLineOption> validOptions) throws CmdLineConstructionException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
index 8b60fb9..3a0dfda 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/CmdLineOption.java
@@ -29,53 +29,53 @@ import org.apache.oodt.cas.cli.option.require.RequirementRule;
*/
public interface CmdLineOption {
- public void setLongOption(String longOption);
+ void setLongOption(String longOption);
- public String getLongOption();
+ String getLongOption();
- public void setShortOption(String shortOption);
+ void setShortOption(String shortOption);
- public String getShortOption();
+ String getShortOption();
- public void setDescription(String description);
+ void setDescription(String description);
- public String getDescription();
+ String getDescription();
- public void setType(Class<?> type);
+ void setType(Class<?> type);
- public Class<?> getType();
+ Class<?> getType();
- public void setRepeating(boolean repeating);
+ void setRepeating(boolean repeating);
- public boolean isRepeating();
+ boolean isRepeating();
- public void setHasArgs(boolean hasArgs);
+ void setHasArgs(boolean hasArgs);
- public boolean hasArgs();
+ boolean hasArgs();
- public void setArgsDescription(String argDescription);
+ void setArgsDescription(String argDescription);
- public String getArgsDescription();
+ String getArgsDescription();
- public void setStaticArgs(List<String> values);
+ void setStaticArgs(List<String> values);
- public List<String> getStaticArgs();
+ List<String> getStaticArgs();
- public boolean hasStaticArgs();
+ boolean hasStaticArgs();
- public void setRequired(boolean required);
+ void setRequired(boolean required);
- public boolean isRequired();
+ boolean isRequired();
- public void setRequirementRules(List<RequirementRule> requirementRules);
+ void setRequirementRules(List<RequirementRule> requirementRules);
- public List<RequirementRule> getRequirementRules();
+ List<RequirementRule> getRequirementRules();
- public void setIsSubOption(boolean isSubOption);
+ void setIsSubOption(boolean isSubOption);
- public boolean isSubOption();
+ boolean isSubOption();
- public boolean equals(Object obj);
+ boolean equals(Object obj);
- public int hashCode();
+ int hashCode();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
index 79cd149..f7578ab 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/HandleableCmdLineOption.java
@@ -27,9 +27,9 @@ import org.apache.oodt.cas.cli.option.handler.CmdLineOptionHandler;
*/
public interface HandleableCmdLineOption {
- public void setHandler(CmdLineOptionHandler handler);
+ void setHandler(CmdLineOptionHandler handler);
- public CmdLineOptionHandler getHandler();
+ CmdLineOptionHandler getHandler();
- public boolean hasHandler();
+ boolean hasHandler();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
index f18c537..387ad63 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/ValidatableCmdLineOption.java
@@ -30,8 +30,8 @@ import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator;
*/
public interface ValidatableCmdLineOption {
- public void setValidators(List<CmdLineOptionValidator> validators);
+ void setValidators(List<CmdLineOptionValidator> validators);
- public List<CmdLineOptionValidator> getValidators();
+ List<CmdLineOptionValidator> getValidators();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
index 98f4aca..7fd2906 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/handler/CmdLineOptionHandler.java
@@ -35,10 +35,10 @@ public interface CmdLineOptionHandler {
* is also called when help is run so allows registration to take
* place if necessary for help analysis.
*/
- public abstract void initialize(CmdLineOption option);
+ void initialize(CmdLineOption option);
- public abstract void handleOption(CmdLineAction selectedAction,
- CmdLineOptionInstance optionInstance);
+ void handleOption(CmdLineAction selectedAction,
+ CmdLineOptionInstance optionInstance);
/**
* Gets the {@link CmdLineOptionHandler}s help message when associated with
@@ -49,13 +49,13 @@ public interface CmdLineOptionHandler {
* {@link CmdLineOptionHandler} was associated with
* @return The help message for this {@link CmdLineOptionHandler}
*/
- public abstract String getHelp(CmdLineOption option);
+ String getHelp(CmdLineOption option);
/**
* If this handler causes the argument descriptor to be different for
* certain {@link CmdLineAction}s, then should return the arg
* description here.
*/
- public abstract String getArgDescription(CmdLineAction action,
- CmdLineOption option);
+ String getArgDescription(CmdLineAction action,
+ CmdLineOption option);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
index 438c02b..ad5ad4a 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/require/RequirementRule.java
@@ -27,10 +27,10 @@ import org.apache.oodt.cas.cli.action.CmdLineAction;
*/
public interface RequirementRule {
- public enum Relation {
+ enum Relation {
REQUIRED, OPTIONAL, NONE
}
- public Relation getRelation(CmdLineAction action);
+ Relation getRelation(CmdLineAction action);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
index 7df83de..8e5b374 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
@@ -30,7 +30,7 @@ import org.apache.oodt.cas.cli.option.CmdLineOption;
*/
public interface CmdLineOptionStore {
- public Set<CmdLineOption> loadSupportedOptions()
+ Set<CmdLineOption> loadSupportedOptions()
throws CmdLineOptionStoreException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
index 8dec068..39c2bf2 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStoreFactory.java
@@ -23,6 +23,6 @@ package org.apache.oodt.cas.cli.option.store;
*/
public interface CmdLineOptionStoreFactory {
- public CmdLineOptionStore createStore();
+ CmdLineOptionStore createStore();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
index 16ed176..2e4faa6 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java
@@ -26,7 +26,7 @@ import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
*/
public interface CmdLineOptionValidator {
- public class Result {
+ class Result {
public enum Grade {
PASS, FAIL;
}
@@ -52,5 +52,5 @@ public interface CmdLineOptionValidator {
* Throws {@link CmdLineValidationException} if validation fails, otherwise
* method just returns.
*/
- public Result validate(CmdLineOptionInstance optionInst);
+ Result validate(CmdLineOptionInstance optionInst);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
index 9e65191..c8284f1 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
@@ -31,6 +31,6 @@ import org.apache.oodt.cas.cli.util.ParsedArg;
*/
public interface CmdLineParser {
- public List<ParsedArg> parse(String[] args) throws CmdLineParserException;
+ List<ParsedArg> parse(String[] args) throws CmdLineParserException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java b/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
index 5cafd3a..6954ea7 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/presenter/CmdLinePresenter.java
@@ -23,13 +23,13 @@ package org.apache.oodt.cas.cli.presenter;
*/
public interface CmdLinePresenter {
- public void presentOptionHelp(String optionHelpMessage);
+ void presentOptionHelp(String optionHelpMessage);
- public void presentActionHelp(String actionHelpMessage);
+ void presentActionHelp(String actionHelpMessage);
- public void presentActionsHelp(String actionsHelpMessage);
+ void presentActionsHelp(String actionsHelpMessage);
- public void presentErrorMessage(String errorMessage);
+ void presentErrorMessage(String errorMessage);
- public void presentActionMessage(String actionMessage);
+ void presentActionMessage(String actionMessage);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java b/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
index 709beef..f7a9cc6 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/printer/CmdLinePrinter.java
@@ -43,7 +43,7 @@ public interface CmdLinePrinter {
* Supported {@link CmdLineOption}s
* @return Help message for specified action
*/
- public String printActionHelp(CmdLineAction action, Set<CmdLineOption> options);
+ String printActionHelp(CmdLineAction action, Set<CmdLineOption> options);
/**
* Generates help messages given {@link CmdLineAction}s.
@@ -52,7 +52,7 @@ public interface CmdLinePrinter {
* {@link CmdLineAction}s to print help for
* @return Help message for given {@link CmdLineAction}s
*/
- public String printActionsHelp(Set<CmdLineAction> actions);
+ String printActionsHelp(Set<CmdLineAction> actions);
/**
* Generates help message for given {@link CmdLineOption}s.
@@ -61,7 +61,7 @@ public interface CmdLinePrinter {
* {@link CmdLineOption}s for which help message will be generated
* @return Help message for given {@link CmdLineOption}s
*/
- public String printOptionsHelp(Set<CmdLineOption> options);
+ String printOptionsHelp(Set<CmdLineOption> options);
/**
* Generate validation error message for results of failed validations.
@@ -70,7 +70,7 @@ public interface CmdLinePrinter {
* {@link List} of FAILed validations
* @return Generated validation error message
*/
- public String printOptionValidationErrors(List<Result> results);
+ String printOptionValidationErrors(List<Result> results);
/**
* Generates missing required options error message from given
@@ -81,8 +81,8 @@ public interface CmdLinePrinter {
* not set.
* @return Generated missing required options error message.
*/
- public String printRequiredOptionsMissingError(
- Set<CmdLineOption> missingOptions);
+ String printRequiredOptionsMissingError(
+ Set<CmdLineOption> missingOptions);
/**
* Generates {@link CmdLineAction} message from list of messages.
@@ -90,5 +90,5 @@ public interface CmdLinePrinter {
* @param messages The messages from a {@link CmdLineAction}
* @return printed message from list of messages.
*/
- public String printActionMessages(List<String> messages);
+ String printActionMessages(List<String> messages);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/d7bbba08/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java b/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
index 1a0b146..3c38b0a 100755
--- a/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
+++ b/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
@@ -35,13 +35,13 @@ public interface SpringSetIdInjectionType {
* @return Unique String id
*/
@Required
- public String getId();
+ String getId();
/**
* Set a unique id that represents this objects instance
* @param id Unique String id
*/
@Required
- public void setId(String id);
+ void setId(String id);
}