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:32 UTC
[6/7] oodt git commit: OODT-886 fix unused imports
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.