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/09 17:40:27 UTC
[1/7] oodt git commit: OODT-886 fix unused imports
Repository: oodt
Updated Branches:
refs/heads/master 5dd6c3197 -> afb8fdc4f
OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/1f04b372
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/1f04b372
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/1f04b372
Branch: refs/heads/master
Commit: 1f04b372d05d78a61f4559cead2b58ab5d4b54f1
Parents: 5dd6c31
Author: Tom Barber <to...@analytical-labs.com>
Authored: Thu Oct 8 23:39:18 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Thu Oct 8 23:39:18 2015 +0100
----------------------------------------------------------------------
.../action/GetSupportedCatalogIdsCliAction.java | 2 +-
.../mapping/DataSourceIngestMapperFactory.java | 3 --
.../cas/catalog/query/parser/QueryParser.java | 18 ++++------
.../query/parser/QueryParserTokenManager.java | 11 ------
.../channel/CommunicationChannelServer.java | 20 +++++------
.../XmlRpcCommunicationChannelServer.java | 15 ++++----
.../oodt/cas/catalog/struct/QueryService.java | 1 -
.../dictionary/WorkflowManagerDictionary.java | 14 +++-----
.../apache/oodt/cas/catalog/system/Catalog.java | 28 +++++----------
.../system/impl/CatalogServiceLocal.java | 38 +++++++-------------
10 files changed, 49 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
index 450e657..a7ca08e 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
@@ -17,7 +17,7 @@
package org.apache.oodt.cas.catalog.cli.action;
//OODT imports
-import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
+//import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java
index 056e035..8203c93 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java
@@ -19,9 +19,6 @@ package org.apache.oodt.cas.catalog.mapping;
//Spring imports
import org.springframework.beans.factory.annotation.Required;
-//OODT imports
-import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
-
/**
* @author bfoster
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
index e9c0818..44c19be 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
@@ -1,17 +1,13 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. QueryParser.java */
package org.apache.oodt.cas.catalog.query.parser;
- import java.io.ByteArrayInputStream;
- import java.util.Arrays;
- import java.util.HashSet;
- import java.util.Vector;
- import java.util.Properties;
- import org.apache.oodt.cas.catalog.query.QueryExpression;
- import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
- import org.apache.oodt.cas.catalog.query.StdQueryExpression;
- import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
- import org.apache.oodt.cas.catalog.query.CustomQueryExpression;
- import org.apache.oodt.cas.catalog.term.Term;
+ import org.apache.oodt.cas.catalog.query.*;
+import org.apache.oodt.cas.catalog.term.Term;
+
+import java.io.ByteArrayInputStream;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Vector;
public class QueryParser/*@bgen(jjtree)*/implements QueryParserTreeConstants, QueryParserConstants {/*@bgen(jjtree)*/
protected JJTQueryParserState jjtree = new JJTQueryParserState();
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
index 52abf3c..1babab2 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
@@ -1,16 +1,5 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. QueryParserTokenManager.java */
package org.apache.oodt.cas.catalog.query.parser;
-import java.io.ByteArrayInputStream;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Vector;
-import java.util.Properties;
-import org.apache.oodt.cas.catalog.query.QueryExpression;
-import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
-import org.apache.oodt.cas.catalog.query.StdQueryExpression;
-import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
-import org.apache.oodt.cas.catalog.query.CustomQueryExpression;
-import org.apache.oodt.cas.catalog.term.Term;
public class QueryParserTokenManager implements QueryParserConstants
{
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/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 a486a58..671a408 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
@@ -17,19 +17,8 @@
package org.apache.oodt.cas.catalog.server.channel;
//JDK imports
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-//OODT imports
-import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
-import org.apache.oodt.cas.catalog.page.CatalogReceipt;
-import org.apache.oodt.cas.catalog.page.Page;
-import org.apache.oodt.cas.catalog.page.PageInfo;
-import org.apache.oodt.cas.catalog.page.QueryPager;
-import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.page.*;
import org.apache.oodt.cas.catalog.query.QueryExpression;
import org.apache.oodt.cas.catalog.struct.Dictionary;
import org.apache.oodt.cas.catalog.struct.Index;
@@ -39,6 +28,13 @@ import org.apache.oodt.cas.catalog.system.CatalogService;
import org.apache.oodt.cas.catalog.util.PluginURL;
import org.apache.oodt.cas.metadata.Metadata;
+import java.net.URL;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+//OODT imports
+
/**
* @author bfoster
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
index 07b2ca2..2e901ec 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
@@ -17,13 +17,6 @@
package org.apache.oodt.cas.catalog.server.channel.xmlrpc;
//JDK imports
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-import java.util.Set;
-
-//OODT imports
-import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
import org.apache.oodt.cas.catalog.page.CatalogReceipt;
import org.apache.oodt.cas.catalog.page.Page;
import org.apache.oodt.cas.catalog.page.PageInfo;
@@ -35,9 +28,15 @@ import org.apache.oodt.cas.catalog.struct.Index;
import org.apache.oodt.cas.catalog.struct.TransactionId;
import org.apache.oodt.cas.catalog.system.Catalog;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.xmlrpc.WebServer;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.List;
+import java.util.Set;
+
+//OODT imports
//APACHE imports
-import org.apache.xmlrpc.WebServer;
/**
* @author bfoster
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/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 31b729c..2fd5cf6 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
@@ -23,7 +23,6 @@ import java.util.Map;
//OODT imports
import org.apache.oodt.cas.catalog.exception.QueryServiceException;
import org.apache.oodt.cas.catalog.page.IngestReceipt;
-import org.apache.oodt.cas.catalog.page.TransactionReceipt;
import org.apache.oodt.cas.catalog.query.QueryExpression;
import org.apache.oodt.cas.catalog.term.TermBucket;
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
index 48649b3..1c59709 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
@@ -16,22 +16,18 @@
*/
package org.apache.oodt.cas.catalog.struct.impl.dictionary;
-//JDK imports
-import java.util.Set;
-
//OODT imports
import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
-import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
-import org.apache.oodt.cas.catalog.query.NotQueryExpression;
-import org.apache.oodt.cas.catalog.query.QueryExpression;
-import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
-import org.apache.oodt.cas.catalog.query.StdQueryExpression;
-import org.apache.oodt.cas.catalog.query.TermQueryExpression;
+import org.apache.oodt.cas.catalog.query.*;
import org.apache.oodt.cas.catalog.struct.Dictionary;
import org.apache.oodt.cas.catalog.term.Term;
import org.apache.oodt.cas.catalog.term.TermBucket;
import org.apache.oodt.cas.metadata.Metadata;
+//JDK imports
+import java.util.Set;
+
+
/**
*
* @author bfoster
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
index 4f5fc93..2708e01 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
@@ -16,36 +16,27 @@
*/
package org.apache.oodt.cas.catalog.system;
-//JDK imports
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
//OODT imports
import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
import org.apache.oodt.cas.catalog.exception.CatalogException;
import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
-import org.apache.oodt.cas.catalog.exception.IngestServiceException;
import org.apache.oodt.cas.catalog.page.CatalogReceipt;
import org.apache.oodt.cas.catalog.page.IndexPager;
import org.apache.oodt.cas.catalog.page.IngestReceipt;
import org.apache.oodt.cas.catalog.query.QueryExpression;
import org.apache.oodt.cas.catalog.struct.Dictionary;
-import org.apache.oodt.cas.catalog.struct.Index;
-import org.apache.oodt.cas.catalog.struct.IngestService;
-import org.apache.oodt.cas.catalog.struct.QueryService;
-import org.apache.oodt.cas.catalog.struct.TransactionId;
-import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.struct.*;
import org.apache.oodt.cas.catalog.term.Term;
import org.apache.oodt.cas.catalog.term.TermBucket;
import org.apache.oodt.cas.metadata.Metadata;
+//JDK imports
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
/**
* @author bfoster
* @version $Revision$
@@ -146,12 +137,11 @@ public class Catalog {
/**
*
- * @param transactionId
* @param metadata
* @return TransactionId param if used by underlying catalog, otherwise
* the TransactionId generated and used by underlying catalog. if no
* TermBuckets where created from the Metadata then null is returned
- * @throws IngestServiceException
+ * @throws CatalogException
*/
public CatalogReceipt ingest(Metadata metadata) throws CatalogException {
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/1f04b372/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
index dddb9b9..a880b09 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
@@ -16,38 +16,13 @@
*/
package org.apache.oodt.cas.catalog.system.impl;
-//JDK imports
-import java.io.File;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Vector;
-import java.util.Map.Entry;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
//OODT imports
import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
import org.apache.oodt.cas.catalog.exception.CatalogException;
-import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
import org.apache.oodt.cas.catalog.mapping.IngestMapper;
import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
-import org.apache.oodt.cas.catalog.page.CatalogReceipt;
-import org.apache.oodt.cas.catalog.page.Page;
-import org.apache.oodt.cas.catalog.page.PageInfo;
-import org.apache.oodt.cas.catalog.page.ProcessedPageInfo;
-import org.apache.oodt.cas.catalog.page.QueryPager;
-import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.page.*;
import org.apache.oodt.cas.catalog.query.QueryExpression;
import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
import org.apache.oodt.cas.catalog.query.WrapperQueryExpression;
@@ -62,6 +37,17 @@ import org.apache.oodt.cas.catalog.util.PluginURL;
import org.apache.oodt.cas.catalog.util.QueryUtils;
import org.apache.oodt.cas.metadata.Metadata;
+//JDK imports
+import java.io.File;
+import java.net.URL;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
/**
* @author bfoster
* @version $Revision$
[5/7] oodt git commit: OODT-886 fix unused imports
Posted by ma...@apache.org.
OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/4d8da8c0
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/4d8da8c0
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/4d8da8c0
Branch: refs/heads/master
Commit: 4d8da8c09721b99dbd35e5f8e0c611ddf1fa21a8
Parents: 08fad26
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 9 16:18:48 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 9 16:18:48 2015 +0100
----------------------------------------------------------------------
.../engine/processor/WorkflowProcessor.java | 21 +++++++-------
.../processor/WorkflowProcessorQueue.java | 30 +++++++-------------
.../AsynchronousLocalEngineRunnerFactory.java | 4 ---
3 files changed, 22 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/4d8da8c0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java
index 691bcb1..3c4b086 100755
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java
@@ -16,18 +16,19 @@
*/
package org.apache.oodt.cas.workflow.engine.processor;
-//JDK imports
-import java.util.List;
-import java.util.Vector;
-import java.util.logging.Logger;
//OODT imports
import org.apache.oodt.cas.workflow.engine.ChangeType;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
-import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleStage;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+//JDK imports
+import java.util.List;
+import java.util.Vector;
+import java.util.logging.Logger;
+
+
/**
*
* The new Apache OODT workflow style of processor. These processors are
@@ -343,14 +344,14 @@ public abstract class WorkflowProcessor implements WorkflowProcessorListener,
}
/**
- * Evaluates whether or not this processor's {@link WorkflowLifecycleStage}
+ * Evaluates whether or not this processor's {@link org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleStage}
* is in any of the provided category names.
*
* @param categories The names of categories to check this processor's
- * {@link WorkflowLifecycleStage} against.
+ * {@link org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleStage} against.
*
* @return True, if any of the category names provided is the name of
- * this processor's internal {@link WorkflowLifecycleStage}, False otherwise.
+ * this processor's internal {@link org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleStage}, False otherwise.
*/
public boolean isAnyCategory(String... categories) {
for (String category : categories) {
@@ -433,10 +434,10 @@ public abstract class WorkflowProcessor implements WorkflowProcessorListener,
/**
* This is the core method of the WorkflowProcessor class in the new Wengine
* style workflows. Instead of requiring that a processor actually walk
- * through the underlying {@link Workflow}, these style WorkflowProcessors
+ * through the underlying {@link org.apache.oodt.cas.workflow.structs.Workflow}, these style WorkflowProcessors
* actually require their implementing sub-classes to return the current set
* of Runnable sub-processors (which could be tasks, conditions, even
- * {@link Workflow}s themselves.
+ * {@link org.apache.oodt.cas.workflow.structs.Workflow}s themselves.
*
* The Parallel sub-class returns a list of task or condition processors that
* are able to run at a given time. The Sequential sub-class returns only a
http://git-wip-us.apache.org/repos/asf/oodt/blob/4d8da8c0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
index 95964fe..a0fceaf 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
@@ -18,37 +18,29 @@
package org.apache.oodt.cas.workflow.engine.processor;
//JDK imports
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-//OODT imports
-import org.apache.oodt.cas.workflow.engine.TaskQuerier;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
import org.apache.oodt.cas.workflow.repository.WorkflowRepository;
-import org.apache.oodt.cas.workflow.structs.ConditionTaskInstance;
-import org.apache.oodt.cas.workflow.structs.Graph;
-import org.apache.oodt.cas.workflow.structs.ParentChildWorkflow;
-import org.apache.oodt.cas.workflow.structs.Workflow;
-import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
-import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
-import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
-import org.apache.oodt.cas.workflow.structs.WorkflowTask;
-import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.*;
import org.apache.oodt.cas.workflow.structs.exceptions.EngineException;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+//OODT imports
+
/**
*
* The queue of available {@link WorkflowTask}s, that will be fed into the
- * {@link TaskQuerier}.
+ * {@link org.apache.oodt.cas.workflow.engine.TaskQuerier}.
*
* @author mattmann
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/4d8da8c0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
index e8f0d4f..54b6919 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
@@ -16,10 +16,6 @@
*/
package org.apache.oodt.cas.workflow.engine.runner;
-//OODT imports
-import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
-
/**
* A {@link EngineRunnerFactory} which creates
* {@link AsynchronousLocalEngineRunner}s.
[2/7] oodt git commit: OODT-886 fix unused imports
Posted by ma...@apache.org.
OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/7c968327
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/7c968327
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/7c968327
Branch: refs/heads/master
Commit: 7c968327bd02d2a44673f45315817742778cc6ad
Parents: 1f04b37
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 9 15:58:24 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 9 15:58:24 2015 +0100
----------------------------------------------------------------------
.../oodt/cas/filemgr/browser/model/CasDB.java | 5 --
.../cas/filemgr/browser/model/QueryBuilder.java | 1 -
.../cas/filemgr/browser/view/MainWindow.java | 23 ++------
.../cas/filemgr/browser/view/menus/MenuBar.java | 6 +-
.../filemgr/browser/view/panels/BottomPane.java | 1 -
.../filemgr/browser/view/panels/HeaderCell.java | 10 +---
.../filemgr/browser/view/panels/QueryField.java | 18 +-----
.../filemgr/browser/view/panels/QueryPane.java | 11 ++--
.../filemgr/browser/view/panels/TablePane.java | 27 ++-------
.../browser/view/prompts/ConnectPrompt.java | 16 +-----
.../oodt/cas/workflow/gui/WorkflowGUI.java | 38 ++++++-------
.../action/GetSupportedCatalogIdsCliAction.java | 5 +-
.../channel/CommunicationChannelServer.java | 2 -
.../XmlRpcCommunicationChannelServer.java | 2 -
.../org/apache/oodt/cas/cli/CmdLineArgs.java | 26 +++------
.../commons/util/EnterpriseEntityResolver.java | 28 +++-------
.../cas/crawl/AutoDetectProductCrawler.java | 24 +++-----
.../apache/oodt/cas/crawl/ProductCrawler.java | 7 +--
.../oodt/cas/crawl/StdProductCrawler.java | 1 -
.../crawl/typedetection/MetExtractorSpec.java | 13 ++---
.../MimeExtractorConfigReader.java | 1 -
.../cas/curation/service/CurationService.java | 12 ++--
.../curation/service/CurationServiceConfig.java | 6 +-
.../cas/curation/structs/IngestionTask.java | 5 +-
.../catalog/MappedDataSourceCatalogFactory.java | 12 ++--
.../cas/filemgr/catalog/solr/SolrClient.java | 28 +++++-----
.../action/GetProductTypeByNameCliAction.java | 3 +-
.../filemgr/cli/action/HasProductCliAction.java | 3 +-
.../cas/filemgr/ingest/CmdLineIngester.java | 6 +-
.../cas/filemgr/metadata/ProductMetKeys.java | 6 +-
.../filemgr/repository/RepositoryManager.java | 3 +-
.../oodt/cas/filemgr/structs/Element.java | 2 -
.../oodt/cas/filemgr/structs/Product.java | 15 +++--
.../oodt/cas/filemgr/structs/Reference.java | 11 ++--
.../oodt/cas/filemgr/tools/CASAnalyzer.java | 15 ++---
.../oodt/cas/filemgr/util/Pagination.java | 5 +-
.../validation/ScienceDataValidationLayer.java | 16 +++---
.../cas/protocol/ftp/CogJGlobusFtpProtocol.java | 20 +++----
.../retrievalsystem/RetrievalSetup.java | 29 +++-------
.../cli/action/GetExecReportCliAction.java | 3 -
.../cli/action/GetNodeReportCliAction.java | 3 -
.../ganglia/GangliaResourceMonitorFactory.java | 13 ++---
.../browser/metadata/MetadataBrowser.java | 1 -
.../instance/WorkflowInstancesViewer.java | 9 +--
.../oodt/cas/product/rss/RSSProductServlet.java | 58 ++++++++++----------
45 files changed, 191 insertions(+), 358 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
index dcd5346..c38b5f7 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
@@ -27,14 +27,9 @@ import org.apache.oodt.cas.metadata.Metadata;
import java.net.URL;
import java.util.Collections;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.lucene.analysis.standard.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.Query;
-
public class CasDB {
URL filemgrUrl;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
index f22df71..a1e62c7 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/QueryBuilder.java
@@ -17,7 +17,6 @@
package org.apache.oodt.cas.filemgr.browser.model;
-import org.apache.lucene.analysis.standard.ParseException;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.BooleanClause;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/MainWindow.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/MainWindow.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/MainWindow.java
index 2034277..a30448e 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/MainWindow.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/MainWindow.java
@@ -17,29 +17,16 @@
package org.apache.oodt.cas.filemgr.browser.view;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JScrollPane;
-
-import org.apache.oodt.cas.filemgr.browser.controller.TableListener;
import org.apache.oodt.cas.filemgr.browser.controller.WindowListener;
-import org.apache.oodt.cas.filemgr.browser.model.CasDB;
+import org.apache.oodt.cas.filemgr.browser.view.menus.MenuBar;
import org.apache.oodt.cas.filemgr.browser.view.panels.BottomPane;
import org.apache.oodt.cas.filemgr.browser.view.panels.HeaderRow;
import org.apache.oodt.cas.filemgr.browser.view.panels.MiddlePane;
import org.apache.oodt.cas.filemgr.browser.view.panels.QueryPane;
-import org.apache.oodt.cas.filemgr.browser.view.prompts.ConnectPrompt;
-import org.apache.oodt.cas.filemgr.browser.view.prompts.SortPrompt;
-import org.apache.oodt.cas.filemgr.browser.view.menus.MenuBar;
+
+import java.awt.*;
+
+import javax.swing.*;
public class MainWindow extends JFrame {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/MenuBar.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/MenuBar.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/MenuBar.java
index 2351ec1..897d331 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/MenuBar.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/MenuBar.java
@@ -17,14 +17,10 @@
package org.apache.oodt.cas.filemgr.browser.view.menus;
-import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.KeyStroke;
+import javax.swing.*;
public class MenuBar extends JMenuBar {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/BottomPane.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/BottomPane.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/BottomPane.java
index 414fa02..85f1419 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/BottomPane.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/BottomPane.java
@@ -18,7 +18,6 @@
package org.apache.oodt.cas.filemgr.browser.view.panels;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.Font;
import javax.swing.BoxLayout;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/HeaderCell.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/HeaderCell.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/HeaderCell.java
index 6ac5464..50c8453 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/HeaderCell.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/HeaderCell.java
@@ -17,15 +17,11 @@
package org.apache.oodt.cas.filemgr.browser.view.panels;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.event.MouseListener;
-
-import javax.swing.border.LineBorder;
-
import org.apache.oodt.cas.filemgr.browser.view.GuiParams;
+import java.awt.*;
+import java.awt.event.MouseListener;
+
public class HeaderCell extends Cell {
private int colNum;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryField.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryField.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryField.java
index 7f1b4ac..a707ec7 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryField.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryField.java
@@ -17,23 +17,11 @@
package org.apache.oodt.cas.filemgr.browser.view.panels;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
+
+import javax.swing.*;
public class QueryField extends JPanel implements ActionListener {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryPane.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryPane.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryPane.java
index 7211ac7..eb8821a 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryPane.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/QueryPane.java
@@ -17,19 +17,16 @@
package org.apache.oodt.cas.filemgr.browser.view.panels;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
+import org.apache.oodt.cas.filemgr.browser.view.GuiParams;
+
+import java.awt.*;
import java.awt.event.ActionListener;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
+import javax.swing.*;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
import javax.swing.border.LineBorder;
-import org.apache.oodt.cas.filemgr.browser.view.GuiParams;
-
public class QueryPane extends JPanel {
private QueryField field;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
index fcc8f5c..9984999 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java
@@ -18,32 +18,13 @@
package org.apache.oodt.cas.filemgr.browser.view.panels;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
+import org.apache.oodt.cas.filemgr.browser.controller.TableListener;
+
+import java.awt.*;
import java.util.Vector;
-import javax.swing.BoxLayout;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-import javax.swing.border.CompoundBorder;
+import javax.swing.*;
import javax.swing.border.LineBorder;
-import javax.swing.filechooser.FileFilter;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import org.apache.oodt.cas.filemgr.browser.controller.TableListener;
-import org.apache.oodt.cas.filemgr.browser.view.menus.RightClickMenu;
public class TablePane extends JPanel{
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/prompts/ConnectPrompt.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/prompts/ConnectPrompt.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/prompts/ConnectPrompt.java
index cd08d4e..e95c50a 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/prompts/ConnectPrompt.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/prompts/ConnectPrompt.java
@@ -17,22 +17,12 @@
package org.apache.oodt.cas.filemgr.browser.view.prompts;
-import java.awt.Color;
-import java.awt.Dimension;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.border.CompoundBorder;
+
+import javax.swing.*;
import javax.swing.border.EmptyBorder;
-import javax.swing.border.LineBorder;
public class ConnectPrompt extends JFrame implements ActionListener {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java
index 954eabe..454b5fc 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java
@@ -17,26 +17,8 @@
package org.apache.oodt.cas.workflow.gui;
-//JDK imports
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JMenuBar;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowFocusListener;
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Vector;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
+//Commons import
+import org.apache.commons.lang.StringUtils;
//OODT imports
import org.apache.oodt.cas.workflow.gui.menu.EditMenu;
@@ -52,8 +34,20 @@ import org.apache.oodt.cas.workflow.gui.toolbox.Tool;
import org.apache.oodt.cas.workflow.gui.toolbox.ToolBox;
import org.apache.oodt.cas.workflow.gui.util.IconLoader;
-//Commons import
-import org.apache.commons.lang.StringUtils;
+//JDK imports
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Vector;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.swing.*;
/**
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
index a7ca08e..f8adad2 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/cli/action/GetSupportedCatalogIdsCliAction.java
@@ -17,12 +17,11 @@
package org.apache.oodt.cas.catalog.cli.action;
//OODT imports
-//import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
/**
- * A {@link CmdLineAction} which get a list of supported {@link Catalog}
- * IDs for given {@link CatalogServiceClient}.
+ * A {@link org.apache.oodt.cas.cli.action.CmdLineAction} which get a list of supported {@link org.apache.oodt.cas.catalog.system.Catalog;}
+ * IDs for given {@link org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient}.
*
* @author bfoster (Brian Foster)
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/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 671a408..825cfc7 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
@@ -33,8 +33,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-//OODT imports
-
/**
* @author bfoster
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
index 2e901ec..59187f3 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
@@ -35,8 +35,6 @@ import java.io.FileOutputStream;
import java.util.List;
import java.util.Set;
-//OODT imports
-//APACHE imports
/**
* @author bfoster
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/cli/src/main/java/org/apache/oodt/cas/cli/CmdLineArgs.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/CmdLineArgs.java b/cli/src/main/java/org/apache/oodt/cas/cli/CmdLineArgs.java
index 999424f..d6066a3 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/CmdLineArgs.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/CmdLineArgs.java
@@ -16,25 +16,15 @@
*/
package org.apache.oodt.cas.cli;
-//OODT static imports
-import static org.apache.oodt.cas.cli.util.CmdLineUtils.findAction;
-import static org.apache.oodt.cas.cli.util.CmdLineUtils.findSpecifiedHelpOption;
-import static org.apache.oodt.cas.cli.util.CmdLineUtils.findSpecifiedPrintSupportedActionsOption;
-import static org.apache.oodt.cas.cli.util.CmdLineUtils.findSpecifiedActionOption;
-
-//JDK imports
-import java.util.Set;
-
-//Apache imports
import org.apache.commons.lang.Validate;
-
-//OODT imports
import org.apache.oodt.cas.cli.action.CmdLineAction;
-import org.apache.oodt.cas.cli.option.ActionCmdLineOption;
import org.apache.oodt.cas.cli.option.CmdLineOption;
import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
-import org.apache.oodt.cas.cli.option.HelpCmdLineOption;
-import org.apache.oodt.cas.cli.option.PrintSupportedActionsCmdLineOption;
+
+import java.util.Set;
+
+//OODT static imports
+import static org.apache.oodt.cas.cli.util.CmdLineUtils.*;
/**
* A convenience class for {@link CmdLineUtility} for helping use already parsed
@@ -75,7 +65,7 @@ public class CmdLineArgs {
/**
* @return The {@link CmdLineOptionInstance} which is the specified
- * {@link HelpCmdLineOption}, or null if it was not specified
+ * {@link org.apache.oodt.cas.cli.option.HelpCmdLineOption}, or null if it was not specified
*/
public CmdLineOptionInstance getHelpOptionInst() {
return helpOptionInst;
@@ -83,7 +73,7 @@ public class CmdLineArgs {
/**
* @return The {@link CmdLineOptionInstance} which is the specified
- * {@link ActionCmdLineOption}, or null if it was not specified
+ * {@link org.apache.oodt.cas.cli.option.ActionCmdLineOption}, or null if it was not specified
*/
public CmdLineOptionInstance getActionOptionInst() {
return actionOptionInst;
@@ -91,7 +81,7 @@ public class CmdLineArgs {
/**
* @return The {@link CmdLineOptionInstance} which is the specified
- * {@link PrintSupportedActionsCmdLineOption}, or null if it was not
+ * {@link org.apache.oodt.cas.cli.option.PrintSupportedActionsCmdLineOption}, or null if it was not
* specified
*/
public CmdLineOptionInstance getPrintSupportedActionsOptionInst() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
index af01b8a..8bbd907 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java
@@ -15,31 +15,19 @@
package org.apache.oodt.commons.util;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
-import java.io.InputStreamReader;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
/** XML entity resolver for enterprise applications.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
index dc037bd..d8c0a20 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
@@ -21,21 +21,15 @@ import org.apache.oodt.cas.crawl.typedetection.MetExtractorSpec;
import org.apache.oodt.cas.crawl.typedetection.MimeExtractorConfigReader;
import org.apache.oodt.cas.crawl.typedetection.MimeExtractorRepo;
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
-import org.apache.oodt.cas.metadata.MetExtractor;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.filenaming.NamingConvention;
import org.apache.oodt.cas.metadata.preconditions.PreCondEvalUtils;
+import org.springframework.beans.factory.annotation.Required;
-//JDK imports
import java.io.File;
import java.util.List;
import java.util.logging.Level;
-//APACHE imports
-import org.apache.tika.mime.MimeType; //for javadoc
-
-//Spring imports
-import org.springframework.beans.factory.annotation.Required;
/**
* <p>
@@ -47,11 +41,11 @@ import org.springframework.beans.factory.annotation.Required;
* actions that the crawler should take in response to its 3 lifecycle phases:
* preIngest, postIngestSuccess, and postIngestFail. </li>
* <li><code>met-extr-preconditions.xml</code> - This file defines
- * preconditions that {@link MetExtractor}s must pass before being called by
+ * preconditions that {@link org.apache.oodt.cas.metadata.MetExtractor}s must pass before being called by
* the AutoDetectCrawler. </li>
- * <li><code>mime-extractor-map.xml</code> - This file maps {@link MimeType}
- * names to names of {@link MetExtractor}s to call for a particular
- * {@link Product} {@link File} as it is encountered during a crawl (e.g.,
+ * <li><code>mime-extractor-map.xml</code> - This file maps {@link org.apache.tika.mime.MimeType}
+ * names to names of {@link org.apache.oodt.cas.metadata.MetExtractor}s to call for a particular
+ * {@link org.apache.oodt.cas.filemgr.structs.Product} {@link File} as it is encountered during a crawl (e.g.,
* assuming that {@link Metadata} needs to be generated, as oppossed to being
* available apriori). See
* <code>./src/resources/examples/mime-extractor-map.xml</code> for an example
@@ -59,7 +53,7 @@ import org.springframework.beans.factory.annotation.Required;
* <li><code>mimetypes.xml</code> - An <a
* href="http://tika.apache.org/">Apache Tika</a> style mimetypes
* file, augmented with the ability to have arbitrary regular expressions that
- * define a particular {@link Product} {@link MimeType}. This {@link MimeType}
+ * define a particular {@link org.apache.oodt.cas.filemgr.structs.Product} {@link org.apache.tika.mime.MimeType}. This {@link org.apache.tika.mime.MimeType}
* is then mapped to an extractor vai the <code>mime-extractor-map.xml</code>
* file, described above. </li>
* </p>.
@@ -82,7 +76,7 @@ public class AutoDetectProductCrawler extends ProductCrawler implements
metadata.addMetadata(MIME_TYPES_HIERARCHY,
mimeExtractorRepo.getMimeTypes(product));
for (int i = 0; i < specs.size(); i++) {
- Metadata m = ((MetExtractorSpec) specs.get(i)).getMetExtractor()
+ Metadata m = specs.get(i).getMetExtractor()
.extractMetadata(product);
if (m != null) {
metadata.addMetadata(m.getHashtable(), true);
@@ -101,8 +95,8 @@ public class AutoDetectProductCrawler extends ProductCrawler implements
PreCondEvalUtils evalUtils = new PreCondEvalUtils(
this.getApplicationContext());
for (int i = 0; i < specs.size(); i++) {
- List<String> preCondComparatorIds = ((MetExtractorSpec) specs
- .get(i)).getPreCondComparatorIds();
+ List<String> preCondComparatorIds = specs
+ .get(i).getPreCondComparatorIds();
if (!evalUtils.eval(preCondComparatorIds, product))
return false;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
index 3c7529b..2f96746 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
@@ -16,6 +16,8 @@
*/
package org.apache.oodt.cas.crawl;
+import com.google.common.annotations.VisibleForTesting;
+
//OODT imports
import org.apache.oodt.cas.crawl.action.CrawlerAction;
import org.apache.oodt.cas.crawl.action.CrawlerActionRepo;
@@ -23,12 +25,8 @@ import org.apache.oodt.cas.crawl.config.ProductCrawlerBean;
import org.apache.oodt.cas.crawl.status.IngestStatus;
import org.apache.oodt.cas.filemgr.ingest.Ingester;
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.metadata.Metadata;
-import com.google.common.annotations.VisibleForTesting;
-
-//JDK imports
import java.io.File;
import java.io.FileFilter;
import java.net.URL;
@@ -39,6 +37,7 @@ import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
+
/**
* An abstract base class for Product Crawling. This class provides methods to
* communicate with the file manager and parse met files that show how to ingest
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/crawler/src/main/java/org/apache/oodt/cas/crawl/StdProductCrawler.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/StdProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/StdProductCrawler.java
index 6bd72a9..b0f3e80 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/StdProductCrawler.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/StdProductCrawler.java
@@ -22,7 +22,6 @@ import org.apache.oodt.cas.metadata.extractors.MetReaderExtractor;
//JDK imports
import java.io.File;
-import java.util.logging.Level;
/**
* A generic Product Crawler for Products. The Crawler is given a root Product
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MetExtractorSpec.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MetExtractorSpec.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MetExtractorSpec.java
index 7c81dfe..70f109d 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MetExtractorSpec.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MetExtractorSpec.java
@@ -19,13 +19,12 @@
package org.apache.oodt.cas.crawl.typedetection;
// OODT imports
-import java.io.FileNotFoundException;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.oodt.cas.metadata.MetExtractor;
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import java.util.LinkedList;
+import java.util.List;
+
/**
* @author mattmann
* @author bfoster
@@ -118,12 +117,8 @@ public class MetExtractorSpec {
}
/**
- * @param preconditionsFile
+ * @param preCondComparatorIds
* The extractor preconditions file
- * @throws IllegalAccessException
- * @throws InstantiationException
- * @throws ClassNotFoundException
- * @throws FileNotFoundException
*/
public void setPreConditionComparatorIds(List<String> preCondComparatorIds) {
this.preCondComparatorIds = preCondComparatorIds;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
index 1a39b39..520245a 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
@@ -17,7 +17,6 @@
package org.apache.oodt.cas.crawl.typedetection;
//OODT imports
-import org.apache.oodt.cas.metadata.filenaming.NamingConvention;
import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.commons.xml.XMLUtils;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
index f4a4ef4..784078b 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
@@ -18,10 +18,12 @@
package org.apache.oodt.cas.curation.service;
//OODT imports
+import net.sf.json.JSONArray;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.oodt.cas.curation.metadata.CuratorConfMetKeys;
import org.apache.oodt.security.sso.SingleSignOn;
-//JDK imports
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -32,18 +34,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.UriInfo;
+//JDK imports
//JAX-RS imports
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
//APACHE imports
-import org.apache.commons.lang.StringUtils;
/**
*
@@ -97,7 +97,7 @@ public class CurationService extends HttpServlet implements CuratorConfMetKeys {
* @param showFiles
* Whether or not to show {@link File#isFile()} files or not.
* @return A String representation formatting using
- * {@link JSONObject#toString()}.
+ * {@link net.sf.json.JSONObject#toString()}.
*/
public String getDirectoryAreaAsJSON(String base, String path,
boolean showFiles) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
index 1371604..d67af9d 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.curation.service;
//OODT imports
import org.apache.oodt.cas.curation.metadata.CuratorConfMetKeys;
-import org.apache.oodt.cas.filemgr.datatransfer.DataTransferFactory;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.util.PathUtils;
@@ -75,8 +74,7 @@ public class CurationServiceConfig implements CuratorConfMetKeys {
* The {@link ServletConfig} read on startup of the webapp. This is
* typically specified in a <code>context.xml</code> file, but can
* also be specified in <code>web.xml</code>.
- * @return A singleton instance of the global {@link link
- * CurationServiceConfig}.
+ * @return A singleton instance of the global {@link CurationServiceConfig}.
* @throws InstantiationException
* If there is any error constructing the config.
*/
@@ -163,7 +161,7 @@ public class CurationServiceConfig implements CuratorConfMetKeys {
/**
*
- * @return The default CAS File Manager {@link DataTransferFactory} classname.
+ * @return The default CAS File Manager {@link org.apache.oodt.cas.filemgr.datatransfer.DataTransferFactory} classname.
*/
public String getDefaultTransferFactory() {
return this.evaluateParameter(DEFAULT_TRANSFER_FACTORY);
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java
index d6bb4ca..b3e14d6 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java
@@ -18,9 +18,6 @@
package org.apache.oodt.cas.curation.structs;
-//OODT imports
-import org.apache.oodt.cas.filemgr.ingest.Ingester;
-
//JDK imports
import java.util.Date;
import java.util.List;
@@ -28,7 +25,7 @@ import java.util.Vector;
/**
*
- * A specification for ingestion using the {@link Ingester} interface in the
+ * A specification for ingestion using the {@link org.apache.oodt.cas.filemgr.ingest.Ingester} interface in the
* CAS.
*
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
index 48c9592..ece146a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
@@ -17,17 +17,16 @@
package org.apache.oodt.cas.filemgr.catalog;
+//OODT imports
+import org.apache.oodt.cas.metadata.util.PathUtils;
+
//JDK imports
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
-//OODT imports
-import org.apache.oodt.cas.filemgr.catalog.Catalog;
-import org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory;
-import org.apache.oodt.cas.filemgr.structs.ProductType;
-import org.apache.oodt.cas.metadata.util.PathUtils;
+
/**
* @author mattmann
@@ -36,7 +35,8 @@ import org.apache.oodt.cas.metadata.util.PathUtils;
* <p>
* Factory for constructing a special {@link DataSourceCatalog} called
* {@link MappedDataSourceCatalog} which is able to override the default
- * policy of {@link ProductType#getName()}_metadata and {@link ProductType#getName()}_reference
+ * policy of {@link org.apache.oodt.cas.filemgr.structs.ProductType#getName()}_metadata
+ * and {@link org.apache.oodt.cas.filemgr.structs.ProductType#getName()}_reference
* as the underlying table names
* </p>.
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
index 52196c6..7876ef5 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/SolrClient.java
@@ -16,15 +16,6 @@
*/
package org.apache.oodt.cas.filemgr.catalog.solr;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.HttpStatus;
@@ -35,6 +26,14 @@ import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
/**
* Class containing client-side functionality for interacting with a Solr server.
* This class uses an {@link HttpClient} for all HTTP communication.
@@ -62,11 +61,11 @@ public class SolrClient {
/**
* Method to send one or more documents to be indexed to Solr.
*
- * @param document
+ * @param docs
* @param commit
* @param mimeType : the mime-type format of the documents
* @return
- * @throws MalformedURLException
+ * @throws CatalogException
*/
public String index(List<String> docs, boolean commit, String mimeType) throws CatalogException {
@@ -104,7 +103,7 @@ public class SolrClient {
* @param id
* @param commit
* @return
- * @throws Exception
+ * @throws CatalogException
*/
public String delete(String id, boolean commit) throws CatalogException {
@@ -143,7 +142,8 @@ public class SolrClient {
/**
* Method to query the Solr index for a product with the specified name.
- * @param id
+ * @param name
+ * @param mimeType
* @return
*/
public String queryProductByName(String name, String mimeType) throws CatalogException {
@@ -188,7 +188,7 @@ public class SolrClient {
/**
* Method to commit the current changes to the Solr index.
- * @throws MalformedURLException
+ * @throws Exception
*/
public void commit() throws Exception {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/GetProductTypeByNameCliAction.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/GetProductTypeByNameCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/GetProductTypeByNameCliAction.java
index 1aa9d71..dc0af3b 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/GetProductTypeByNameCliAction.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/GetProductTypeByNameCliAction.java
@@ -20,12 +20,11 @@ package org.apache.oodt.cas.filemgr.cli.action;
import org.apache.commons.lang.Validate;
//OODT imports
-import org.apache.oodt.cas.cli.action.CmdLineAction;
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
import org.apache.oodt.cas.filemgr.structs.ProductType;
/**
- * A {@link CmdLineAction} which gets a {@link ProductType} by name.
+ * A {@link org.apache.oodt.cas.cli.action.CmdLineAction} which gets a {@link ProductType} by name.
*
* @author bfoster (Brian Foster)
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/HasProductCliAction.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/HasProductCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/HasProductCliAction.java
index 3445325..48c8ef2 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/HasProductCliAction.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/HasProductCliAction.java
@@ -21,11 +21,10 @@ import org.apache.commons.lang.Validate;
//OODT imports
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
-import org.apache.oodt.cas.filemgr.structs.Product;
/**
* A {@link CmdLineAction} which checks if the File Manager has a given
- * {@link Product} ingested.
+ * {@link org.apache.oodt.cas.filemgr.structs.Product} ingested.
*
* @author bfoster (Brian Foster)
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
index b3706ec..b810c7d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
@@ -19,7 +19,6 @@
package org.apache.oodt.cas.filemgr.ingest;
//OODT imports
-import org.apache.oodt.cas.filemgr.structs.exceptions.IngestException;
import org.apache.oodt.cas.metadata.MetExtractor;
import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.cas.metadata.util.GenericMetadataObjectFactory;
@@ -31,7 +30,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
import java.util.Vector;
@@ -59,8 +57,8 @@ public class CmdLineIngester extends StdIngester {
/**
* @param args
- * @throws IngestException
- * @throws MalformedURLException
+ * @throws org.apache.oodt.cas.filemgr.structs.exceptions.IngestException
+ * @throws java.net.MalformedURLException
*/
public static void main(String[] args) throws Exception {
String usage = CmdLineIngester.class.getName()
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/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 05e59b3..b725da2 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
@@ -17,15 +17,13 @@
package org.apache.oodt.cas.filemgr.metadata;
-//OODT imports
-import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
/**
*
* Met key field names used to augment {@link Product} {@link Metadata} in
- * {@link XmlRpcFileManagerClient#getMetadata(org.apache.oodt.cas.filemgr.structs.Product)}
+ * {@link org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient#getMetadata(org.apache.oodt.cas.filemgr.structs.Product)}
* and in
- * {@link XmlRpcFileManagerClient#getReducedMetadata(org.apache.oodt.cas.filemgr.structs.Product, java.util.List)}
+ * {@link org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient#getReducedMetadata(org.apache.oodt.cas.filemgr.structs.Product, java.util.List)}
* .
*
* @see http://issues.apache.org/jira/browse/OODT-72
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/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 e05dd9e..0bd4e84 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
@@ -18,7 +18,6 @@
package org.apache.oodt.cas.filemgr.repository;
//OODT imports
-import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
@@ -32,7 +31,7 @@ import java.util.List;
*
* A Repository Manager is an extension point that is responsible for managing
* {@link ProductType} information which boils down to policy information about
- * {@link Product}s that are ingested into the File Manager. This includes
+ * {@link org.apache.oodt.cas.filemgr.structs.Product}s that are ingested into the File Manager. This includes
* information such as the root repository path for a product type, what type of
* URI generation scheme to apply, etc.
* </p>
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Element.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Element.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Element.java
index 01fc620..d4e3838 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Element.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Element.java
@@ -17,8 +17,6 @@
package org.apache.oodt.cas.filemgr.structs;
-import org.apache.oodt.cas.filemgr.structs.type.TypeHandler;
-
/**
* @author mattmann
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
index 32e3156..3c25ed3 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
@@ -18,6 +18,12 @@
package org.apache.oodt.cas.filemgr.structs;
//JDK imports
+import org.apache.oodt.commons.xml.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -32,14 +38,7 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
//OODT imports
-import org.apache.oodt.cas.filemgr.catalog.Catalog; //for javadoc
-import org.apache.oodt.commons.xml.XMLUtils;
/**
* @author mattmann
@@ -48,7 +47,7 @@ import org.apache.oodt.commons.xml.XMLUtils;
*
* <p>
* A Product is a set of files, or a heirarchical, directory structure that
- * should be ingested into the {@link Catalog}.
+ * should be ingested into the {@link org.apache.oodt.cas.filemgr.catalog.Catalog}.
* </p>
*
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
index e53e36f..702eb78 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
@@ -17,13 +17,6 @@
package org.apache.oodt.cas.filemgr.structs;
-//JDK imports
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
//OODT imports
import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.tika.Tika;
@@ -33,6 +26,10 @@ import org.apache.tika.mime.MimeTypeException;
import org.apache.tika.mime.MimeTypes;
import org.apache.tika.mime.MimeTypesFactory;
+//JDK imports
+import java.io.File;
+import java.io.FileInputStream;
+
/**
* @author mattmann
* @author bfoster
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java
index 7d883bf..d9bdaaf 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java
@@ -17,18 +17,15 @@
package org.apache.oodt.cas.filemgr.tools;
+
+//Lucene imports
+import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.standard.StandardFilter;
+
//JDK imports
import java.io.Reader;
import java.util.Set;
-//Lucene imports
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.StopFilter;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.WhitespaceTokenizer;
-import org.apache.lucene.analysis.standard.StandardFilter;
-import org.apache.lucene.analysis.standard.StandardTokenizer;
/**
*
@@ -60,7 +57,7 @@ public class CASAnalyzer extends Analyzer {
}
/**
- * Constructs a {@link StandardTokenizer} filtered by a {@link
+ * Constructs a {@link org.apache.lucene.analysis.standard.StandardTokenizer} filtered by a {@link
* StandardFilter}, a {@link LowerCaseFilter} and a {@link StopFilter}.
*/
public TokenStream tokenStream(String fieldName, Reader reader) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/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 6a95829..9c04840 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
@@ -19,18 +19,15 @@ package org.apache.oodt.cas.filemgr.util;
//CAS imports
import org.apache.oodt.cas.filemgr.structs.ProductPage;
-import org.apache.oodt.cas.filemgr.structs.Product; //for javadoc
import org.apache.oodt.cas.filemgr.structs.ProductType;
-//JDK imports
-import java.util.List; //for javadoc
/**
* @author mattmann
* @version $Revision$
*
* <p>
- * An interface for pagination of {@link Product} {@link List}s..
+ * An interface for pagination of {@link org.apache.oodt.cas.filemgr.structs.Product} {@link java.util.List}s..
* </p>
*
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
index 18f003e..083a6b7 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
@@ -17,6 +17,14 @@
package org.apache.oodt.cas.filemgr.validation;
+
+//OODT imports
+import org.apache.oodt.cas.filemgr.catalog.ScienceDataCatalog;
+import org.apache.oodt.cas.filemgr.structs.Element;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
+import org.apache.oodt.cas.filemgr.util.DbStructFactory;
+
//JDK imports
import java.sql.Connection;
import java.sql.ResultSet;
@@ -24,15 +32,9 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import java.util.Vector;
+
import javax.sql.DataSource;
-//OODT imports
-import org.apache.oodt.cas.filemgr.catalog.ScienceDataCatalog;
-import org.apache.oodt.cas.filemgr.structs.Element;
-import org.apache.oodt.cas.filemgr.structs.ProductType;
-import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
-import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
-import org.apache.oodt.cas.filemgr.util.DbStructFactory;
/**
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java b/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java
index 36553cb..3273b7a 100644
--- a/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java
+++ b/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java
@@ -16,25 +16,21 @@
*/
package org.apache.oodt.cas.protocol.ftp;
-//JDK imports
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Vector;
-
-
-
-//Globus imports
+//OODT imports
import org.apache.oodt.cas.protocol.Protocol;
import org.apache.oodt.cas.protocol.ProtocolFile;
import org.apache.oodt.cas.protocol.auth.Authentication;
import org.apache.oodt.cas.protocol.exceptions.ProtocolException;
import org.apache.oodt.cas.protocol.util.ProtocolFileFilter;
+
+//Globus imports
import org.globus.ftp.FTPClient;
import org.globus.ftp.FileInfo;
-import org.globus.ftp.HostPort;
-import org.globus.ftp.exception.ClientException;
-import org.globus.ftp.exception.ServerException;
+
+//JDK imports
+import java.io.File;
+import java.util.List;
+import java.util.Vector;
/**
* FTP implementation of a {@link Protocol}
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
index ae59506..c74ff20 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
@@ -18,14 +18,16 @@
package org.apache.oodt.cas.pushpull.retrievalsystem;
-//JDK imports
-import static org.apache.oodt.cas.metadata.util.PathUtils.doDynamicReplacement;
+//OODT imports
+import org.apache.oodt.cas.pushpull.config.*;
+import org.apache.oodt.cas.pushpull.exceptions.ParserException;
+import org.apache.oodt.cas.pushpull.exceptions.RetrievalMethodException;
+import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
+import org.apache.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
+import org.apache.oodt.cas.pushpull.retrievalmethod.RetrievalMethod;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
+//JDK imports
+import java.io.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -33,19 +35,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
-//OODT imports
-import org.apache.oodt.cas.pushpull.config.Config;
-import org.apache.oodt.cas.pushpull.config.DataFilesInfo;
-import org.apache.oodt.cas.pushpull.config.SiteInfo;
-import org.apache.oodt.cas.pushpull.config.PropFilesInfo;
-import org.apache.oodt.cas.pushpull.config.ProtocolInfo;
-import org.apache.oodt.cas.pushpull.exceptions.ParserException;
-import org.apache.oodt.cas.pushpull.exceptions.RetrievalMethodException;
-import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
-import org.apache.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
-import org.apache.oodt.cas.pushpull.retrievalmethod.RetrievalMethod;
-import org.apache.oodt.cas.pushpull.retrievalsystem.FileRetrievalSystem;
-import org.apache.oodt.commons.exec.ExecUtils;
/**
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
index 1bddd60..2a0410e 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
@@ -16,9 +16,6 @@
*/
package org.apache.oodt.cas.resource.cli.action;
-//JDK imports
-import java.util.List;
-
//OODT imports
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
index d8be971..fd4bb24 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
@@ -16,9 +16,6 @@
*/
package org.apache.oodt.cas.resource.cli.action;
-//JDK imports
-import java.util.List;
-
//OODT imports
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitorFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitorFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitorFactory.java
index e87405b..9b62b2b 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitorFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/monitor/ganglia/GangliaResourceMonitorFactory.java
@@ -17,20 +17,19 @@
package org.apache.oodt.cas.resource.monitor.ganglia;
-//JDK imports
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
//OODT imports
import org.apache.oodt.cas.resource.monitor.Monitor;
import org.apache.oodt.cas.resource.monitor.MonitorFactory;
import org.apache.oodt.cas.resource.monitor.ganglia.loadcalc.LoadCalculator;
-import org.apache.oodt.cas.resource.structs.ResourceNode;
import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
+//JDK imports
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
/**
* @author rajith
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/metadata/MetadataBrowser.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/metadata/MetadataBrowser.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/metadata/MetadataBrowser.java
index 9eb43c1..58f993f 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/metadata/MetadataBrowser.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/metadata/MetadataBrowser.java
@@ -18,7 +18,6 @@
package org.apache.oodt.cas.webcomponents.filemgr.browser.metadata;
//JDK imports
-import java.io.Serializable;
import java.util.Collections;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.java
index 0f7d183..a1afedb 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.java
@@ -17,10 +17,6 @@
package org.apache.oodt.cas.webcomponents.workflow.instance;
-import java.text.NumberFormat;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.webcomponents.workflow.WorkflowMgrConn;
import org.apache.oodt.cas.webcomponents.workflow.pagination.WorkflowPagePaginator;
@@ -30,14 +26,12 @@ import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
-import org.apache.wicket.IResourceListener;
import org.apache.wicket.PageParameters;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
@@ -45,6 +39,9 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.value.ValueMap;
+import java.text.NumberFormat;
+import java.util.List;
+
/**
*
* Describe your class here.
http://git-wip-us.apache.org/repos/asf/oodt/blob/7c968327/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
index bb3e6fe..2696184 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
@@ -18,12 +18,39 @@
package org.apache.oodt.cas.product.rss;
+
+//OODT imports
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.commons.util.DateConvert;
+import org.apache.oodt.commons.xml.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
//JDK imports
+import java.io.FileNotFoundException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Transformer;
@@ -31,33 +58,6 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.text.ParseException;
-
-//OODT imports
-import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
-import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.ProductType;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.commons.xml.XMLUtils;
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.commons.util.DateConvert;
/**
* A Servlet that supports the <a
[3/7] oodt git commit: OODT-886 fix unused imports
Posted by ma...@apache.org.
OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c8699aba
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c8699aba
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c8699aba
Branch: refs/heads/master
Commit: c8699aba132702e3070b55b587013ed47489d131
Parents: 7c96832
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 9 16:04:43 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 9 16:04:43 2015 +0100
----------------------------------------------------------------------
.../validation/ScienceDataValidationLayer.java | 3 +--
.../exceptions/PreconditionComparatorException.java | 4 +---
.../cas/metadata/preconditions/PreCondEvalUtils.java | 9 ++++-----
.../preconditions/PreConditionComparator.java | 3 +--
.../apache/oodt/cas/install/CASInstallDistMojo.java | 4 +---
.../oodt/cas/pge/util/GenericPgeObjectFactory.java | 10 +++++-----
.../cas/protocol/cli/action/BasicVerifyCliAction.java | 3 +--
.../cli/action/DeleteEmptyDirectoriesCliAction.java | 1 -
.../cas/product/jaxrs/resources/DatasetResource.java | 14 ++++----------
.../product/jaxrs/resources/TransfersResource.java | 3 +--
.../org/apache/oodt/cas/product/rdf/RDFConfig.java | 6 ++----
11 files changed, 21 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
index 083a6b7..e9807ed 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ScienceDataValidationLayer.java
@@ -19,7 +19,6 @@ package org.apache.oodt.cas.filemgr.validation;
//OODT imports
-import org.apache.oodt.cas.filemgr.catalog.ScienceDataCatalog;
import org.apache.oodt.cas.filemgr.structs.Element;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
@@ -39,7 +38,7 @@ import javax.sql.DataSource;
/**
*
* Determines the mapping of {@Element}s to {@link ProductType}s by
- * reading the {@link ScienceDataCatalog} catalog schema tables concerning parameters and datasets.
+ * reading the {@link org.apache.oodt.cas.filemgr.catalog.ScienceDataCatalog} catalog schema tables concerning parameters and datasets.
*
* @author mattmann
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java
index 6a6b340..18219ee 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java
@@ -18,8 +18,6 @@
package org.apache.oodt.cas.metadata.exceptions;
-//OODT imports
-import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; //for javadoc
/**
*
@@ -27,7 +25,7 @@ import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; //for
* @version $Revision$
*
* <p>
- * An exception throw by a {@link PreConditionComparator}
+ * An exception throw by a {@link org.apache.oodt.cas.metadata.preconditions.PreConditionComparator}
* </p>.
*/
public class PreconditionComparatorException extends Exception {
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
index 6191b99..9d6ac12 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
@@ -19,16 +19,15 @@
package org.apache.oodt.cas.metadata.preconditions;
//JDK imports
+import org.springframework.context.ApplicationContext;
+
import java.io.File;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
//Spring imports
-import org.springframework.context.ApplicationContext;
-//OODT imports
-import org.apache.oodt.cas.metadata.MetExtractor; // for javadoc
/**
*
@@ -54,12 +53,12 @@ public class PreCondEvalUtils implements PreConditionOperatorMetKeys {
/**
* Evaluates whether all preconditions pass or not
*
- * @param preconditions
+ * @param preCondComparatorIds
* The String identifiers of the {@link PreConditionComparator}s
* in question
* @param product
* the {@link File} to test the preconditions against to
- * determine whether or not the {@link MetExtractor} should be
+ * determine whether or not the {@link org.apache.oodt.cas.metadata.MetExtractor} should be
* run or not.
* @return True if all preconditions pass and false otherwise
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
index d457e30..66dfd66 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
@@ -23,7 +23,6 @@ import java.io.File;
//OODT imports
import org.apache.oodt.commons.spring.SpringSetIdInjectionType;
-import org.apache.oodt.cas.metadata.MetExtractor;
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
import static org.apache.oodt.cas.metadata.preconditions.PreConditionOperatorMetKeys.*;
@@ -39,7 +38,7 @@ import org.springframework.beans.factory.annotation.Required;
*
* <p>
* The abstract base class for evaluating {@link PreCondition} checks for
- * running a {@link MetExtractor}
+ * running a {@link org.apache.oodt.cas.metadata.MetExtractor}
* </p>.
*/
public abstract class PreConditionComparator<CompareType> implements SpringSetIdInjectionType {
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
----------------------------------------------------------------------
diff --git a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
index 150a312..b789368 100644
--- a/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
+++ b/mvn/plugins/cas-install/src/main/java/org/apache/oodt/cas/install/CASInstallDistMojo.java
@@ -25,8 +25,6 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
//JDK imports
-import org.apache.oodt.cas.metadata.util.PathUtils;
-
import java.io.File;
import java.io.IOException;
@@ -89,7 +87,7 @@ public class CASInstallDistMojo extends AbstractMojo {
private File[] customLibs;
/**
- * Files to do dynamic {@link PathUtils#replaceEnvVariables(String)} on.
+ * Files to do dynamic {@link org.apache.oodt.cas.metadata.util.PathUtils#replaceEnvVariables(String)} on.
*
* @parameter
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java
index 50359e0..6df7975 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/GenericPgeObjectFactory.java
@@ -16,19 +16,19 @@
*/
package org.apache.oodt.cas.pge.util;
-//JDK imports
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
//OODT imports
import org.apache.oodt.cas.pge.ConfigFilePropertyAdder;
import org.apache.oodt.cas.pge.PGETaskInstance;
import org.apache.oodt.cas.pge.config.PgeConfigBuilder;
import org.apache.oodt.cas.pge.staging.FileStager;
-import org.apache.oodt.cas.pge.writers.DynamicConfigFileWriter;
import org.apache.oodt.cas.pge.writers.SciPgeConfigFileWriter;
+//JDK imports
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
/**
* Factory for creating {@link Object}s.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java
index 113fa9e..f76dc0e 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/BasicVerifyCliAction.java
@@ -20,12 +20,11 @@ package org.apache.oodt.cas.protocol.cli.action;
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
import org.apache.oodt.cas.protocol.Protocol;
import org.apache.oodt.cas.protocol.ProtocolFactory;
-import org.apache.oodt.cas.protocol.system.ProtocolManager;
import org.apache.oodt.cas.protocol.verify.ProtocolVerifier;
/**
* Action for determining whether a given {@link Protocol} or auto-determined
- * {@link Protocol} via {@link ProtocolManager} can connect and pass
+ * {@link Protocol} via {@link org.apache.oodt.cas.protocol.system.ProtocolManager} can connect and pass
* verification of the given {@link Verifier} for given site.
*
* @author bfoster (Brian Foster)
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java
----------------------------------------------------------------------
diff --git a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java
index 664c8d7..5464164 100644
--- a/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java
+++ b/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java
@@ -25,7 +25,6 @@ import java.util.regex.Pattern;
// OODT imports
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
import org.apache.oodt.cas.protocol.Protocol;
-import org.apache.oodt.cas.protocol.ProtocolFactory;
import org.apache.oodt.cas.protocol.ProtocolFile;
import org.apache.oodt.cas.protocol.verify.ProtocolVerifierFactory;
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java
index cbb26ce..f3e33b3 100755
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/DatasetResource.java
@@ -17,22 +17,16 @@
package org.apache.oodt.cas.product.jaxrs.resources;
+import org.apache.oodt.cas.metadata.Metadata;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.metadata.Metadata;
+import javax.xml.bind.annotation.*;
/**
- * A JAX-RS resource representing a dataset - a set of {@link Product products}
+ * A JAX-RS resource representing a dataset - a set of {@link org.apache.oodt.cas.filemgr.structs.Product products}
* maintained by the file manager.
* @author rlaidlaw
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java
index 3e0f734..b3240dd 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/resources/TransfersResource.java
@@ -26,10 +26,9 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.oodt.cas.filemgr.structs.FileTransferStatus;
/**
- * A JAX-RS resource representing currently active {@link FileTransferStatus
+ * A JAX-RS resource representing currently active {@link org.apache.oodt.cas.filemgr.structs.FileTransferStatus
* file transfers} as {@link TransferResource transfer resources}.
* @author rlaidlaw
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/c8699aba/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java
index 37b5705..e62f0d4 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfig.java
@@ -18,8 +18,6 @@
package org.apache.oodt.cas.product.rdf;
-//JDK imports
-import org.apache.oodt.cas.filemgr.structs.ProductType;
import java.util.HashMap;
import java.util.Map;
@@ -183,11 +181,11 @@ public class RDFConfig {
/**
* Convenience method. First checks to see if there is a declared type
- * namespace for this {@link ProductType}, otherwise, returns
+ * namespace for this {@link org.apache.oodt.cas.filemgr.structs.ProductType}, otherwise, returns
* {@link #getDefaultTypeNs()}.
*
* @param type
- * The {@link ProductType#getName()} to find the namespace for.
+ * The {@link org.apache.oodt.cas.filemgr.structs.ProductType#getName()} to find the namespace for.
* @return Either the type's declared namespace, or
* {@link #getDefaultTypeNs()}.
*/
[4/7] oodt git commit: OODT-886 fix unused imports
Posted by ma...@apache.org.
OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/08fad265
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/08fad265
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/08fad265
Branch: refs/heads/master
Commit: 08fad265f5394208df03a39cff8e889b5a774390
Parents: c8699ab
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 9 16:16:27 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 9 16:16:27 2015 +0100
----------------------------------------------------------------------
.../cas/protocol/config/ProtocolConfig.java | 9 ++++----
.../apache/oodt/cas/pushpull/daemon/Daemon.java | 5 ----
.../filerestrictions/FileRestrictions.java | 3 +--
.../pushpull/retrievalmethod/RemoteCrawler.java | 8 +++----
.../oodt/cas/resource/batchmgr/Batchmgr.java | 3 +--
.../resource/batchmgr/XmlRpcBatchMgrProxy.java | 20 ++++++++--------
.../cli/action/GetExecReportCliAction.java | 2 +-
.../cli/action/GetNodeReportCliAction.java | 2 +-
.../system/XmlRpcResourceManagerClient.java | 24 ++++++++------------
.../browser/pagination/ProductPaginator.java | 14 +++++++-----
.../browser/product/ProductRefsBrowser.java | 20 ++++++++--------
.../cli/action/GetWorkflowByIdCliAction.java | 3 +--
12 files changed, 52 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/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 2e2951c..33eb471 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
@@ -16,16 +16,17 @@
*/
package org.apache.oodt.cas.protocol.config;
+
+//OODT imports
+import org.apache.oodt.cas.protocol.ProtocolFactory;
+
//JDK imports
import java.net.URI;
import java.util.List;
-//OODT imports
-import org.apache.oodt.cas.protocol.ProtocolFactory;
-import org.apache.oodt.cas.protocol.system.ProtocolManager;
/**
- * Protocol configuration for configuring {@link ProtocolManager}.
+ * Protocol configuration for configuring {@link org.apache.oodt.cas.protocol.system.ProtocolManager}.
*
* @author bfoster
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
index 10f8f34..5ff5e0e 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
@@ -22,8 +22,6 @@ package org.apache.oodt.cas.pushpull.daemon;
import org.apache.oodt.cas.pushpull.config.Config;
import org.apache.oodt.cas.pushpull.config.DaemonInfo;
import org.apache.oodt.cas.pushpull.config.SiteInfo;
-import org.apache.oodt.cas.pushpull.daemon.DaemonMBean;
-import org.apache.oodt.cas.pushpull.daemon.DaemonRmiInterface;
import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
import org.apache.oodt.cas.pushpull.retrievalsystem.RetrievalSetup;
@@ -182,9 +180,6 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
* crawl the URLs specified in the properties file in the sequence
* given--one at a time.
*
- * @param property
- * The system property whose value is the path to a java
- * .properties file that is be used to create the Crawler
* @throws DirStructException
*/
public void startDaemon() {
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
index df84929..ac41efe 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
@@ -22,14 +22,13 @@ package org.apache.oodt.cas.pushpull.filerestrictions;
import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
//JDK imports
-import java.io.InputStream;
import java.util.LinkedList;
/**
* This class allows the creation of restrictions for files and directories created below an actual directory which is passed
* into the constructor. These restriction are loaded by passing a FileInputStream which contains a XML File
- * into the {@link #loadRestrictions(InputStream)} method and can be tested against by using the {@link #isAllowed(VirtualFile)} method.
+ * into the {@link #loadRestrictions(java.io.InputStream)} method and can be tested against by using the {@link #isAllowed(VirtualFile)} method.
*
* <pre>
* The XML file schema is:
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RemoteCrawler.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RemoteCrawler.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RemoteCrawler.java
index d5ca530..f4c2ca8 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RemoteCrawler.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RemoteCrawler.java
@@ -24,7 +24,6 @@ import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.pushpull.config.DataFilesInfo;
import org.apache.oodt.cas.pushpull.config.DownloadInfo;
import org.apache.oodt.cas.pushpull.exceptions.AlreadyInDatabaseException;
-import org.apache.oodt.cas.pushpull.exceptions.ProtocolFileException;
import org.apache.oodt.cas.pushpull.exceptions.RetrievalMethodException;
import org.apache.oodt.cas.pushpull.exceptions.ToManyFailedDownloadsException;
import org.apache.oodt.cas.pushpull.exceptions.UndefinedTypeException;
@@ -44,7 +43,6 @@ import org.apache.oodt.cas.pushpull.retrievalsystem.FileRetrievalSystem;
//JDK imports
import java.io.File;
import java.io.FileInputStream;
-import java.net.MalformedURLException;
import java.util.List;
import java.util.Stack;
import java.util.logging.Level;
@@ -68,9 +66,9 @@ public class RemoteCrawler implements RetrievalMethod {
* Starts the crawler and creates a default DirStruct if null was supplied
* in constructor
*
- * @throws MalformedURLException
- * @throws ProtocolException
- * @throws ProtocolFileException
+ * @throws java.net.MalformedURLException
+ * @throws org.apache.oodt.cas.pushpull.exceptions.ProtocolException
+ * @throws org.apache.oodt.cas.pushpull.exceptions.ProtocolFileException
*/
@Override
public void processPropFile(FileRetrievalSystem frs, Parser propFileParser,
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/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 d9b399c..bad50f7 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
@@ -26,7 +26,6 @@ import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
import org.apache.oodt.cas.resource.structs.ResourceNode;
//java imports
-import java.net.URL;
import java.util.List;
/**
@@ -46,7 +45,7 @@ public interface Batchmgr {
* @param job
* The {@link JobSpec} to execute.
* @param remoteHost
- * A {@link URL} pointer to the remote host to execute the job
+ * A {@link java.net.URL} pointer to the remote host to execute the job
* on.
* @return true if the job execution was successful, false otherwise.
* @throws JobExecutionException
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java
index 4a4f2b2..039019e 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java
@@ -18,22 +18,22 @@
package org.apache.oodt.cas.resource.batchmgr;
-//JDK imports
-import java.io.IOException;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
//OODT imports
-import org.apache.oodt.cas.resource.structs.Job;
import org.apache.oodt.cas.resource.structs.JobSpec;
-import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
//APACHE imports
import org.apache.xmlrpc.XmlRpcClient;
import org.apache.xmlrpc.XmlRpcException;
+//JDK imports
+import java.io.IOException;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
/**
*
* @author woollard
@@ -42,8 +42,8 @@ import org.apache.xmlrpc.XmlRpcException;
* <p>
* A {@link Runnable} proxy to an XmlRpcBatchStub that allows the call to the
* XmlRpcBatchStub to be asynchronous rather than synchronous. This allows a
- * {@link Scheduler} that calls the {@link XmlRpcBatchMgr} to not be stuck
- * waiting for each job to complete before scheduling the next {@link Job}
+ * {@link org.apache.oodt.cas.resource.scheduler.Scheduler} that calls the {@link XmlRpcBatchMgr} to not be stuck
+ * waiting for each job to complete before scheduling the next {@link org.apache.oodt.cas.resource.structs.Job}
* </p>.
*/
public class XmlRpcBatchMgrProxy extends Thread implements Runnable {
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
index 2a0410e..a757550 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
@@ -20,7 +20,7 @@ package org.apache.oodt.cas.resource.cli.action;
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
/**
- * A {@link CmdLineAction} which list all jobs executing and shows
+ * A {@link org.apache.oodt.cas.cli.action.CmdLineAction} which list all jobs executing and shows
* what nodes are executing those jobs in addition to queue name and
* load value.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
index fd4bb24..3aff14a 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
@@ -20,7 +20,7 @@ package org.apache.oodt.cas.resource.cli.action;
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
/**
- * A {@link CmdLineAction} which returns name (all nodes will be displayed in alphabetical order),
+ * A {@link org.apache.oodt.cas.cli.action.CmdLineAction} which returns name (all nodes will be displayed in alphabetical order),
* load and capacity of all nodes, in addition to what queues that node draws from.
*
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
index 932fb69..5f4db15 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
@@ -18,36 +18,32 @@
package org.apache.oodt.cas.resource.system;
-//APACHE imports
-import org.apache.xmlrpc.CommonsXmlRpcTransportFactory;
-import org.apache.xmlrpc.XmlRpcClient;
-import org.apache.xmlrpc.XmlRpcException;
//OODTimports
import org.apache.oodt.cas.cli.CmdLineUtility;
import org.apache.oodt.cas.resource.structs.Job;
import org.apache.oodt.cas.resource.structs.JobInput;
-import org.apache.oodt.cas.resource.structs.JobSpec;
import org.apache.oodt.cas.resource.structs.JobStatus;
import org.apache.oodt.cas.resource.structs.ResourceNode;
-import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException;
-import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
-import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
-import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
+import org.apache.oodt.cas.resource.structs.exceptions.*;
import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
+//APACHE imports
+import org.apache.xmlrpc.CommonsXmlRpcTransportFactory;
+import org.apache.xmlrpc.XmlRpcClient;
+import org.apache.xmlrpc.XmlRpcException;
+
//JDK imports
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.net.URL;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.io.FileInputStream;
-import java.io.File;
-import java.io.IOException;
+
/**
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/pagination/ProductPaginator.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/pagination/ProductPaginator.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/pagination/ProductPaginator.java
index 672fb85..4c6953d 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/pagination/ProductPaginator.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/pagination/ProductPaginator.java
@@ -17,14 +17,8 @@
package org.apache.oodt.cas.webcomponents.filemgr.browser.pagination;
-//JDK imports
-import java.io.Serializable;
-import java.util.List;
-import java.util.Vector;
-
//OODT imports
import org.apache.oodt.cas.filemgr.structs.ProductPage;
-import org.apache.oodt.cas.webcomponents.filemgr.browser.types.TypeBrowser;
//Wicket imports
import org.apache.wicket.PageParameters;
@@ -36,6 +30,14 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
+//JDK imports
+import java.io.Serializable;
+import java.util.List;
+import java.util.Vector;
+
+
+
+
/**
*
* A paginator component that expands to a +/- 5 page
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/product/ProductRefsBrowser.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/product/ProductRefsBrowser.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/product/ProductRefsBrowser.java
index 14ff469..89b8f28 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/product/ProductRefsBrowser.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/browser/product/ProductRefsBrowser.java
@@ -17,16 +17,8 @@
package org.apache.oodt.cas.webcomponents.filemgr.browser.product;
-//JDK imports
-import java.io.File;
-import java.net.URI;
-import java.text.NumberFormat;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
@@ -39,9 +31,19 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.util.ListModel;
+//JDK imports
+import java.io.File;
+import java.net.URI;
+import java.text.NumberFormat;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
/**
*
- * Component responsible for showing a {@link Product}s
+ * Component responsible for showing a {@link org.apache.oodt.cas.filemgr.structs.Product}s
* {@link List} of {@link Reference}s.
*
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/08fad265/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowByIdCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowByIdCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowByIdCliAction.java
index 535a9c4..690928b 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowByIdCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetWorkflowByIdCliAction.java
@@ -16,14 +16,13 @@
*/
package org.apache.oodt.cas.workflow.cli.action;
-import org.apache.oodt.cas.cli.action.CmdLineAction;
//OODT imports
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
import org.apache.oodt.cas.workflow.structs.Workflow;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
/**
- * A {@link CmdLineAction} which retrieves Workflow information for
+ * A {@link org.apache.oodt.cas.cli.action.CmdLineAction} which retrieves Workflow information for
* Workflow with given workflow ID.
*
* @author bfoster (Brian Foster)
[6/7] oodt git commit: OODT-886 fix unused imports
Posted by ma...@apache.org.
OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/9a2597e8
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/9a2597e8
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/9a2597e8
Branch: refs/heads/master
Commit: 9a2597e8175b63ea0b792f07b583089996a85106
Parents: 4d8da8c
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 9 16:32:40 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 9 16:32:40 2015 +0100
----------------------------------------------------------------------
.../org/apache/oodt/commons/Configuration.java | 1 -
.../apache/oodt/commons/ConfiguredTestCase.java | 38 +++++++++----------
.../org/apache/oodt/commons/ExecServer.java | 39 +++++++++++---------
.../apache/oodt/commons/activity/Retrieval.java | 33 ++++++++---------
.../oodt/commons/io/DirectorySelector.java | 1 -
.../org/apache/oodt/commons/io/LogListener.java | 8 ++--
.../apache/oodt/commons/util/MemoryLogger.java | 8 ++--
.../apache/oodt/commons/util/XMLRPCFault.java | 6 ---
.../apache/oodt/grid/ProfileQueryServlet.java | 21 +++++------
.../org/apache/oodt/opendapps/DapNames.java | 4 +-
.../apache/oodt/opendapps/DatasetCrawler.java | 23 ++++--------
.../OpendapProfileElementExtractor.java | 17 ++++-----
.../oodt/opendapps/config/ConstantSpec.java | 9 +----
.../oodt/opendapps/config/DatasetMetElem.java | 4 +-
.../apache/oodt/pcs/health/CrawlerHealth.java | 4 +-
.../apache/oodt/pcs/health/JobHealthStatus.java | 9 ++---
.../oodt/pcs/health/PCSHealthMonitorReport.java | 9 ++---
.../apache/oodt/pcs/listing/ListingConf.java | 13 ++++---
.../org/apache/oodt/pcs/opsui/OpsuiApp.java | 24 +++++-------
.../oodt/pcs/opsui/status/StatusPage.java | 3 +-
.../oodt/product/LargeProductQueryHandler.java | 2 -
.../ofsn/metadata/OFSNXMLConfigMetKeys.java | 4 +-
.../apache/oodt/profile/ProfileAttributes.java | 15 ++------
.../processor/WorkflowProcessorQueue.java | 5 +--
.../workflow/engine/runner/EngineRunner.java | 8 ++--
.../examples/RandomStatusUpdateTask.java | 16 ++++----
.../DataSourceWorkflowInstanceRepository.java | 1 -
.../workflow/lifecycle/WorkflowLifecycle.java | 16 +++-----
.../cas/workflow/lifecycle/WorkflowState.java | 1 -
.../repository/XMLWorkflowRepository.java | 36 +++++++-----------
.../cas/workflow/structs/WorkflowInstance.java | 3 +-
.../oodt/cas/workflow/util/Pagination.java | 9 +----
32 files changed, 157 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/Configuration.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/Configuration.java b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
index 47da91e..938c11c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/Configuration.java
+++ b/commons/src/main/java/org/apache/oodt/commons/Configuration.java
@@ -20,7 +20,6 @@ package org.apache.oodt.commons;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.UnknownHostException;
import java.util.*;
import org.apache.oodt.commons.util.*;
import org.w3c.dom.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/ConfiguredTestCase.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/ConfiguredTestCase.java b/commons/src/main/java/org/apache/oodt/commons/ConfiguredTestCase.java
index 3c7530a..c9d049b 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ConfiguredTestCase.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ConfiguredTestCase.java
@@ -1,29 +1,29 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons;
-import java.io.BufferedInputStream;
-import junit.framework.TestCase;
import org.xml.sax.InputSource;
-import java.io.InputStream;
+
import java.io.IOException;
import java.io.StringReader;
+import junit.framework.TestCase;
+
/**
* Base test case for tests that need the Configuration object.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
index 9e8293d..4f4f5ee 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
@@ -17,28 +17,33 @@
package org.apache.oodt.commons;
-import java.io.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.net.*;
-import java.rmi.RMISecurityManager;
-import java.util.*;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import org.apache.oodt.commons.io.Log;
-import org.apache.oodt.commons.util.*;
+import org.apache.oodt.commons.io.Base64EncodingOutputStream;
+import org.apache.oodt.commons.util.LogInit;
+import org.apache.oodt.commons.util.PropertyMgr;
+import org.apache.oodt.commons.util.XML;
import org.apache.xmlrpc.XmlRpcClientLite;
import org.apache.xmlrpc.XmlRpcServer;
import org.w3c.dom.*;
-import org.xml.sax.*;
-import java.rmi.Remote;
-import java.rmi.server.RemoteStub;
-import java.rmi.server.UnicastRemoteObject;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.rmi.server.RemoteObject;
import java.rmi.server.RemoteRef;
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
-import org.apache.oodt.commons.io.Base64EncodingOutputStream;
+import java.rmi.server.RemoteStub;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
/** Server execution program.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java b/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java
index 13e9024..e598e05 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java
@@ -1,23 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons.activity;
-import java.sql.SQLException;
import java.util.List;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/io/DirectorySelector.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/io/DirectorySelector.java b/commons/src/main/java/org/apache/oodt/commons/io/DirectorySelector.java
index ad7c5b3..6fd4615 100644
--- a/commons/src/main/java/org/apache/oodt/commons/io/DirectorySelector.java
+++ b/commons/src/main/java/org/apache/oodt/commons/io/DirectorySelector.java
@@ -16,7 +16,6 @@ package org.apache.oodt.commons.io;
import java.io.File;
import java.io.FileFilter;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/io/LogListener.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/io/LogListener.java b/commons/src/main/java/org/apache/oodt/commons/io/LogListener.java
index 49b18a7..9124835 100644
--- a/commons/src/main/java/org/apache/oodt/commons/io/LogListener.java
+++ b/commons/src/main/java/org/apache/oodt/commons/io/LogListener.java
@@ -15,8 +15,6 @@
package org.apache.oodt.commons.io;
-import java.util.EventObject;
-
/** Listener for logging events.
*
* Objects of classes that implement this interface are notified when messages are logged
@@ -33,7 +31,7 @@ public interface LogListener extends java.beans.PropertyChangeListener {
*
* <ul>
* <li>The timestamp of the message, from {@link LogEvent#getTimestamp}.</li>
- * <li>The source of the message, from {@link EventObject#getSource}, which is always
+ * <li>The source of the message, from {@link java.util.EventObject#getSource}, which is always
* a {@link String}.</li>
* <li>The category of the message, from {@link LogEvent#getCategory}.</li>
* <li>The message text, from {@link LogEvent#getMessage}.</li>
@@ -50,7 +48,7 @@ public interface LogListener extends java.beans.PropertyChangeListener {
* <ul>
* <li>The name of the stream, from {@link LogEvent#getStream}.</li>
* <li>The time the stream got started, from {@link LogEvent#getTimestamp}</li>
- * <li>The source of the new stream start, from {@link EventObject#getSource} (always a {@link String}).</li>
+ * <li>The source of the new stream start, from {@link java.util.EventObject#getSource} (always a {@link String}).</li>
* </ul>
*
* @param event The logging event.
@@ -60,7 +58,7 @@ public interface LogListener extends java.beans.PropertyChangeListener {
/** A stream was stopped.
*
* The <var>event</var> contains the detail of the stream stop, which is the name
- * of the stream, from {@link LogEvent#getStream} or {@link EventObject#getSource}
+ * of the stream, from {@link LogEvent#getStream} or {@link java.util.EventObject#getSource}
* (always a {@link String}).
*
* @param event The logging event.
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/util/MemoryLogger.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/MemoryLogger.java b/commons/src/main/java/org/apache/oodt/commons/util/MemoryLogger.java
index 117d265..28dbf03 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/MemoryLogger.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/MemoryLogger.java
@@ -15,12 +15,12 @@
package org.apache.oodt.commons.util;
+import org.apache.oodt.commons.io.LogEvent;
+import org.apache.oodt.commons.io.LogListener;
+
import java.beans.PropertyChangeEvent;
-import java.util.List;
import java.util.LinkedList;
-import java.util.Iterator;
-import org.apache.oodt.commons.io.LogListener;
-import org.apache.oodt.commons.io.LogEvent;
+import java.util.List;
/** In-memory logger.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/commons/src/main/java/org/apache/oodt/commons/util/XMLRPCFault.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/XMLRPCFault.java b/commons/src/main/java/org/apache/oodt/commons/util/XMLRPCFault.java
index 6159b14..71e7a5f 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/XMLRPCFault.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/XMLRPCFault.java
@@ -15,12 +15,6 @@
package org.apache.oodt.commons.util;
-import java.io.*;
-import java.util.*;
-import java.text.ParseException;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
/** XML-RPC fault.
*
* This exception is thrown when a fault is returned from an XML-RPC call.
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
index 9bb96e8..b6dea55 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
@@ -17,12 +17,16 @@
package org.apache.oodt.grid;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.handlers.ProfileHandler;
+import org.apache.oodt.xmlquery.QueryElement;
+import org.apache.oodt.xmlquery.XMLQuery;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -32,13 +36,6 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-import org.apache.oodt.profile.Profile;
-import org.apache.oodt.profile.handlers.ProfileHandler;
-import org.apache.oodt.xmlquery.QueryElement;
-import org.apache.oodt.xmlquery.XMLQuery;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/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 1d08a4d..1fba636 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/DapNames.java
@@ -17,12 +17,10 @@
package org.apache.oodt.opendapps;
-//OPeNDAP imports
-import opendap.dap.DAS;
/**
*
- * A set of named constants for extracting information from OPeNDAP {@link DAS}
+ * A set of named constants for extracting information from OPeNDAP {@link opendap.dap.DAS}
* profiles.
*
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
index 32f8e83..5b1b4a9 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
@@ -18,25 +18,16 @@
package org.apache.oodt.opendapps;
//JDK imports
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.opendapps.config.OpendapConfig;
import org.apache.oodt.opendapps.extractors.MetadataExtractor;
import org.apache.oodt.opendapps.extractors.ThreddsMetadataExtractor;
-import thredds.catalog.InvAccess;
-import thredds.catalog.InvCatalogRef;
-import thredds.catalog.InvDataset;
-import thredds.catalog.InvService;
-import thredds.catalog.ServiceType;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import thredds.catalog.*;
import thredds.catalog.crawl.CatalogCrawler;
/**
@@ -108,9 +99,9 @@ public class DatasetCrawler implements CatalogCrawler.Listener {
}
/**
- * Gets the set of String {@link URL}s crawled.
+ * Gets the set of String {@link java.net.URL}s crawled.
*
- * @return A {@link List} of {@link String} representations of {@link URL}s.
+ * @return A {@link List} of {@link String} representations of {@link java.net.URL}s.
*/
public List<String> getURLs() {
return this.urls;
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
index fe76ba4..b4416af 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
@@ -16,27 +16,24 @@
*/
package org.apache.oodt.opendapps;
+//OODT imports
+import org.apache.oodt.opendapps.config.OpendapConfig;
+import org.apache.oodt.profile.EnumeratedProfileElement;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.RangedProfileElement;
+
//JDK imports
import java.util.Arrays;
import java.util.Enumeration;
import java.util.logging.Level;
import java.util.logging.Logger;
-
//OPeNDAP/THREDDS imports
import opendap.dap.Attribute;
import opendap.dap.AttributeTable;
import opendap.dap.DAS;
import opendap.dap.NoSuchAttributeException;
-
-//OODT imports
-import org.apache.oodt.opendapps.config.OpendapConfig;
-import org.apache.oodt.profile.EnumeratedProfileElement;
-import org.apache.oodt.profile.Profile;
-import org.apache.oodt.profile.ProfileElement;
-import org.apache.oodt.profile.RangedProfileElement;
-
import static org.apache.oodt.opendapps.DapNames.*;
/**
@@ -46,7 +43,7 @@ import static org.apache.oodt.opendapps.DapNames.*;
* different types of objects. The class looks at the {@link OpendapConfig} and
* then tries to stuff what's in each <var> into
* {@link RangedProfileElement} or {@link EnumeratedProfileElement}. The class
- * is designed with extensibility in mind in case new {@link ProfileElement}
+ * is designed with extensibility in mind in case new {@link org.apache.oodt.profile.ProfileElement}
* types are created in the future.
*
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/opendapps/src/main/java/org/apache/oodt/opendapps/config/ConstantSpec.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/config/ConstantSpec.java b/opendapps/src/main/java/org/apache/oodt/opendapps/config/ConstantSpec.java
index 06c3fe4..118621e 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/config/ConstantSpec.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/config/ConstantSpec.java
@@ -17,16 +17,11 @@
package org.apache.oodt.opendapps.config;
-//APACHE imports
-import org.apache.oodt.profile.Profile;
-import org.apache.oodt.profile.ProfileAttributes;
-import org.apache.oodt.profile.ResourceAttributes;
-
/**
*
* A specification of a constant field to flow through into either the generated
- * {@link Profile}s {@link ProfileAttributes} section or its
- * {@link ResourceAttributes} section. Part of the {@link OpendapConfig}.
+ * {@link org.apache.oodt.profile.Profile}s {@link org.apache.oodt.profile.ProfileAttributes} section or its
+ * {@link org.apache.oodt.profile.ResourceAttributes} section. Part of the {@link OpendapConfig}.
*
*/
public class ConstantSpec {
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/opendapps/src/main/java/org/apache/oodt/opendapps/config/DatasetMetElem.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/config/DatasetMetElem.java b/opendapps/src/main/java/org/apache/oodt/opendapps/config/DatasetMetElem.java
index 7afbdb9..2c1f10a 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/config/DatasetMetElem.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/config/DatasetMetElem.java
@@ -17,13 +17,11 @@
package org.apache.oodt.opendapps.config;
-//APACHE imports
-import org.apache.oodt.profile.EnumeratedProfileElement;
/**
*
* Specification for the {@link OpendapConfig} that specifies what THREDDS
- * dataset met to use to create {@link EnumeratedProfileElement}s from.
+ * dataset met to use to create {@link org.apache.oodt.profile.EnumeratedProfileElement}s from.
*
*/
public class DatasetMetElem {
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java
index d782e5f..000683e 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlerHealth.java
@@ -17,13 +17,11 @@
package org.apache.oodt.pcs.health;
-//OODT imports
-import org.apache.oodt.cas.crawl.daemon.CrawlDaemon; //for javadoc
/**
*
* Health of a PCS Crawler in terms of the number of crawls performed, and
- * average crawl time provided by a {@link CrawlDaemon}
+ * average crawl time provided by a {@link org.apache.oodt.cas.crawl.daemon.CrawlDaemon}
*
* @author mattmann
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java
index 0bd3677..4406d70 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/JobHealthStatus.java
@@ -17,9 +17,6 @@
package org.apache.oodt.pcs.health;
-//OODT imports
-import org.apache.oodt.cas.workflow.structs.WorkflowInstance; //for javadoc
-import org.apache.oodt.cas.workflow.structs.WorkflowStatus; //for javadoc
/**
*
@@ -42,12 +39,12 @@ public class JobHealthStatus {
* Constructs a JobHealthStatus with the given parameters.
*
* @param status
- * The Job status, one of {@link WorkflowStatus#STARTED}, or any of
+ * The Job status, one of {@link org.apache.oodt.cas.workflow.structs.WorkflowStatus#STARTED}, or any of
* the other WorkflowStatus keys.
*
* @param numPipelines
- * The number of {@link WorkflowInstance}s with the given
- * {@link WorkflowStatus}.
+ * The number of {@link org.apache.oodt.cas.workflow.structs.WorkflowInstance}s with the given
+ * {@link org.apache.oodt.cas.workflow.structs.WorkflowStatus}.
*/
public JobHealthStatus(String status, int numPipelines) {
this.status = status;
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java
index bcf58d8..a85420a 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/PCSHealthMonitorReport.java
@@ -19,9 +19,6 @@ package org.apache.oodt.pcs.health;
//OODT imports
import org.apache.oodt.commons.date.DateUtils;
-import org.apache.oodt.pcs.tools.PCSHealthMonitor;
-import org.apache.oodt.cas.filemgr.structs.Product; //for javadoc
-import org.apache.oodt.cas.resource.system.extern.XmlRpcBatchStub; //for javadoc
//JDK imports
import java.util.Calendar;
@@ -30,7 +27,7 @@ import java.util.List;
/**
*
- * The output generated from running the {@link PCSHealthMonitor#getReport()}
+ * The output generated from running the {@link org.apache.oodt.pcs.tools.PCSHealthMonitor#getReport()}
* method.
*
* @author mattmann
@@ -77,11 +74,11 @@ public class PCSHealthMonitorReport {
* THe {@link PCSDaemonStatus} for the Resource Manager.
* @param batchStubStatus
* A {@lik List} of {@link PCSDaemonStatus}es for each
- * {@link XmlRpcBatchStub}.
+ * {@link org.apache.oodt.cas.resource.system.extern.XmlRpcBatchStub}.
* @param crawlerStatus
* A {@link List} of {@link CrawlerStatus}es.
* @param latestProductsIngested
- * A {@link List} of the top N {@link Product}s that have been
+ * A {@link List} of the top N {@link org.apache.oodt.cas.filemgr.structs.Product}s that have been
* ingested.
* @param jobHealthStatus
* A {@link List} of {@link JobHealthStatus}es.
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConf.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConf.java b/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConf.java
index 01394e7..a649cde 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConf.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/listing/ListingConf.java
@@ -17,6 +17,11 @@
package org.apache.oodt.pcs.listing;
+//OODT imports
+import org.apache.oodt.pcs.input.PGEConfigFileException;
+import org.apache.oodt.pcs.input.PGEConfigFileReader;
+import org.apache.oodt.pcs.input.PGEConfigurationFile;
+
//JDK imports
import java.io.File;
import java.io.FileInputStream;
@@ -24,16 +29,12 @@ import java.io.FileNotFoundException;
import java.util.Collections;
import java.util.List;
-//OODT imports
-import org.apache.oodt.pcs.input.PGEConfigFileException;
-import org.apache.oodt.pcs.input.PGEConfigFileReader;
-import org.apache.oodt.pcs.input.PGEConfigurationFile;
-import org.apache.oodt.pcs.tools.PCSLongLister; //for javadoc
import static org.apache.oodt.pcs.listing.ListingConfKeys.*;
+
/**
*
- * The configuration for the {@link PCSLongLister}.
+ * The configuration for the {@link org.apache.oodt.pcs.tools.PCSLongLister}.
*
* @author mattmann
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
index 1a93c31..94824a7 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
@@ -18,15 +18,6 @@
package org.apache.oodt.pcs.opsui;
//OODT imports
-import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletContext;
-
import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.cas.webcomponents.curation.workbench.Workbench;
import org.apache.oodt.cas.webcomponents.filemgr.FMBrowserSession;
@@ -36,15 +27,20 @@ import org.apache.oodt.pcs.opsui.status.StatusPage;
import org.apache.oodt.pcs.webcomponents.trace.Trace;
//Wicket imports
-import org.apache.wicket.Page;
-import org.apache.wicket.Request;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.Response;
-import org.apache.wicket.Session;
+import org.apache.wicket.*;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
import org.apache.wicket.util.file.File;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
/**
*
* The OPSUI application object.
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java
index 7bbd7ad..6fdeb56 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java
@@ -22,7 +22,6 @@ import org.apache.oodt.pcs.opsui.ProductBrowserPage;
import org.apache.oodt.pcs.opsui.BasePage;
import org.apache.oodt.pcs.opsui.OpsuiApp;
import org.apache.oodt.pcs.opsui.WorkflowInstanceViewerPage;
-import org.apache.oodt.pcs.tools.PCSHealthMonitor;
import org.apache.oodt.pcs.webcomponents.health.HealthMonitor;
//Wicket imports
@@ -31,7 +30,7 @@ import org.apache.wicket.PageParameters;
/**
*
* A wicket controller for exposing the super awesome power of the
- * {@link PCSHealthMonitor}.
+ * {@link org.apache.oodt.pcs.tools.PCSHealthMonitor}.
*
* @author mattmann
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java b/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
index 6c0eadd..58f3d7c 100644
--- a/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
@@ -18,8 +18,6 @@
package org.apache.oodt.product;
-import org.apache.oodt.xmlquery.XMLQuery;
-
/**
* Handle requests for products that are too large to fit in an {@link
* org.apache.oodt.xmlquery.XMLQuery} object.
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/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 065ced4..17a7891 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
@@ -18,12 +18,10 @@
package org.apache.oodt.product.handlers.ofsn.metadata;
-// OODT imports
-import org.apache.oodt.product.handlers.ofsn.OFSNFileHandlerConfigurationReader; //javadoc
/**
*
- * Met Keys for the {@link OFSNFileHandlerConfigurationReader}
+ * Met Keys for the {@link org.apache.oodt.product.handlers.ofsn.OFSNFileHandlerConfigurationReader}
*
* @author mattmann
* @version $Revision$
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java b/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java
index b892110..3b17624 100644
--- a/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java
+++ b/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java
@@ -18,20 +18,13 @@
package org.apache.oodt.profile;
+import org.apache.oodt.commons.util.Documentable;
+import org.apache.oodt.commons.util.XML;
+import org.w3c.dom.*;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.oodt.commons.util.Documentable;
-import org.apache.oodt.commons.util.XML;
-import org.apache.oodt.commons.Configuration;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import java.io.IOException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXException;
/**
* Profile attributes.
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
index a0fceaf..6c9dff8 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
@@ -17,7 +17,7 @@
package org.apache.oodt.cas.workflow.engine.processor;
-//JDK imports
+//OODT imports
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
@@ -28,6 +28,7 @@ import org.apache.oodt.cas.workflow.structs.exceptions.EngineException;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException;
+//JDK imports
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,8 +36,6 @@ import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
-//OODT imports
-
/**
*
* The queue of available {@link WorkflowTask}s, that will be fed into the
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
index 9301ffc..9bf4f94 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
@@ -17,15 +17,13 @@
package org.apache.oodt.cas.workflow.engine.runner;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import org.apache.oodt.cas.workflow.structs.WorkflowTask;
/**
*
- * Obfuscates the underlying substrate on which a {@link WorkflowTask} should
- * run. In short, executes a {@link WorkflowTask} for the Workflow Engine.
+ * Obfuscates the underlying substrate on which a {@link org.apache.oodt.cas.workflow.structs.WorkflowTask} should
+ * run. In short, executes a {@link org.apache.oodt.cas.workflow.structs.WorkflowTask} for the Workflow Engine.
*
* @author bfoster
* @author mattmann
@@ -61,7 +59,7 @@ public abstract class EngineRunner {
* Decides whether or not there are available slots within this runner
* to execute the provided {@link TaskProcessor}.
*
- * @param workflowTask The {@link TaskProcessor} to execute.
+ * @param taskProcessor The {@link TaskProcessor} to execute.
* @return True if there is an open slot, false otherwise.
* @throws Exception If any error occurs.
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java
index 52a08fc..52bf398 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java
@@ -18,26 +18,26 @@
package org.apache.oodt.cas.workflow.examples;
-//JDK imports
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Random;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
-import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManager;
import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient;
+//JDK imports
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Random;
+
+
/**
* @author mattmann
* @version $Revision$
*
* This class illustrates OODT-86, demonstrating how the method
- * {@link XmlRpcWorkflowManager#updateWorkflowInstance(java.util.Hashtable)}
- * allows a user to change the status of a given {@link WorkflowInstance}
+ * {@link org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManager#updateWorkflowInstance(java.util.Hashtable)}
+ * allows a user to change the status of a given {@link org.apache.oodt.cas.workflow.structs.WorkflowInstance}
* programmatically.
*/
public class RandomStatusUpdateTask implements WorkflowTaskInstance {
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
index ae672cc..e220628 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.workflow.instrepo;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
index 776c22d..2443b25 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
@@ -17,10 +17,6 @@
package org.apache.oodt.cas.workflow.lifecycle;
-//OODT imports
-import org.apache.oodt.cas.workflow.structs.Workflow; //javadoc
-import org.apache.oodt.cas.workflow.structs.WorkflowInstance; //javadoc
-import org.apache.oodt.cas.workflow.structs.WorkflowStatus; //javadoc
//JDK imports
import java.util.Comparator;
@@ -31,8 +27,8 @@ import java.util.TreeSet;
/**
*
- * Defines the lifecycle of a {@link Workflow}, identifying what
- * {@link WorkflowStatus}es belong to a particular phase.
+ * Defines the lifecycle of a {@link org.apache.oodt.cas.workflow.structs.Workflow}, identifying what
+ * {@link org.apache.oodt.cas.workflow.structs.WorkflowStatus}es belong to a particular phase.
*
* @author mattmann
* @author bfoster
@@ -65,7 +61,7 @@ public class WorkflowLifecycle {
* @param name
* The name of the WorkflowLifecycle.
* @param workflowId
- * The associated identifier for the {@link Workflow}s that this
+ * The associated identifier for the {@link org.apache.oodt.cas.workflow.structs.Workflow}s that this
* WorkflowLifecycle is appropriate for.
*/
public WorkflowLifecycle(String name, String workflowId) {
@@ -160,13 +156,13 @@ public class WorkflowLifecycle {
/**
* Gets the associated {@link WorkflowLifecycleStage} for a
- * {@link WorkflowInstance} with a given status.
+ * {@link org.apache.oodt.cas.workflow.structs.WorkflowInstance} with a given status.
*
* @param status
- * The status of the {@link WorkflowInstance} to get the
+ * The status of the {@link org.apache.oodt.cas.workflow.structs.WorkflowInstance} to get the
* {@link WorkflowLifecycleStage} for.
* @return The corresponding {@link WorkflowLifecycleStage} for the
- * {@link WorkflowInstance} with the given status, or null if that
+ * {@link org.apache.oodt.cas.workflow.structs.WorkflowInstance} with the given status, or null if that
* status does not exist in any defined {@link WorkflowLifecycleStage}
* .
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java
index cbe1ca4..c90d242 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java
@@ -18,7 +18,6 @@ package org.apache.oodt.cas.workflow.lifecycle;
//JDK imports
import java.util.Date;
-import java.util.Vector;
/**
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
index 812f2f8..e92570f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
@@ -19,40 +19,32 @@
package org.apache.oodt.cas.workflow.repository;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.util.XmlStructFactory;
import org.apache.oodt.cas.workflow.examples.NoOpTask;
import org.apache.oodt.cas.workflow.structs.Workflow;
-import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException;
-import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
+import org.apache.oodt.cas.workflow.util.XmlStructFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
//JDK imports
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.Arrays;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.io.File;
+import java.io.FileFilter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileFilter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
+
/**
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java
index 8954426..9e8f681 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java
@@ -23,7 +23,6 @@ import java.util.Date;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
import org.apache.oodt.commons.util.DateConvert;
@@ -45,7 +44,7 @@ import org.apache.oodt.commons.util.DateConvert;
*
* In addition, as of Apache OODT 0.4 the internal {@link #state} member
* variable now uses {@link WorkflowState} for representation. This requires the
- * use of {@link WorkflowLifecycle} which has now moved from being simply a UI
+ * use of {@link org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle} which has now moved from being simply a UI
* utility class for the Worklow Monitor web application to actually being fully
* integrated with the Workflow Manager. For backwards compatibility the
* {@link #setStatus(String)} and {@link #getStatus()} methods are still
http://git-wip-us.apache.org/repos/asf/oodt/blob/9a2597e8/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 431c55b..f862ff1 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
@@ -19,7 +19,6 @@
package org.apache.oodt.cas.workflow.util;
//OODT imports
-import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
@@ -70,10 +69,6 @@ public interface Pagination {
*
* @param pageNum
* The {@link WorkflowInstancePage} number to get.
- * @param status
- * Identifies which {@link WorkflowInstance} set to paginate,
- * e.g., only {@link WorkflowInstance}s with a given status.
- *
* @return The {@link WorkflowInstancePage} with the given status, and page
* number.
* @throws InstanceRepositoryException
@@ -89,8 +84,8 @@ public interface Pagination {
* @param pageNum
* The {@link WorkflowInstancePage} number to get.
* @param status
- * Identifies which {@link WorkflowInstance} set to paginate,
- * e.g., only {@link WorkflowInstance}s with a given status.
+ * Identifies which {@link org.apache.oodt.cas.workflow.structs.WorkflowInstance} set to paginate,
+ * e.g., only {@link org.apache.oodt.cas.workflow.structs.WorkflowInstance}s with a given status.
*
* @return The {@link WorkflowInstancePage} with the given status, and page
* number.
[7/7] oodt git commit: OODT-886 fix unused imports
Posted by ma...@apache.org.
OODT-886 fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/afb8fdc4
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/afb8fdc4
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/afb8fdc4
Branch: refs/heads/master
Commit: afb8fdc4fe71105a37546dc43a118c61926f27af
Parents: 9a2597e
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 9 16:35:17 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 9 16:35:17 2015 +0100
----------------------------------------------------------------------
.../xmlquery/ChunkedProductInputStream.java | 6 ++---
.../org/apache/oodt/xmlquery/LargeResult.java | 1 -
.../oodt/profile/RangedProfileElement.java | 10 ++++----
.../handlers/DatabaseProfileManager.java | 26 +++++++++++---------
.../oodt/profile/handlers/ProfileHandler.java | 5 ++--
.../oodt/profile/handlers/ProfileManager.java | 7 +++---
.../lightweight/LightweightProfileServer.java | 23 ++++++-----------
.../SearchableEnumeratedProfileElement.java | 2 --
.../lightweight/SearchableProfileElement.java | 1 -
.../xmlps/queryparser/HandlerQueryParser.java | 11 ++++-----
.../org/apache/oodt/xmlquery/Statistic.java | 12 ++++-----
11 files changed, 45 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
index 8988f8d..b5dceee 100644
--- a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
+++ b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
@@ -18,12 +18,12 @@
package org.apache.oodt.xmlquery;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
import org.apache.oodt.product.ProductException;
import org.apache.oodt.product.Retriever;
+import java.io.IOException;
+import java.io.InputStream;
+
/**
* Streamer for chunked products.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java b/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java
index efc6102..e05414e 100644
--- a/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java
+++ b/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java
@@ -20,7 +20,6 @@ package org.apache.oodt.xmlquery;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.oodt.product.Retriever;
import java.io.InputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
index 769826f..5c98743 100644
--- a/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
+++ b/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
@@ -18,15 +18,15 @@
package org.apache.oodt.profile;
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Resource;
import org.apache.oodt.commons.util.XML;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Resource;
+
import java.net.URI;
+import java.util.Collections;
+import java.util.List;
/**
* Ranged profile element.
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
index 73eb294..af95a44 100755
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
@@ -15,17 +15,21 @@
package org.apache.oodt.profile.handlers;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.sql.*;
-import java.util.*;
-import org.apache.oodt.commons.Configuration;
-import org.apache.oodt.commons.util.DOMParser;
-import org.apache.oodt.commons.util.*;
-import org.apache.oodt.xmlquery.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import org.apache.oodt.profile.*;
+import org.apache.oodt.commons.util.XML;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileException;
+import org.apache.oodt.profile.ProfileSQLException;
+import org.apache.oodt.xmlquery.XMLQuery;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
/**********************************************************************************
**
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java
index f66ae3e..b7cf85a 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java
@@ -18,12 +18,11 @@
package org.apache.oodt.profile.handlers;
-import java.util.Collection;
-import java.util.List;
import org.apache.oodt.profile.Profile;
import org.apache.oodt.profile.ProfileException;
import org.apache.oodt.xmlquery.XMLQuery;
-import org.w3c.dom.Document;
+
+import java.util.List;
/**
* Interface of a profile handler.
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
index f7d17c8..c5aa987 100755
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
@@ -15,12 +15,11 @@
package org.apache.oodt.profile.handlers;
-import java.util.Collection;
-import java.util.Iterator;
import org.apache.oodt.profile.Profile;
import org.apache.oodt.profile.ProfileException;
-import org.apache.oodt.xmlquery.XMLQuery;
-import org.w3c.dom.Document;
+
+import java.util.Collection;
+import java.util.Iterator;
/**
* Interface of a profile manager.
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
index 29977ea..947d67f 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
@@ -18,25 +18,11 @@
package org.apache.oodt.profile.handlers.lightweight;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-import org.apache.oodt.commons.Configuration;
-import org.apache.oodt.commons.ExecServerConfig;
+import org.apache.oodt.commons.util.DOMParser;
+import org.apache.oodt.commons.util.XML;
import org.apache.oodt.profile.Profile;
import org.apache.oodt.profile.ProfileException;
import org.apache.oodt.profile.handlers.ProfileHandler;
-import org.apache.oodt.commons.util.DOMParser;
-import org.apache.oodt.commons.util.XML;
import org.apache.oodt.xmlquery.QueryElement;
import org.apache.oodt.xmlquery.XMLQuery;
import org.w3c.dom.Document;
@@ -46,6 +32,11 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+
/**
* A lightweight profile server.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java
index 3f99bce..67168b0 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java
@@ -18,8 +18,6 @@
package org.apache.oodt.profile.handlers.lightweight;
-import java.rmi.RemoteException;
-import org.apache.oodt.xmlquery.XMLQuery;
import org.apache.oodt.profile.EnumeratedProfileElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java
index 39a8093..141de78 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java
@@ -18,7 +18,6 @@
package org.apache.oodt.profile.handlers.lightweight;
-import org.apache.oodt.profile.ProfileElement;
/**
* A profile element that can be searched.
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
index a3a18fd..a49d429 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java
@@ -20,17 +20,16 @@ package org.apache.oodt.xmlps.queryparser;
//JDK imports
import org.apache.oodt.xmlps.mapping.Mapping;
import org.apache.oodt.xmlps.mapping.MappingField;
+import org.apache.oodt.xmlquery.QueryElement;
import java.util.List;
import java.util.Stack;
//OODT imports
-import org.apache.oodt.xmlquery.QueryElement;
-import org.apache.oodt.xmlquery.XMLQuery;
/**
*
- * Parsers the {@link XMLQuery} and its @link XMLQuery#getWhereElementSet()}
+ * Parsers the {@link org.apache.oodt.xmlquery.XMLQuery} and its @link XMLQuery#getWhereElementSet()}
* into an {@link Expression} tree.
*/
public class HandlerQueryParser implements ParseConstants {
@@ -38,7 +37,7 @@ public class HandlerQueryParser implements ParseConstants {
/**
* Calls {@link #parse(Stack, Mapping)} with a null mapping.
*
- * @param queryStack The {@link XMLQuery#getWhereElementSet()}.
+ * @param queryStack The {@link org.apache.oodt.xmlquery.XMLQuery#getWhereElementSet()}.
* @return The parsed {@link Expression} tree.
*/
public static Expression parse(Stack<QueryElement> queryStack) {
@@ -47,10 +46,10 @@ public class HandlerQueryParser implements ParseConstants {
/**
*
- * Parses the {@link XMLQuery#getWhereElementSet()} using the provided
+ * Parses the {@link org.apache.oodt.xmlquery.XMLQuery#getWhereElementSet()} using the provided
* <param>map</param>.
*
- * @param queryStack The {@link XMLQuery#getWhereElementSet()}
+ * @param queryStack The {@link org.apache.oodt.xmlquery.XMLQuery#getWhereElementSet()}
* @param map The provided ontological mapping.
* @return The parsed {@link Expression} tree.
*/
http://git-wip-us.apache.org/repos/asf/oodt/blob/afb8fdc4/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java
index c706ba2..409f6f6 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java
@@ -21,13 +21,11 @@
package org.apache.oodt.xmlquery;
-import java.io.*;
-import java.util.*;
-import org.apache.oodt.commons.Configuration;
-import org.apache.oodt.commons.util.DOMParser;
-import org.apache.oodt.commons.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.apache.oodt.commons.util.XML;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* EDM Statisti class.