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 2016/01/11 00:42:00 UTC
[1/2] oodt git commit: remove empty if statements
Repository: oodt
Updated Branches:
refs/heads/master 5c5f0cbb9 -> 0e3305c09
remove empty if statements
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/a8934d06
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/a8934d06
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/a8934d06
Branch: refs/heads/master
Commit: a8934d06a1887f5eaf607091621c8cb9c93740ab
Parents: 5c5f0cb
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Jan 10 22:29:20 2016 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Jan 10 22:29:20 2016 +0000
----------------------------------------------------------------------
.../oodt/cas/filemgr/browser/controller/TableListener.java | 2 +-
.../java/org/apache/oodt/cas/pushpull/expressions/Method.java | 4 ++--
.../main/java/org/apache/oodt/cas/resource/examples/LongJob.java | 2 +-
.../java/org/apache/oodt/cas/resource/util/XmlStructFactory.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/a8934d06/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
index 48544c9..7f49328 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/TableListener.java
@@ -145,7 +145,7 @@ public class TableListener implements MouseListener, ActionListener {
HSSFRow row = sheet.createRow((short) k + 1);
i = 0;
for (int j = 0; j < table.getRow(0).getComponentCount(); j++) {
- if (!table.hiddenCols.contains(new Integer(j))) {
+ if (!table.hiddenCols.contains(j)) {
row.createCell((short) i).setCellValue(
(table.getRow(k)).getText(j));
i++;
http://git-wip-us.apache.org/repos/asf/oodt/blob/a8934d06/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
index 783d332..ed1991c 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
@@ -72,7 +72,7 @@ public class Method {
if (nextLoc >= 0) {
switch (argTypes.get(nextLoc)) {
case INT:
- addArg(new Variable(null, new Integer(value)));
+ addArg(new Variable(null, Integer.valueOf(value)));
break;
case STRING:
addArg(new Variable(null, value));
@@ -151,7 +151,7 @@ public class Method {
break;
}
}
- output.addLast(new Variable(null, new Integer(
+ output.addLast(new Variable(null, Integer.valueOf(
variableIntString.toString())));
i = k - 1;
break;
http://git-wip-us.apache.org/repos/asf/oodt/blob/a8934d06/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java b/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java
index 1e4684c..77f71e4 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java
@@ -55,7 +55,7 @@ public class LongJob implements JobInstance, JobMetadata {
NameValueJobInput input = (NameValueJobInput) in;
int waitTime;
- waitTime = new Integer(input.getValue("wait"));
+ waitTime = Integer.valueOf(input.getValue("wait"));
System.out.println("LongJob running for " + waitTime + " sec");
http://git-wip-us.apache.org/repos/asf/oodt/blob/a8934d06/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
index b8f5409..7377edd 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
@@ -74,7 +74,7 @@ public final class XmlStructFactory {
.getAttribute("envReplace")) ? PathUtils
.doDynamicReplacement(resourceNodeRoot.getAttribute("ip"))
: resourceNodeRoot.getAttribute("ip"));
- capacity = new Integer(resourceNodeRoot.getAttribute("capacity"));
+ capacity = Integer.valueOf(resourceNodeRoot.getAttribute("capacity"));
} catch (Exception e) {
LOG.log(Level.SEVERE, e.getMessage());
}
[2/2] oodt git commit: remove commented out code
Posted by ma...@apache.org.
remove commented out code
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/0e3305c0
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/0e3305c0
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/0e3305c0
Branch: refs/heads/master
Commit: 0e3305c0922060a70b4416494780f8f1a107e057
Parents: a8934d0
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Jan 10 23:10:06 2016 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Jan 10 23:10:06 2016 +0000
----------------------------------------------------------------------
.../oodt/cas/filemgr/browser/model/CasDB.java | 3 +-
.../cas/filemgr/browser/view/MainWindow.java | 1 -
.../browser/view/menus/RightClickMenu.java | 8 --
.../perspective/view/impl/DefaultPropView.java | 15 +--
.../perspective/view/impl/DefaultTreeView.java | 26 ++---
.../mapping/MemoryBasedIngestMapper.java | 1 -
.../catalog/repository/CatalogRepository.java | 36 +-----
.../AbstractCommunicationChannelServer.java | 57 +---------
.../channel/CommunicationChannelClient.java | 31 +----
.../XmlRpcCommunicationChannelClient.java | 67 +----------
.../XmlRpcCommunicationChannelServer.java | 63 +----------
.../struct/impl/index/DataSourceIndex.java | 29 -----
.../system/impl/CatalogServiceLocal.java | 6 +-
.../oodt/cas/catalog/util/QueryUtils.java | 62 +---------
.../org/apache/oodt/commons/util/JDBC_DB.java | 22 ----
.../cas/curation/service/MetadataResource.java | 4 -
.../oodt/cas/filemgr/catalog/LuceneCatalog.java | 2 -
.../cas/filemgr/catalog/ScienceDataCatalog.java | 9 --
.../extractors/AbstractFilemgrMetExtractor.java | 5 -
.../extractors/examples/MimeTypeExtractor.java | 2 -
.../org/apache/oodt/pcs/pedigree/Pedigree.java | 5 -
.../apache/oodt/pcs/util/FileManagerUtils.java | 1 -
.../apache/oodt/pcs/input/PGEDataHandler.java | 11 +-
.../apache/oodt/profile/gui/LeafListener.java | 22 +---
.../oodt/cas/protocol/http/HttpProtocol.java | 113 +------------------
.../oodt/cas/protocol/imaps/ImapsProtocol.java | 20 ----
.../oodt/cas/pushpull/expressions/Method.java | 13 +--
.../pushpull/filerestrictions/VirtualFile.java | 2 -
.../retrievalsystem/FileRetrievalSystem.java | 3 -
.../processor/WorkflowProcessorHelper.java | 12 +-
.../oodt/cas/workflow/util/DbStructFactory.java | 6 -
31 files changed, 46 insertions(+), 611 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/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 ffb57d0..ef7109e 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
@@ -71,7 +71,7 @@ public class CasDB {
types = new String[v.size()];
} catch (RepositoryManagerException e) {
- // LOG.log(Level.SEVERE, e.getMessage());
+ LOG.log(Level.SEVERE, e.getMessage());
}
} else {
@@ -142,7 +142,6 @@ public class CasDB {
type = client.getProductTypeByName(productType);
Vector<Product> products = (Vector<Product>) client
.getProductsByProductType(type);
- // for(int i=0;i<products.size();i++){
int maxVal = INT;
if (products.size() < maxVal) {
maxVal = products.size();
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/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 a30448e..65fd483 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
@@ -39,7 +39,6 @@ public class MainWindow extends JFrame {
public MainWindow() {
wListener = new WindowListener(this);
- // db = new CasDB();
setName("CAS File Manager Browser");
setDefaultCloseOperation(EXIT_ON_CLOSE);
qPane = new QueryPane(wListener);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/RightClickMenu.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/RightClickMenu.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/RightClickMenu.java
index 854cfb3..0c0f64c 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/RightClickMenu.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/menus/RightClickMenu.java
@@ -27,33 +27,25 @@ public class RightClickMenu extends JPopupMenu {
private JMenuItem hideItem;
private JMenuItem unhideItem;
- // private JMenuItem resizeItem;
-
public RightClickMenu(ActionListener listener) {
hideItem = new JMenuItem("Hide");
hideItem.addActionListener(listener);
unhideItem = new JMenuItem("Unhide");
unhideItem.addActionListener(listener);
- // resizeItem = new JMenuItem("Resize");
- // resizeItem.addActionListener(listener);
this.add(hideItem);
this.add(unhideItem);
- // this.addSeparator();
- // this.add(resizeItem);
}
public void setUnhideMode() {
hideItem.setEnabled(false);
unhideItem.setEnabled(true);
- // resizeItem.setEnabled(false);
}
public void setHideMode() {
hideItem.setEnabled(true);
unhideItem.setEnabled(false);
- // resizeItem.setEnabled(true);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
index 1f09521..3a98e29 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultPropView.java
@@ -17,7 +17,6 @@
package org.apache.oodt.cas.workflow.gui.perspective.view.impl;
-//JDK imports
import org.apache.commons.lang.StringUtils;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
@@ -73,8 +72,6 @@ import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
-//Apache imports
-//OODT imports
/**
*
@@ -156,8 +153,7 @@ public class DefaultPropView extends View {
.getMetadata(key + "/envReplace"))));
rows.add(row);
}
- table = new JTable();// rows, new Vector<String>(Arrays.asList(new
- // String[] { "key", "values", "envReplace" })));
+ table = new JTable();
table.setModel(new AbstractTableModel() {
public String getColumnName(int col) {
switch (col) {
@@ -234,7 +230,6 @@ public class DefaultPropView extends View {
Arrays.asList(new String[] { "key", "values", "envReplace" })));
}
- // table.setFillsViewportHeight(true);
table.setSelectionBackground(Color.cyan);
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
TableCellRenderer cellRenderer = new TableCellRenderer() {
@@ -276,7 +271,7 @@ public class DefaultPropView extends View {
public void mouseClicked(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON3
&& DefaultPropView.this.table.getSelectedRow() != -1) {
- int row = DefaultPropView.this.table.getSelectedRow();// rowAtPoint(DefaultPropView.this.table.getMousePosition());
+ int row = DefaultPropView.this.table.getSelectedRow();
String key = getKey(
(String) DefaultPropView.this.table.getValueAt(row, 1), state);
Metadata staticMet = state.getSelected().getModel()
@@ -312,7 +307,7 @@ public class DefaultPropView extends View {
override = new JMenuItem(OVERRIDE);
override.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- int row = DefaultPropView.this.table.getSelectedRow();// rowAtPoint(DefaultPropView.this.table.getMousePosition());
+ int row = DefaultPropView.this.table.getSelectedRow();
String key = getKey(
(String) DefaultPropView.this.table.getValueAt(row, 1), state);
Metadata staticMet = state.getSelected().getModel().getStaticMetadata();
@@ -338,7 +333,7 @@ public class DefaultPropView extends View {
delete.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- int row = DefaultPropView.this.table.getSelectedRow();// rowAtPoint(DefaultPropView.this.table.getMousePosition());
+ int row = DefaultPropView.this.table.getSelectedRow();
String key = getKey(
(String) DefaultPropView.this.table.getValueAt(row, 1), state);
Metadata staticMet = state.getSelected().getModel().getStaticMetadata();
@@ -596,8 +591,6 @@ public class DefaultPropView extends View {
public void actionPerformed(ActionEvent e) {
if (!graph.getModel().getModelName().equals(e.getActionCommand())) {
- // GuiUtils.updateGraphModelName(getState(),
- // graph.getModel().getModelId(), e.getActionCommand());
graph.getModel().setModelName(e.getActionCommand());
DefaultPropView.this.notifyListeners();
DefaultPropView.this.refreshView(state);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
index da9c7ef..35e5c20 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/DefaultTreeView.java
@@ -17,7 +17,14 @@
package org.apache.oodt.cas.workflow.gui.perspective.view.impl;
-//JDK imports
+import org.apache.commons.lang.StringUtils;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
+import org.apache.oodt.cas.workflow.gui.perspective.view.View;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange;
+import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
+import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -28,9 +35,10 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.List;
import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
+
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@@ -41,16 +49,6 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeCellRenderer;
import javax.swing.tree.TreePath;
-//Apache imports
-import org.apache.commons.lang.StringUtils;
-
-//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.gui.model.ModelGraph;
-import org.apache.oodt.cas.workflow.gui.perspective.view.View;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewChange;
-import org.apache.oodt.cas.workflow.gui.perspective.view.ViewState;
-import org.apache.oodt.cas.workflow.gui.util.GuiUtils;
/**
*
@@ -153,7 +151,6 @@ public class DefaultTreeView extends View {
tree.add(this.actionsMenu);
if (state.getSelected() != null) {
- // System.out.println("SELECTED: " + state.getSelected());
TreePath treePath = this.getTreePath(root, state.getSelected());
if (state.getCurrentMetGroup() != null) {
treePath = this.getTreePath(treePath, state);
@@ -435,9 +432,6 @@ public class DefaultTreeView extends View {
.getFirstPropertyValue(EXPAND_PRECONDITIONS))
|| Boolean.parseBoolean(state
.getFirstPropertyValue(EXPAND_POSTCONDITIONS))) {
- // if (node.getUserObject() instanceof String &&
- // (node.getUserObject().equals("pre-conditions") ||
- // node.getUserObject().equals("post-conditions"))) {
ModelGraph graph = state.getSelected();
if (Boolean.parseBoolean(state
.getFirstPropertyValue(EXPAND_PRECONDITIONS))) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java
index 5900ca0..281c23c 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java
@@ -67,7 +67,6 @@ public class MemoryBasedIngestMapper implements IngestMapper {
throws CatalogRepositoryException {
LOG.log(Level.INFO, "Looking up CatalogService TransactionId for Catalog TransactionId '" + catalogTransactionId + "' and catalog '" + catalogId + "'");
String key = generateKey(catalogTransactionId.toString(), catalogId);
-// System.out.println("LOOKING UP: " + key);
TransactionIdMapping mapping = this.catalogInfoKeyMapping.get(key);
if (mapping != null) {
return mapping.catalogServiceTransactionId;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
index 5fdc1f7..d998d5c 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
@@ -16,15 +16,13 @@
*/
package org.apache.oodt.cas.catalog.repository;
-//JDK imports
-import java.util.List;
-import java.util.Set;
-
-//OODT imports
import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
import org.apache.oodt.cas.catalog.system.Catalog;
import org.apache.oodt.cas.catalog.util.PluginURL;
+import java.util.List;
+import java.util.Set;
+
/**
*
* @author bfoster
@@ -36,20 +34,7 @@ import org.apache.oodt.cas.catalog.util.PluginURL;
* <p>
*/
public interface CatalogRepository {
-//
-// /**
-// * Verifies if the given Catalog URN has been serialized via {@link
-// * serializeCatalog(Catalog)}
-// *
-// * @param catalogUrn
-// * The URN that unique represents the Catalog
-// * @return True if the Catalog has been serialized, false otherwise
-// * @throws CatalogRepositoryException
-// * Any Error
-// */
-// public boolean isCatalogSerialized(String catalogUrn)
-// throws CatalogRepositoryException;
-//
+
/**
* Serializes a given Catalog to the Repository
*
@@ -60,19 +45,6 @@ public interface CatalogRepository {
*/
void serializeCatalog(Catalog catalog)
throws CatalogRepositoryException;
-//
-// /**
-// * Loads a Catalog from the Repository
-// *
-// * @param catalogUrn
-// * The URN that unique represents a Catalog
-// * @return The Catalog represented by the given URN
-// * @throws CatalogRepositoryException
-// * Any Error
-// */
-// public Catalog deserializeCatalog(String catalogUrn)
-// throws CatalogRepositoryException;
-//
/**
* Removes a Catalog from the Repository
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
index 252ca96..873d997 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
@@ -94,11 +94,7 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
throw e;
}
}
-//
-// public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws CatalogServiceException {
-// this.catalogService.setRestrictQueryPermissions(restrictQueryPermissions);
-// }
-//
+
public boolean isRestrictIngestPermissions() throws CatalogServiceException {
try {
return this.catalogService.isRestrictIngestPermissions();
@@ -107,19 +103,6 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
throw e;
}
}
-//
-// public void setHasIngestPermissions(boolean restrictIngestPermissions) throws CatalogServiceException {
-// this.catalogService.setHasIngestPermissions(restrictIngestPermissions);
-// }
-
-// public Class<? extends TransactionId<?>> getTransactionIdClass() throws CatalogServiceException {
-// return this.catalogService.getTransactionIdClass();
-// }
-//
-// public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws CatalogServiceException {
-// this.catalogService.setTransactionIdClass(transactionIdClass);
-// }
-//
public void addCatalog(Catalog catalog) throws CatalogServiceException {
try {
this.catalogService.addCatalog(catalog);
@@ -213,16 +196,12 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
public void removeCatalog(String catalogId) throws CatalogServiceException {
try {
this.catalogService.removeCatalog(catalogId);
- }catch (CatalogServiceException e) {
+ } catch (CatalogServiceException e) {
LOG.log(Level.SEVERE, "Failed while removing catalog '" + catalogId + "' : " + e.getMessage(), e);
throw e;
}
}
-// public void removeCatalog(String catalogUrn, boolean preserveMapping) throws CatalogServiceException {
-// this.catalogService.removeCatalog(catalogUrn, preserveMapping);
-// }
-
public List<PluginURL> getPluginUrls() throws CatalogServiceException {
try {
return this.catalogService.getPluginUrls();
@@ -250,14 +229,6 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
throw e;
}
}
-
-// public Set<Catalog> getCurrentCatalogList() throws CatalogServiceException {
-// return this.catalogService.getCurrentCatalogList();
-// }
-//
-// public Catalog getCatalog(String catalogUrn) throws CatalogServiceException {
-// return this.catalogService.getCatalog(catalogUrn);
-// }
public Set<String> getCurrentCatalogIds() throws CatalogServiceException {
try {
@@ -312,14 +283,6 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
throw e;
}
}
-
-// public Page getFirstPage(QueryExpression queryExpression) throws Exception {
-// return this.catalogService.getFirstPage(queryExpression);
-// }
-//
-// public Page getFirstPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception {
-// return this.catalogService.getFirstPage(queryExpression, catalogIds);
-// }
public Page getNextPage(Page page) throws CatalogServiceException {
try {
@@ -348,14 +311,6 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
}
}
-// public Page getLastPage(QueryExpression queryExpression) throws Exception {
-// return this.catalogService.getLastPage(queryExpression);
-// }
-//
-// public Page getLastPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception {
-// return this.catalogService.getLastPage(queryExpression, catalogIds);
-// }
-
public List<TransactionalMetadata> getMetadata(Page page) throws CatalogServiceException {
try {
return this.catalogService.getMetadata(page);
@@ -382,10 +337,6 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
throw e;
}
}
-
-// public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws CatalogServiceException {
-// return this.catalogService.query(queryExpression, sortResults);
-// }
public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws CatalogServiceException {
try {
@@ -395,10 +346,6 @@ public abstract class AbstractCommunicationChannelServer implements Communicatio
throw e;
}
}
-
-// public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws CatalogServiceException {
-// return this.catalogService.getTransactionIdsForAllPages(queryPager);
-// }
public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws CatalogServiceException {
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
index ec9361f..63f5016 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
@@ -16,8 +16,6 @@
*/
package org.apache.oodt.cas.catalog.server.channel;
-//JDK imports
-
import org.apache.oodt.cas.catalog.exception.CatalogException;
import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
import org.apache.oodt.cas.catalog.page.CatalogReceipt;
@@ -38,8 +36,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-//OODT imports
-
/**
* @author bfoster
* @version $Revision$
@@ -54,17 +50,8 @@ public interface CommunicationChannelClient {
boolean isRestrictQueryPermissions() throws CatalogException;
-// public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws Exception;
-
boolean isRestrictIngestPermissions() throws CatalogException;
-// public void setHasIngestPermissions(boolean restrictIngestPermissions) throws Exception;
-
-// public Class<? extends TransactionId<?>> getTransactionIdClass() throws Exception;
-//
-// public void setTransactionIdClass(Class<? extends TransactionId<?>> transactionIdClass) throws Exception;
-//
-
void addCatalog(Catalog catalog) throws CatalogException;
void replaceCatalog(Catalog catalog) throws CatalogException;
@@ -88,8 +75,6 @@ public interface CommunicationChannelClient {
void removeCatalog(String catalogUrn) throws CatalogException;
-// public void removeCatalog(String catalogUrn, boolean preserveMapping) throws Exception;
-
List<PluginURL> getPluginUrls() throws CatalogException;
void addPluginUrls(List<PluginURL> pluginUrls) throws CatalogException;
@@ -97,10 +82,6 @@ public interface CommunicationChannelClient {
URL getPluginStorageDir() throws CatalogException;
void transferUrl(URL fromUrl, URL toUrl) throws CatalogException;
-
-// public Set<Catalog> getCurrentCatalogList() throws Exception;
-//
-// public Catalog getCatalog(String catalogUrn) throws Exception;
Set<String> getCurrentCatalogIds() throws CatalogException;
@@ -114,28 +95,18 @@ public interface CommunicationChannelClient {
Properties getCalalogProperties(String catalogUrn) throws CatalogException;
-// public Page getFirstPage(QueryExpression queryExpression) throws Exception;
-//
-// public Page getFirstPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
-
Page getNextPage(Page page) throws CatalogException;
Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws CatalogException;
Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws CatalogException;
-// public Page getLastPage(QueryExpression queryExpression) throws Exception;
-//
-// public Page getLastPage(QueryExpression queryExpression, Set<String> catalogIds) throws Exception;
-
List<TransactionalMetadata> getMetadata(Page page) throws CatalogException;
QueryPager query(QueryExpression queryExpression) throws CatalogException;
QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws CatalogException;
-
-// public QueryPager query(QueryExpression queryExpression, boolean sortResults) throws Exception;
-
+
List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws CatalogException;
List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws CatalogException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
index 9d9c6a8..51b27b4 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
@@ -330,17 +330,6 @@ public class XmlRpcCommunicationChannelClient extends AbstractCommunicationChann
}
}
-// public Catalog getCatalog(String catalogUrn) throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(catalogUrn);
-// return this.serializer.deserializeObject(Catalog.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getCatalog", args));
-// }
-
-// public CatalogRepository getCatalogRepository()
-// throws CatalogException {
-// return this.serializer.deserializeObject(CatalogRepository.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getCatalogRepository", new Vector<Object>()));
-// }
-
public TransactionId<?> getCatalogServiceTransactionId(
TransactionId<?> catalogTransactionId, String catalogUrn)
throws CatalogException {
@@ -396,14 +385,6 @@ public class XmlRpcCommunicationChannelClient extends AbstractCommunicationChann
}
}
-// public Set<Catalog> getCurrentCatalogList() throws CatalogException {
-// return this.serializer.deserializeObject(Set.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getCurrentCatalogList", new Vector<Object>()));
-// }
-//
-// public IngestMapper getIngestMapper() throws CatalogException {
-// return this.serializer.deserializeObject(IngestMapper.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getIngestMapper", new Vector<Object>()));
-// }
-
public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(
List<String> catalogServiceTransactionIdStrings)
throws CatalogException {
@@ -639,14 +620,7 @@ public class XmlRpcCommunicationChannelClient extends AbstractCommunicationChann
throw new CatalogException("Query Failed: "+ e.getMessage(), e);
}
}
-
-// public QueryPager query(QueryExpression queryExpression, boolean sortResults)
-// throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(this.serializer.serializeObject(queryExpression));
-// args.add(this.serializer.serializeObject(new Boolean(sortResults)));
-// return this.serializer.deserializeObject(QueryPager.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_query", args));
-// }
+
public void removeCatalog(String catalogUrn) throws CatalogException {
Vector<Object> args = new Vector<Object>();
@@ -660,45 +634,6 @@ public class XmlRpcCommunicationChannelClient extends AbstractCommunicationChann
}
}
-// public void removeCatalog(String catalogUrn, boolean preserveMapping)
-// throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(catalogUrn);
-// args.add(this.serializer.serializeObject(new Boolean(preserveMapping)));
-// this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_removeCatalog", args);
-// }
-
-// public void setCatalogRepository(CatalogRepository catalogRepository)
-// throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(this.serializer.serializeObject(catalogRepository));
-// this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_setCatalogRepository", args);
-// }
-
-// public void setHasIngestPermissions(boolean restrictIngestPermissions) throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(this.serializer.serializeObject(new Boolean(restrictIngestPermissions)));
-// this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_setHasIngestPermissions", args);
-// }
-
-// public void setIngestMapper(IngestMapper ingestMapper) throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(this.serializer.serializeObject(ingestMapper));
-// this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_setIngestMapper", args);
-// }
-
-// public void setRestrictQueryPermissions(boolean restrictQueryPermissions) throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(this.serializer.serializeObject(new Boolean(restrictQueryPermissions)));
-// this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_setRestrictQueryPermissions", args);
-// }
-
-// public void setTransactionIdClass(
-// Class<? extends TransactionId<?>> transactionIdClass) throws CatalogException {
-// Vector<Object> args = new Vector<Object>();
-// args.add(this.serializer.serializeObject(transactionIdClass));
-// this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_setTransactionIdClass", args);
-// }
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/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 2121a81..5540d44 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
@@ -170,10 +170,6 @@ public class XmlRpcCommunicationChannelServer extends
return this.serializer.serializeObject(this.getCalalogProperties(catalogUrn));
}
-// public String xmlrpc_getCatalog(String catalogUrn) throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getCatalog(catalogUrn));
-// }
-
public String xmlrpc_getCatalogServiceTransactionId(
String catalogTransactionIdObject, String catalogUrn)
throws CatalogServiceException {
@@ -196,10 +192,6 @@ public class XmlRpcCommunicationChannelServer extends
return this.serializer.serializeObject(this.getCurrentCatalogIds());
}
-// public String xmlrpc_getCurrentCatalogList() throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getCurrentCatalogList());
-// }
-
public String xmlrpc_getMetadataFromTransactionIdStrings(
String catalogServiceTransactionIdStringsObject)
throws CatalogServiceException {
@@ -220,15 +212,7 @@ public class XmlRpcCommunicationChannelServer extends
public String xmlrpc_getProperty(String key) throws CatalogServiceException {
return this.serializer.serializeObject(this.getProperty(key));
}
-//
-// public String xmlrpc_getTransactionIdClass() throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getTransactionIdClass());
-// }
-// public String xmlrpc_getTransactionIdsForAllPages(
-// String queryPagerObject) throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getTransactionIdsForAllPages(this.serializer.deserializeObject(QueryPager.class, queryPagerObject)));
-// }
public String xmlrpc_ingest(String metadataObject)
throws CatalogServiceException {
@@ -250,15 +234,7 @@ public class XmlRpcCommunicationChannelServer extends
public String xmlrpc_query(String queryExpressionObject, String catalogIdsObject) throws CatalogServiceException {
return this.serializer.serializeObject(this.query(this.serializer.deserializeObject(QueryExpression.class, queryExpressionObject), this.serializer.deserializeObject(Set.class, catalogIdsObject)));
}
-
-// public String xmlrpc_getFirstPage(String queryExpressionObject) throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getFirstPage(this.serializer.deserializeObject(QueryExpression.class, queryExpressionObject)));
-// }
-//
-// public String xmlrpc_getFirstPage(String queryExpressionObject, String catalogIdsObject) throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getFirstPage(this.serializer.deserializeObject(QueryExpression.class, queryExpressionObject), this.serializer.deserializeObject(Set.class, catalogIdsObject)));
-// }
-
+
public String xmlrpc_getNextPage2(String pageObject) throws CatalogServiceException {
return this.serializer.serializeObject(this.getNextPage(this.serializer.deserializeObject(Page.class, pageObject)));
}
@@ -270,47 +246,16 @@ public class XmlRpcCommunicationChannelServer extends
public String xmlrpc_getPage(String pageInfoObject, String queryExpressionObject, String catalogIdsObject) throws CatalogServiceException {
return this.serializer.serializeObject(this.getPage(this.serializer.deserializeObject(PageInfo.class, pageInfoObject), this.serializer.deserializeObject(QueryExpression.class, queryExpressionObject), this.serializer.deserializeObject(Set.class, catalogIdsObject)));
}
-
-// public String xmlrpc_getLastPage(String queryExpressionObject) throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getLastPage(this.serializer.deserializeObject(QueryExpression.class, queryExpressionObject)));
-// }
-//
-// public String xmlrpc_getLastPage(String queryExpressionObject, String catalogIdsObject) throws CatalogServiceException {
-// return this.serializer.serializeObject(this.getLastPage(this.serializer.deserializeObject(QueryExpression.class, queryExpressionObject), this.serializer.deserializeObject(Set.class, catalogIdsObject)));
-// }
-
+
public String xmlrpc_getMetadata(String pageObject) throws CatalogServiceException {
return this.serializer.serializeObject(this.getMetadata(this.serializer.deserializeObject(Page.class, pageObject)));
}
-
-// public String xmlrpc_query(String queryExpressionObject, String sortResultsObject) throws CatalogServiceException {
-// System.out.println(this.getClass().getClassLoader());
-// return this.serializer.serializeObject(this.query(this.serializer.deserializeObject(QueryExpression.class, queryExpressionObject), this.serializer.deserializeObject(Boolean.class, sortResultsObject)));
-// }
+
public boolean xmlrpc_removeCatalog(String catalogUrn) throws CatalogServiceException {
this.removeCatalog(catalogUrn);
return true;
}
-//
-// public boolean xmlrpc_removeCatalog(String catalogUrn, String preserveMappingObject) throws CatalogServiceException {
-// this.removeCatalog(catalogUrn, this.serializer.deserializeObject(Boolean.class, preserveMappingObject));
-// return true;
-// }
-//
-// public boolean xmlrpc_setHasIngestPermissions(String restrictIngestPermissionsObject) throws CatalogServiceException {
-// this.setHasIngestPermissions(this.serializer.deserializeObject(Boolean.class, restrictIngestPermissionsObject));
-// return true;
-// }
-//
-// public boolean xmlrpc_setRestrictQueryPermissions(String restrictQueryPermissionsObject) throws CatalogServiceException {
-// this.setRestrictQueryPermissions(this.serializer.deserializeObject(Boolean.class, restrictQueryPermissionsObject));
-// return true;
-// }
-
-// public boolean setTransactionIdClass(String transactionIdClassObject) throws CatalogServiceException {
-// this.setTransactionIdClass(this.serializer.deserializeObject(Class.class, transactionIdClassObject));
-// return true;
-// }
+
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
index cc007e0..5d8b1bd 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
@@ -16,8 +16,6 @@
*/
package org.apache.oodt.cas.catalog.struct.impl.index;
-//JDK imports
-
import org.apache.commons.lang.StringUtils;
import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
import org.apache.oodt.cas.catalog.exception.IngestServiceException;
@@ -116,33 +114,6 @@ public class DataSourceIndex implements Index, IngestService, QueryService {
* {@inheritDoc}
*/
public List<TransactionId<?>> getPage(IndexPager indexPage) {
-// Connection conn = null;
-// Statement stmt = null;
-// ResultSet rs = null;
-// try {
-// conn = this.dataSource.getConnection();
-// stmt = conn.createStatement();
-// rs = stmt.executeQuery("SELECT transaction_id,transaction_class,transaction_date FROM transactions");
-// int startLoc = pager.getPageNum() * pager.getPageSize();
-// int endLoc = startLoc + pager.getPageSize();
-// List<IngestReceipt> receipts = new Vector<IngestReceipt>();
-// for (int i = startLoc; i < endLoc && rs.next(); i++) {
-// receipts.add(new IngestReceipt(((TransactionId<?>) Class.forName(rs.getString("transaction_class")).getConstructor(String.class).newInstance(rs.getString("transaction_id"))), DateUtils.toCalendar(rs.getString("transaction_date"), DateUtils.FormatType.LOCAL_FORMAT).getTime()));
-// }
-// return rs.next();
-// }catch (Exception e) {
-// throw new CatalogIndexException("Failed to check for transaction id '" + transactionId + "' : " + e.getMessage(), e);
-// }finally {
-// try {
-// conn.close();
-// }catch(Exception e) {}
-// try {
-// stmt.close();
-// }catch(Exception e) {}
-// try {
-// rs.close();
-// }catch(Exception e) {}
-// }
return null;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
index 0e18335..92f6455 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
@@ -16,7 +16,6 @@
*/
package org.apache.oodt.cas.catalog.system.impl;
-//OODT imports
import org.apache.oodt.cas.catalog.exception.CatalogException;
import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
import org.apache.oodt.cas.catalog.mapping.IngestMapper;
@@ -858,13 +857,11 @@ public class CatalogServiceLocal implements CatalogService {
List<TransactionReceipt> indexedReceipts = new Vector<TransactionReceipt>();
for (TransactionReceipt transactionReceipt : transactionReceipts) {
try {
-// for (CatalogReceipt catalogReceipt : transactionReceipt.getCatalogReceipts()) {
if (transactionReceipt.getTransactionId() == null) {
transactionReceipt = new TransactionReceipt(
this.getCatalogServiceTransactionId(transactionReceipt.getCatalogReceipts().get(0), true),
transactionReceipt.getCatalogReceipts());
}
-// }
indexedReceipts.add(transactionReceipt);
}catch(Exception e) {
throw new CatalogServiceException(e.getMessage(), e);
@@ -1092,8 +1089,7 @@ public class CatalogServiceLocal implements CatalogService {
for (QueryExpression subQueryExpression : ((QueryLogicalGroup) queryExpression).getExpressions()) {
childrenQueryResults.add(queryRecur(subQueryExpression, restrictToCatalogIds));
}
-
- // if (QueryLogicalGroup's operator is AND and is unbalanced or a child contains query results)
+
if ((((QueryLogicalGroup) queryExpression).getOperator().equals(QueryLogicalGroup.Operator.AND) && containsUnbalancedCatalogInterest(childrenQueryResults)) || containsTranactionReceipts(childrenQueryResults)) {
for (QueryResult childQueryResult : childrenQueryResults) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java
index b38caaa..9062ef2 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java
@@ -16,11 +16,6 @@
*/
package org.apache.oodt.cas.catalog.util;
-//JDK imports
-import java.util.List;
-import java.util.Vector;
-
-//OODT imports
import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
import org.apache.oodt.cas.catalog.query.QueryExpression;
import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
@@ -30,7 +25,8 @@ import org.apache.oodt.cas.catalog.query.parser.ParseException;
import org.apache.oodt.cas.catalog.query.parser.QueryParser;
import org.apache.oodt.cas.catalog.query.parser.TokenMgrError;
-//OODT imports
+import java.util.List;
+import java.util.Vector;
/**
* @author bfoster
@@ -91,57 +87,5 @@ public class QueryUtils {
System.out.println(qe.toString());
System.out.println(simplifyQuery(qe).toString());
}
-
-// public static QueryExpression convertAndsToOrs(QueryExpression queryExpression) {
-// if (queryExpression instanceof QueryLogicalGroup) {
-// if (((QueryLogicalGroup) queryExpression).getOperator().equals(QueryLogicalGroup.Operator.AND)) {
-// QueryLogicalGroup convertedQueryExpression = new QueryLogicalGroup();
-// convertedQueryExpression.setOperator(QueryLogicalGroup.Operator.OR);
-// for (QueryExpression subQueryExpression : ((QueryLogicalGroup) queryExpression).getExpressions())
-// convertedQueryExpression.addExpression(new NotQueryExpression(convertAndsToOrs(subQueryExpression)));
-// return new NotQueryExpression(convertedQueryExpression);
-// }else {
-// QueryLogicalGroup convertedQueryExpression = new QueryLogicalGroup();
-// convertedQueryExpression.setOperator(QueryLogicalGroup.Operator.OR);
-// for (QueryExpression subQueryExpression : ((QueryLogicalGroup) queryExpression).getExpressions())
-// convertedQueryExpression.addExpression(convertAndsToOrs(subQueryExpression));
-// return convertedQueryExpression;
-// }
-// }else if (queryExpression instanceof NotQueryExpression) {
-// return new NotQueryExpression(convertAndsToOrs(((NotQueryExpression) queryExpression).getQueryExpression()));
-// }else {
-// return queryExpression;
-// }
-// }
-//
-// public static QueryExpression reduceNots(QueryExpression queryExpression) {
-// if (queryExpression instanceof NotQueryExpression) {
-// NotQueryExpression notQueryExpression = (NotQueryExpression) queryExpression;
-// if (notQueryExpression.getQueryExpression() instanceof QueryLogicalGroup && ((QueryLogicalGroup) notQueryExpression.getQueryExpression()).getOperator().equals(QueryLogicalGroup.Operator.OR)) {
-// QueryLogicalGroup queryLogicalGroup = (QueryLogicalGroup) notQueryExpression.getQueryExpression();
-// QueryLogicalGroup newQueryLogicalGroup = new QueryLogicalGroup();
-// newQueryLogicalGroup.setOperator(QueryLogicalGroup.Operator.AND);
-// for (QueryExpression subQueryExpression : queryLogicalGroup.getExpressions()) {
-// if (subQueryExpression instanceof NotQueryExpression) {
-// newQueryLogicalGroup.addExpression(reduceNots(((NotQueryExpression) subQueryExpression).getQueryExpression()));
-// }else {
-// newQueryLogicalGroup.addExpression(new NotQueryExpression(reduceNots(subQueryExpression)));
-// }
-// }
-// return newQueryLogicalGroup;
-// }else {
-// return new NotQueryExpression(reduceNots(notQueryExpression.getQueryExpression()));
-// }
-// }else if (queryExpression instanceof QueryLogicalGroup){
-// QueryLogicalGroup queryLogicalGroup = (QueryLogicalGroup) queryExpression;
-// QueryLogicalGroup newQueryLogicalGroup = new QueryLogicalGroup();
-// newQueryLogicalGroup.setOperator(queryLogicalGroup.getOperator());
-// for (QueryExpression subQueryExpression : queryLogicalGroup.getExpressions())
-// newQueryLogicalGroup.addExpression(reduceNots(subQueryExpression));
-// return newQueryLogicalGroup;
-// }else {
-// return queryExpression;
-// }
-// }
-
+
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java b/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
index cf0ee04..9bf1b35 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/JDBC_DB.java
@@ -188,8 +188,6 @@ public class JDBC_DB
stmt = null;
} catch (SQLException e) {
System.err.println("Ignoring database close connection exception");
- //System.err.println("Ignoring exception " + e.getClass().getName() + ": " + e.getMessage());
- //LOG.log(Level.SEVERE, e.getMessage());
}
}
@@ -280,22 +278,13 @@ public class JDBC_DB
throw new IllegalStateException("Connection got closed!");
}
-
- //long time0 = System.currentTimeMillis();
stmt = connect.createStatement();
- //long time = System.currentTimeMillis();
- //System.err.println("###### Creating a new statement: " + (time - time0));
- //time0 = time;
if (rs!=null) {
rs.close();
}
rs = stmt.executeQuery(sql_command);
- //time = System.currentTimeMillis();
- //System.err.println("###### Executing the query: " + (time - time0));
-
-
return(rs);
@@ -414,17 +403,6 @@ public class JDBC_DB
public String toDateStr(java.util.Date inDate)
{
- String outDate;
-/*
- outDate = Integer.toString(inDate.getDate()) + "-" +
- Integer.toString(inDate.getMonth() + 1) + "-" +
- Integer.toString(inDate.getYear()) + " " +
- Integer.toString(inDate.getHours()) + ":" +
- Integer.toString(inDate.getMinutes()) + ":" +
- Integer.toString(inDate.getSeconds());
- return(outDate);
-*/
-
SimpleDateFormat fmt = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
return fmt.format(inDate);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
index 0d2bd2e..e9e5953 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
@@ -133,8 +133,6 @@ public class MetadataResource extends CurationService {
@QueryParam("configId") String configId,
@DefaultValue("false") @QueryParam("overwrite") Boolean overwrite,
@Context HttpServletRequest req, @Context HttpServletResponse res) {
-
- // this.sendRedirect("login.jsp", uriInfo, res);
Metadata metadata;
@@ -256,7 +254,6 @@ public class MetadataResource extends CurationService {
@DefaultValue(FORMAT_HTML) @QueryParam("format") String format,
@Context HttpServletRequest req, @Context HttpServletResponse res) {
- // this.sendRedirect("login.jsp", uriInfo, res);
// Call file manager to get metadata
Product prod;
Metadata metadata;
@@ -307,7 +304,6 @@ public class MetadataResource extends CurationService {
@DefaultValue(FORMAT_HTML) @QueryParam("format") String format,
@Context HttpServletRequest req, @Context HttpServletResponse res) {
- // this.sendRedirect("login.jsp", uriInfo, res);
Metadata metadata;
String[] idParts = id.split("/", 3);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
index d3c297a..26bb983 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
@@ -985,9 +985,7 @@ public class LuceneCatalog implements Catalog {
Document doc = toDoc(cp.getProduct(), cp.getMetadata());
writer.addDocument(doc);
- // take this out for now
// TODO: determine a better way to optimize the index
- // writer.optimize();
} catch (IOException e) {
LOG.log(Level.WARNING, "Unable to index product: ["
+ cp.getProduct().getProductName() + "]: Message: "
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
index b91b83e..4b7a24a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
@@ -16,7 +16,6 @@
*/
package org.apache.oodt.cas.filemgr.catalog;
-//JDK imports
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductPage;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -45,8 +44,6 @@ import java.util.regex.Pattern;
import javax.sql.DataSource;
-//OODT imports
-
/**
*
* Provides a Catalog implementation that facilitate large-scale ingest of
@@ -122,7 +119,6 @@ public class ScienceDataCatalog implements Catalog {
// CGOODALE int to count how many times this thing loops
int iterCount = 0;
- // String loopCounterString = "";
for (String dataPoint : dataPoints) {
@@ -158,8 +154,6 @@ public class ScienceDataCatalog implements Catalog {
// no datasets contain seconds at this time
// including this code would cause some datasets to
// parse Z, into seconds
- // queryBuffer.append(":");
- // queryBuffer.append(components[3].substring(13, 15)); //ss
queryBuffer.append('"'); // End time
queryBuffer.append(" , ");
queryBuffer.append(components[4]); // Value
@@ -329,7 +323,6 @@ public class ScienceDataCatalog implements Catalog {
// Try to commit the query
try {
- // LOG.log(Level.INFO,"Query: " + query);
conn = this.dataSource.getConnection();
conn.setAutoCommit(false);
statement = conn.createStatement();
@@ -391,8 +384,6 @@ public class ScienceDataCatalog implements Catalog {
public Metadata getMetadata(Product product) throws CatalogException {
Metadata met = new Metadata();
- // met.addMetadata("StartDateTime", this.getStartDateTime(product));
- // met.addMetadata("EndDateTime", this.getEndDateTime(product));
met.addMetadata("Filename", product.getProductName());
met.addMetadata("ProductType", product.getProductType().getName());
met.addMetadata("FileLocation", "Unknown");
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
index 13d71fa..d359734 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
@@ -91,11 +91,6 @@ public abstract class AbstractFilemgrMetExtractor implements
throw new MetExtractionException("Product references undefined");
}
- /*
- * if (met == null || (met != null && (met.getHashtable() == null ||
- * (met .getHashtable() != null && met.getHashtable().keySet() .size() ==
- * 0)))) { throw new MetExtractionException("Metadata undefined"); }
- */
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
index 83665f0..675de83 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
@@ -62,8 +62,6 @@ public class MimeTypeExtractor extends AbstractFilemgrMetExtractor {
if (product.getProductStructure().equals(Product.STRUCTURE_FLAT)) {
Reference prodRef = (Reference) product.getProductReferences().get(
0);
- /*Reference mimeRef = new Reference(prodRef.getOrigReference(),
- prodRef.getDataStoreReference(), prodRef.getFileSize());*/
extractMet.addMetadata(MIME_TYPE, prodRef.getMimeType().getName());
extractMet.addMetadata(MIME_TYPE, prodRef.getMimeType()
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java b/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
index 7f6f7b3..b3b81fd 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
@@ -108,17 +108,12 @@ public class Pedigree implements PCSMetadata, PCSConfigMetadata {
PedigreeTreeNode origRoot = PedigreeTreeNode
.getPedigreeTreeNodeFromProduct(orig, null);
- // System.out.println("Doing pedigree: upstream: ["+upstream+"]");
Stack roots = new Stack();
roots.add(origRoot);
do {
PedigreeTreeNode currRoot = (PedigreeTreeNode) roots.pop();
- /*
- * System.out.println("Examining root: ["+currRoot.getNodeProduct().
- * getProductName()+"]");
- */
if (upstream) {
pedProds = getUpstreamPedigreedProducts(currRoot.getNodeProduct());
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
index 1219747..abfed56 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java
@@ -163,7 +163,6 @@ public class FileManagerUtils implements PCSConfigMetadata {
for (Object productType : productTypes) {
ProductType type = (ProductType) productType;
if (excludeTypeList != null && excludeTypeList.contains(type.getName())) {
- // System.out.println("Skipping: [" + type.getName() + "]");
continue;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataHandler.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataHandler.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataHandler.java
index eb6dd19..306cee7 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataHandler.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEDataHandler.java
@@ -16,13 +16,14 @@
package org.apache.oodt.pcs.input;
//JDK imports
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Map;
-import java.util.logging.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
/**
*
* <p>
@@ -166,10 +167,6 @@ public class PGEDataHandler extends DefaultHandler implements PGEDataParseKeys {
* @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
*/
public void characters(char[] ch, int start, int length) throws SAXException {
- /*
- * String val = new String(ch, start, length).trim(); if(!val.equals("")){
- * this.charBuf.append(val); }
- */
if (isParsingScalar() || isParsingVectorElement()
|| isParsingMatrixElement()) {
this.charBuf.append(ch, start, length);
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java b/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java
index 83ac3af..b3dd729 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java
@@ -166,7 +166,6 @@ public class LeafListener extends MouseAdapter{
}
protected void menuItem2ActionPerformed(ActionEvent evt,DefaultMutableTreeNode theTreeNode,DefaultTreeModel theModel){
- //System.out.println("Adding child");
//only add child if it's one of the things that should have children
String treeNodeName = (String)theTreeNode.getUserObject();
@@ -185,7 +184,6 @@ public class LeafListener extends MouseAdapter{
protected void menuItem1ActionPerformed(ActionEvent evt,DefaultMutableTreeNode theTreeNode,DefaultTreeModel theModel){
- //System.out.println("Adding child");
//only add child if it's one of the things that should have children
String treeNodeName = (String)theTreeNode.getUserObject();
@@ -215,20 +213,13 @@ public class LeafListener extends MouseAdapter{
public void mousePressed(MouseEvent e) {
- //System.out.println("In Mouse Pressed event ");
int selectedRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selectedPath = tree.getPathForLocation(e.getX(), e.getY());
if(selectedRow != -1) {
DefaultMutableTreeNode tn //get end of current path
= (DefaultMutableTreeNode)(selectedPath.getLastPathComponent());
- // if (tn.isLeaf()){ //we need leaf only
- //write your required process for tn here
- //for instance: popupMenu.show( ..... );
- //below is a dummy process
- //String str = (String)(tn.getUserObject());
- // System.out.println(str);
-
+
JMenuItem menuItem1 = new JMenuItem("Add");
JMenuItem menuItem2 = new JMenuItem("Edit");
@@ -247,21 +238,13 @@ public class LeafListener extends MouseAdapter{
public void mouseReleased(MouseEvent e) {
- //System.out.println("In Mouse Pressed event ");
int selectedRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selectedPath = tree.getPathForLocation(e.getX(), e.getY());
if(selectedRow != -1) {
DefaultMutableTreeNode tn //get end of current path
= (DefaultMutableTreeNode)(selectedPath.getLastPathComponent());
- // if (tn.isLeaf()){ //we need leaf only
- //write your required process for tn here
- //for instance: popupMenu.show( ..... );
- //below is a dummy process
- //String str = (String)(tn.getUserObject());
- // System.out.println(str);
-
-
+
JMenuItem menuItem1 = new JMenuItem("Add");
JMenuItem menuItem2 = new JMenuItem("Edit");
@@ -292,7 +275,6 @@ public class LeafListener extends MouseAdapter{
}
public void actionPerformed(ActionEvent evt) {
- //System.out.println("Caught click");
if(type.equals("ADD")){
theLeafListener.menuItem1ActionPerformed(evt,myTreeNode,myTreeModel);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
index fd1f86c..dc0d6a8 100644
--- a/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
+++ b/protocol/http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
@@ -16,7 +16,6 @@
*/
package org.apache.oodt.cas.protocol.http;
-//OODT imports
import org.apache.oodt.cas.protocol.Protocol;
import org.apache.oodt.cas.protocol.ProtocolFile;
import org.apache.oodt.cas.protocol.auth.Authentication;
@@ -63,11 +62,11 @@ public class HttpProtocol implements Protocol {
public void cd(ProtocolFile file) throws ProtocolException {
try {
HttpFile httpFile;
- if (!(file instanceof HttpFile)) {
- URL link = HttpUtils.resolveUri(currentFile.getLink().toURI(), file.getPath()).toURL();
- httpFile = new HttpFile(link.getPath(), file.isDir(), link);
- } else {
+ if (file instanceof HttpFile) {
httpFile = (HttpFile) file;
+ } else {
+ URL link = HttpUtils.resolveUri(currentFile.getLink().toURI(), file.getPath()).toURL();
+ httpFile = new HttpFile(link.getPath(), file.isDir(), link);
}
if (!HttpUtils
@@ -216,112 +215,8 @@ public class HttpProtocol implements Protocol {
return children;
}
-// public static String findLinkInATag(String aTag) {
-// // find 'href' attribute
-// String find = aTag.substring(aTag.indexOf("href") + 4);
-// // USE STRICT FINDING FIRST
-// // (['\"])\s*?[(http)(./)(..)/#].+?\\1
-// // finds link between ' or ", which starts with one of
-// // the following: http, ./, .., /, #
-// // these starting possibilities can then be followed any
-// // number of characters until the corresponding
-// // ' or " is reached.
-// String patternRegExp = "(['\"])\\s*?[\\(http\\)\\(\\./\\)\\(\\.\\.\\)/#].+?\\1";
-// Pattern linkPattern = Pattern.compile(patternRegExp);
-// Matcher linkMatch = linkPattern.matcher(find);
-// if (linkMatch.find())
-// find = find.substring(linkMatch.start() + 1, linkMatch.end() - 1);
-// else {
-// // RELAX FINDING SOME
-// patternRegExp = "(['\"])\\s*?[^./].+?\\1";
-// linkPattern = Pattern.compile(patternRegExp);
-// linkMatch = linkPattern.matcher(find);
-// if (linkMatch.find())
-// find = find.substring(linkMatch.start() + 1, linkMatch.end() - 1);
-// else {
-// // EXTREMELY RELAX FINDING
-// patternRegExp = "[^\"='/>\\s]+?[^\\s>\"']*?";
-// linkPattern = Pattern.compile(patternRegExp);
-// linkMatch = linkPattern.matcher(find);
-// if (linkMatch.find())
-// find = find.substring(linkMatch.start(), linkMatch.end());
-// else {
-// return null;
-// }
-// }
-// }
-// return find;
-// }
-//
-// public static String createLinkFromHref(HttpFile parent, String href) {
-// if (!href.startsWith("http")) {
-// String link = parent.getLink().toExternalForm();
-// if (href.startsWith("..")) {
-// int index = link.substring(0, link.lastIndexOf("/")).lastIndexOf("/");
-// href = (index < 7) ? link + href.substring(2) : link.substring(0, link
-// .substring(0, link.lastIndexOf("/")).lastIndexOf("/"))
-// + href.substring(2);
-// } else if (href.startsWith("./")) {
-// int index = link.lastIndexOf("/");
-// href = (index < 7) ? link + href.substring(1) : link
-// .substring(0, index)
-// + href.substring(1);
-// } else if (href.startsWith("/")) {
-// URL url = parent.getLink();
-// href = url.getProtocol() + "://" + url.getHost() + href;
-// } else {
-// // find the last / in current link
-// int index = link.lastIndexOf("/");
-// // (index < 7) checks if in the current link, "/" only exists
-// // in the protocol section of link (i.e. http://jpl.nasa.gov)
-// href = (index < 7) ? link + "/" + href : link.substring(0, index) + "/"
-// + href;
-// }
-// }
-//
-// // remove "/" at end of link
-// if (href.endsWith("/"))
-// href = href.substring(0, href.length() - 1);
-// href = href.trim();
-//
-// return href;
-// }
-//
-// public ProtocolFile getProtocolFileFor(String path, boolean isDir)
-// throws ProtocolException {
-// try {
-// StringTokenizer st = new StringTokenizer(path, "/ ");
-// HttpFile curPath = this.parentFile;
-// // System.out.println(parentPath);
-// if (st.hasMoreTokens()) {
-// do {
-// String token = st.nextToken();
-// List<HttpFile> children = this.parseLink(curPath);
-// for (HttpFile pFile : children) {
-// if (pFile.getName().equals(token)) {
-// // System.out.println("token " + token + " " +
-// // pFile);
-// curPath = pFile;
-// continue;
-// }
-// }
-// } while (st.hasMoreTokens());
-// if (curPath.equals(this.parentFile))
-// return new HttpFile(path, isDir, new URL("http://"
-// + this.getSite().getHost() + path), curPath);
-// }
-// return curPath;
-// } catch (Exception e) {
-// throw new ProtocolException("Failed to get ProtocolPath for " + path);
-// }
-// }
-
public void delete(ProtocolFile file) {}
-// private URL getSite() {
-// return currentURL;
-// }
-
public static void main(String[] args) throws Exception {
String urlString = null, downloadToDir = null;
for (int i = 0; i < args.length; i++) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
----------------------------------------------------------------------
diff --git a/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java b/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
index 05b0824..ce47398 100644
--- a/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
+++ b/protocol/imaps/src/main/java/org/apache/oodt/cas/protocol/imaps/ImapsProtocol.java
@@ -53,10 +53,6 @@ import javax.mail.Part;
import javax.mail.Session;
import javax.mail.Store;
-//Javamail imports
-//APACHE imports
-//OODT imports
-//TIKA imports
/**
* IMAP Secure {@link Protocol} implementation
@@ -133,17 +129,6 @@ public class ImapsProtocol implements Protocol {
decrementConnections();
if (connectCalls <= 0) {
try {
-// if (!currentFolder.isOpen()) {
-// try {
-// currentFolder.open(Folder.READ_WRITE);
-// } catch (Exception e) {
-// try {
-// currentFolder.open(Folder.READ_ONLY);
-// } catch (Exception e2) {
-// }
-// }
-// }
-// currentFolder.close(true);
store.close();
} catch (Exception e) {
throw new ProtocolException("Failed to close connection : " + e.getMessage(), e);
@@ -171,7 +156,6 @@ public class ImapsProtocol implements Protocol {
for (Message message : messages) {
if (this.getMessageName(message).equals(fromFile.getName())) {
writeMessageToLocalFile(message, toFile);
- // message.setFlag(Flags.Flag.DELETED, true);
break;
}
}
@@ -225,9 +209,6 @@ public class ImapsProtocol implements Protocol {
}
public List<ProtocolFile> ls() throws ProtocolException {
- // if (changedDir) {
- // System.out.println("Refreshed LS");
- // currentFilesForCurrentFolder = new LinkedList<ProtocolFile>();
LinkedList<ProtocolFile> currentFilesForCurrentFolder = new LinkedList<ProtocolFile>();
try {
openFolder(currentFolder);
@@ -302,7 +283,6 @@ public class ImapsProtocol implements Protocol {
Header header = (Header) headers.nextElement();
if (header.getName().toLowerCase().equals("message-id")) {
String stringHeader = header.getValue();
- // System.out.println(stringHeader);
stringHeader = stringHeader.replace("<", "");
return stringHeader.substring(0, stringHeader.indexOf("@"));
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
index ed1991c..d61d21b 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
@@ -18,8 +18,6 @@
package org.apache.oodt.cas.pushpull.expressions;
-//OODT imports
-
import org.apache.oodt.cas.pushpull.exceptions.MethodException;
import java.util.LinkedList;
@@ -27,8 +25,6 @@ import java.util.Stack;
import java.util.logging.Level;
import java.util.logging.Logger;
-//JDK imports
-
/**
*
* @author bfoster
@@ -138,7 +134,6 @@ public class Method {
output.addLast(args.get(argNames.indexOf(variable
.toString())));
}
- // System.out.println(output);
break;
case '#':
StringBuilder variableIntString = new StringBuilder("");
@@ -160,10 +155,10 @@ public class Method {
int l = i + 1;
for (; l < infixArray.length; l++) {
char ch = infixArray[l];
- if (ch != '"') {
- variableString.append(ch);
- } else {
+ if (ch == '"') {
break;
+ } else {
+ variableString.append(ch);
}
}
output
@@ -175,14 +170,12 @@ public class Method {
case '-':
case '/':
case '*':
- // System.out.println("operators");
while (!stack.empty()
&& hasHigherPrecedence(stack.peek().toString()
.charAt(0), c)) {
output.addLast(stack.pop());
}
stack.push(new Operator(c + ""));
- // System.out.println("Stack: " + stack);
break;
case ')':
while (!stack.empty()) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java
index ce22854..ae16686 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java
@@ -18,7 +18,6 @@
package org.apache.oodt.cas.pushpull.filerestrictions;
-//JDK imports
import java.util.LinkedList;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
@@ -165,7 +164,6 @@ public class VirtualFile {
public VirtualFile getChild(String regExp, boolean isDirectory) {
for (VirtualFile vf : children) {
- // System.out.println("GETCHILD: " + regExp + " " + vf.regExp);
if ((regExp.equals(vf.regExp) || Pattern.matches(vf.regExp, regExp))
&& vf.isDir == isDirectory) {
return vf;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
index 5c211ed..6088b49 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
@@ -18,7 +18,6 @@
package org.apache.oodt.cas.pushpull.retrievalsystem;
-//OODT imports
import org.apache.oodt.cas.pushpull.config.Config;
import org.apache.oodt.cas.pushpull.config.SiteInfo;
import org.apache.oodt.cas.pushpull.exceptions.AlreadyInDatabaseException;
@@ -44,7 +43,6 @@ import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -961,7 +959,6 @@ public class FileRetrievalSystem {
for (Protocol session : avaliableSessions) {
protocolHandler.disconnect(session);
}
- // sessions.clear();
avaliableSessions.clear();
numberOfSessions = 0;
return true;
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java
index ceecc13..ae42dc4 100755
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java
@@ -16,7 +16,6 @@
*/
package org.apache.oodt.cas.workflow.engine.processor;
-//OODT imports
import org.apache.commons.lang.StringUtils;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
@@ -33,9 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
-//JDK imports
-//APACHE imports
-
/**
*
* Utilities for working with WorkflowProcessors and WorkflowModels.
@@ -75,11 +71,8 @@ public class WorkflowProcessorHelper {
+ "execution = '"
+ skeleton.getWorkflowInstance().getParentChildWorkflow()
.getGraph().getExecutionType() + "', state = '"
- + skeleton.getWorkflowInstance().getState().getName() + "']");// ,
- // properties
- // =
- // " + processor.getStaticMetadata().asHashtable() + "]");
- if (skeleton.getPreConditions() != null) {
+ + skeleton.getWorkflowInstance().getState().getName() + "']");
+ if (skeleton.getPreConditions() != null) {
stringModel.append(indent).append("{PreCond:").append(indent).append(" ")
.append(toString(skeleton.getPreConditions(), indent + " ")).append("}");
}
@@ -163,7 +156,6 @@ public class WorkflowProcessorHelper {
WorkflowLifecycle wLifecycle = getLifecycle(model);
// FIXME: I'm not sure what these excused processor Ids are. I didn't seem
// need them in the PackagedWorkflowRepository, so not sure what they do.
- // wp.setExcusedSubProcessorIds(model.getGraph().getExcusedSubProcessorIds());
wp.getWorkflowInstance().setId(instanceId);
if (model.getPreConditions() != null) {
wp.setPreConditions(buildProcessor(instanceId, model,
http://git-wip-us.apache.org/repos/asf/oodt/blob/0e3305c0/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
index 123afb0..4842813 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
@@ -90,9 +90,6 @@ public final class DbStructFactory {
task.setTaskInstanceClassName(taskClassName);
task.setTaskId(String.valueOf(rs.getInt("workflow_task_id")));
task.setTaskName(rs.getString("workflow_task_name"));
- /*if (setOrder) {
- task.setOrder(rs.getInt("task_order"));
- }*/
return task;
} else {
return null;
@@ -112,9 +109,6 @@ public final class DbStructFactory {
condition.setConditionName(rs.getString("workflow_condition_name"));
condition.setTimeoutSeconds(rs.getLong("workflow_condition_timeout"));
condition.setOptional(rs.getBoolean("workflow_condition_optional"));
- /*if (setOrder) {
- condition.setOrder(rs.getInt("condition_order"));
- }*/
return condition;
} else {
return null;