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 <[email protected]> Authored: Fri Oct 9 15:58:24 2015 +0100 Committer: Tom Barber <[email protected]> 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
