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:49 UTC
[3/5] oodt git commit: OODT-896 remove interface modifier
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";
}