You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 23:54:41 UTC
[01/12] oodt git commit: remove unused imports
Repository: oodt
Updated Branches:
refs/heads/master dd7577b50 -> 905c96a95
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
----------------------------------------------------------------------
diff --git a/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java b/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
index 906222b..a798d26 100644
--- a/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
+++ b/xmlps/src/test/java/org/apache/oodt/xmlps/product/TestXMLPSProductHandler.java
@@ -18,7 +18,6 @@
package org.apache.oodt.xmlps.product;
//JDK imports
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
index 1cce6bc..75f9320 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java
@@ -20,7 +20,6 @@ package org.apache.oodt.xmlquery;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.oodt.product.Retriever;
import org.apache.oodt.commons.util.Documentable;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
----------------------------------------------------------------------
diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
index 365d5fd..608d947 100755
--- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
+++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
@@ -30,7 +30,6 @@ import java.io.StreamTokenizer;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
[06/12] oodt git commit: fix incorrect addition
Posted by ma...@apache.org.
fix incorrect addition
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/39397698
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/39397698
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/39397698
Branch: refs/heads/master
Commit: 3939769883b7e136a37f5c917a792ad69289f824
Parents: eadd142
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:18:35 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:18:35 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/cas/pge/config/FileStagingInfo.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/39397698/pge/src/main/java/org/apache/oodt/cas/pge/config/FileStagingInfo.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/config/FileStagingInfo.java b/pge/src/main/java/org/apache/oodt/cas/pge/config/FileStagingInfo.java
index e43f0bc..f3362d4 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/config/FileStagingInfo.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/config/FileStagingInfo.java
@@ -17,12 +17,13 @@
package org.apache.oodt.cas.pge.config;
//JDK imports
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
import java.util.List;
import java.util.Set;
//Google imports
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
/**
* Configuration information about which files should be staged and where.
@@ -63,8 +64,8 @@ public class FileStagingInfo {
productIds.add(productId);
}
- public void addProductIds(List<String> productIds) {
- productIds.addAll(productIds);
+ public void addProductIds(List<String> productIdsInc) {
+ productIds.addAll(productIdsInc);
}
public List<String> getProductIds() {
[11/12] oodt git commit: OODT-907 remove co
Posted by ma...@apache.org.
OODT-907 remove co
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/7a5e0fa3
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/7a5e0fa3
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/7a5e0fa3
Branch: refs/heads/master
Commit: 7a5e0fa3a073f6e19bde14ed01c309eed3c37868
Parents: 4a50c60
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:45:39 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:45:39 2015 +0000
----------------------------------------------------------------------
.../oodt/cas/filemgr/browser/model/CasDB.java | 10 --
.../gui/perspective/build/BuildPerspective.java | 1 -
.../oodt/cas/filemgr/tools/CatalogSearch.java | 21 ++--
.../apache/oodt/cas/pushpull/daemon/Daemon.java | 122 +++++++++----------
.../runner/AsynchronousLocalEngineRunner.java | 1 -
5 files changed, 69 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/7a5e0fa3/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 5d185c0..ca24c4f 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
@@ -26,7 +26,6 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.Metadata;
import java.net.URL;
-import java.util.Hashtable;
import java.util.Vector;
public class CasDB {
@@ -120,10 +119,7 @@ public class CasDB {
if (products.size() < maxVal)
maxVal = products.size();
for (int i = 0; i < maxVal; i++) {
- Vector<Element> elements = (Vector<Element>) client
- .getElementsByProductType(type);
Metadata m = client.getMetadata(products.get(i));
- Hashtable hash = m.getHashtable();
results.addProduct(m);
}
} catch (Exception e) {
@@ -147,10 +143,7 @@ public class CasDB {
if (products.size() < maxVal)
maxVal = products.size();
for (int i = 0; i < maxVal; i++) {
- Vector<Element> elements = (Vector<Element>) client
- .getElementsByProductType(type);
Metadata m = client.getMetadata(products.get(i));
- Hashtable hash = m.getHashtable();
results.addProduct(m);
}
} catch (Exception e) {
@@ -169,10 +162,7 @@ public class CasDB {
if (products.size() < maxVal)
maxVal = products.size();
for (int i = 0; i < maxVal; i++) {
- Vector<Element> elements = (Vector<Element>) client
- .getElementsByProductType(type);
Metadata m = client.getMetadata(products.get(i));
- Hashtable hash = m.getHashtable();
results.addProduct(m);
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7a5e0fa3/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
index 90c7d20..3209a3b 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
@@ -123,7 +123,6 @@ public class BuildPerspective extends MultiStatePerspective {
} else if (change instanceof ViewChange.REFRESH_VIEW) {
this.refresh();
} else if (change instanceof ViewChange.STATE_NAME_CHANGE) {
- ViewState state = ((ViewChange.STATE_NAME_CHANGE) change).getObject();
this.refresh();
} else if (change instanceof ViewChange.VIEW_MODEL) {
String modelId = ((ViewChange.VIEW_MODEL) change).getObject();
http://git-wip-us.apache.org/repos/asf/oodt/blob/7a5e0fa3/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
index e766167..da2fe5a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
@@ -18,6 +18,15 @@
package org.apache.oodt.cas.filemgr.tools;
//OODT imports
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.RangeQuery;
+import org.apache.lucene.search.TermQuery;
import org.apache.oodt.cas.filemgr.structs.Element;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -28,7 +37,6 @@ import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException
import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-//JDK imports
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -36,16 +44,8 @@ import java.net.URL;
import java.util.StringTokenizer;
import java.util.Vector;
+//JDK imports
//Lucene imports
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RangeQuery;
-import org.apache.lucene.search.TermQuery;
/**
*
@@ -348,7 +348,6 @@ public class CatalogSearch {
welcomeMessage += "Copyright 2006. California Institute of Technology.\n";
String usage = "CatalogSearch --url <url to File Manager service>\n";
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
- CatalogSearch cs = new CatalogSearch();
// determine url
for (int i = 0; i < args.length; i++) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/7a5e0fa3/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
index cee0373..661e242 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
@@ -55,7 +55,7 @@ import javax.management.ObjectName;
* @author bfoster
*/
public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
- DaemonMBean {
+ DaemonMBean {
private static final long serialVersionUID = 7660972939723142802L;
@@ -115,8 +115,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
* @throws SecurityException
*/
public Daemon(int rmiRegPort, int daemonID, Config config,
- DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException,
- InstantiationException {
+ DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException {
super();
this.rmiRegPort = rmiRegPort;
@@ -134,20 +133,20 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
registerRMIServer();
} catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to bind to RMI server : "
- + e.getMessage());
+ + e.getMessage());
}
try {
// registry CrawlDaemon as MBean so it can be used with jconsole
mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName name = new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
- + this.getDaemonID());
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
+ + this.getDaemonID());
mbs.registerMBean(this, name);
} catch (Exception e) {
LOG.log(Level.SEVERE,
- "Failed to register CrawlDaemon as a MBean Object : "
- + e.getMessage());
+ "Failed to register CrawlDaemon as a MBean Object : "
+ + e.getMessage());
}
}
@@ -155,18 +154,17 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
return "Daemon" + this.getDaemonID();
}
- private void registerRMIServer() throws RemoteException,
- MalformedURLException, NotBoundException, AlreadyBoundException {
+ private void registerRMIServer() throws RemoteException {
try {
Naming.bind("//localhost:" + this.rmiRegPort + "/daemon"
- + this.getDaemonID(), this);
+ + this.getDaemonID(), this);
LOG.log(Level.INFO, "Created Daemon ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort);
+ + " on RMI registry port " + this.rmiRegPort);
} catch (Exception e) {
e.printStackTrace();
throw new RemoteException("Failed to bind Daemon with ID = "
- + this.getDaemonID() + " to RMI registry at port "
- + this.rmiRegPort);
+ + this.getDaemonID() + " to RMI registry at port "
+ + this.rmiRegPort);
}
}
@@ -190,9 +188,9 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// check if Daemon should sleep first
long timeTilNextRun;
if ((timeTilNextRun = Daemon.this.calculateTimeTilNextRun()) != 0
- && !(Daemon.this.beforeToday(daemonInfo
- .getFirstRunDateTime()) && daemonInfo
- .runOnReboot()))
+ && !(Daemon.this.beforeToday(daemonInfo
+ .getFirstRunDateTime()) && daemonInfo
+ .runOnReboot()))
sleep(timeTilNextRun);
for (keepRunning = true; keepRunning;) {
@@ -211,7 +209,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
try {
rs.retrieveFiles(daemonInfo.getPropFilesInfo(),
- daemonInfo.getDataFilesInfo());
+ daemonInfo.getDataFilesInfo());
} catch (Exception e) {
e.printStackTrace();
} finally {
@@ -224,15 +222,15 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
Daemon.this.notifyDaemonListenerOfFinish();
Daemon.this.calculateAndStoreElapsedTime(startTime);
if (Daemon.this.keepRunning
- && daemonInfo.getTimeIntervalInMilliseconds() >= 0) {
+ && daemonInfo.getTimeIntervalInMilliseconds() >= 0) {
sleep(Daemon.this.calculateTimeTilNextRun());
} else {
break;
}
}
LOG.log(Level.INFO, "Daemon with ID = "
- + Daemon.this.getDaemonID() + " on RMI registry port "
- + Daemon.this.rmiRegPort + " is shutting down");
+ + Daemon.this.getDaemonID() + " on RMI registry port "
+ + Daemon.this.rmiRegPort + " is shutting down");
Daemon.this.unregister();
}
}).start();
@@ -242,10 +240,10 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
try {
// unregister CrawlDaemon from RMI registry
Naming.unbind("//localhost:" + this.rmiRegPort + "/daemon"
- + this.getDaemonID());
+ + this.getDaemonID());
this.mbs.unregisterMBean(new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
- + this.getDaemonID()));
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
+ + this.getDaemonID()));
UnicastRemoteObject.unexportObject(this, true);
this.daemonListener.wasUnregisteredWith(this);
} catch (Exception e) {
@@ -270,10 +268,10 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
return 0;
} else {
int numOfPeriods = (int) (diff / daemonInfo
- .getTimeIntervalInMilliseconds());
+ .getTimeIntervalInMilliseconds());
long nextRunTime = gcStartDateTime.getTimeInMillis()
- + ((numOfPeriods + 1) * daemonInfo
- .getTimeIntervalInMilliseconds());
+ + ((numOfPeriods + 1) * daemonInfo
+ .getTimeIntervalInMilliseconds());
return nextRunTime - now.getTimeInMillis();
}
}
@@ -295,9 +293,9 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
private void sleep(long length) {
if (length > 0) {
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort
- + " is going to sleep until "
- + new Date(System.currentTimeMillis() + length));
+ + " on RMI registry port " + this.rmiRegPort
+ + " is going to sleep until "
+ + new Date(System.currentTimeMillis() + length));
synchronized (this) {
try {
wait(length);
@@ -316,13 +314,13 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
public synchronized void pauseDaemon() {
try {
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort
- + " has been stopped");
+ + " on RMI registry port " + this.rmiRegPort
+ + " has been stopped");
this.wait(0);
} catch (Exception e) {
}
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort + " has resumed");
+ + " on RMI registry port " + this.rmiRegPort + " has resumed");
}
/**
@@ -390,24 +388,24 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
public String[] downloadedFilesInStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea().list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return !name.startsWith("Downloading_")
- && !(name.endsWith("info.tmp") || name
- .endsWith("cas"));
- }
- });
+ .getStagingArea().list(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return !name.startsWith("Downloading_")
+ && !(name.endsWith("info.tmp") || name
+ .endsWith("cas"));
+ }
+ });
}
public String[] downloadingFilesInStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea().list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return name.startsWith("Downloading_")
- && !(name.endsWith("info.tmp") || name
- .endsWith("cas"));
- }
- });
+ .getStagingArea().list(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.startsWith("Downloading_")
+ && !(name.endsWith("info.tmp") || name
+ .endsWith("cas"));
+ }
+ });
}
public int numberOfFilesDownloadingInStagingArea() {
@@ -440,36 +438,35 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// ***************DataFilesInfo*******************
public String getDataFilesRemoteSite() {
RemoteSite remoteSite = this.daemonInfo.getDataFilesInfo()
- .getDownloadInfo().getRemoteSite();
+ .getDownloadInfo().getRemoteSite();
return (remoteSite == null) ? "" : remoteSite.toString();
}
public String getDataFilesRenamingConv() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getRenamingConv();
+ .getRenamingConv();
}
public boolean getDeleteDataFilesFromServer() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .deleteFromServer();
+ .deleteFromServer();
}
public String getQueryMetadataElementName() {
String element = this.daemonInfo.getDataFilesInfo()
- .getQueryMetadataElementName();
+ .getQueryMetadataElementName();
if (element == null || element.equals(""))
- element = "Filename";
return this.daemonInfo.getDataFilesInfo().getQueryMetadataElementName();
}
public File getDataFilesStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea();
+ .getStagingArea();
}
public boolean getAllowAliasOverride() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .isAllowAliasOverride();
+ .isAllowAliasOverride();
}
// **************DataFilesInfo********************
@@ -477,18 +474,18 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// **************PropFilesInfo********************
public String getPropertyFilesRemoteSite() {
RemoteSite remoteSite = this.daemonInfo.getPropFilesInfo()
- .getDownloadInfo().getRemoteSite();
+ .getDownloadInfo().getRemoteSite();
return (remoteSite == null) ? "" : remoteSite.toString();
}
public String getPropertyFilesRenamingConv() {
return this.daemonInfo.getPropFilesInfo().getDownloadInfo()
- .getRenamingConv();
+ .getRenamingConv();
}
public boolean getDeletePropertyFilesFromServer() {
return this.daemonInfo.getPropFilesInfo().getDownloadInfo()
- .deleteFromServer();
+ .deleteFromServer();
}
public String getPropertyFilesOnSuccessDir() {
@@ -544,7 +541,6 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
if (args[i].equals("--rmiPort"))
rmiPort = Integer.parseInt(args[++i]);
else if (args[i].equals("--waitForNotification"))
- waitForCrawlNotification = true;
}
LocateRegistry.createRegistry(rmiPort);
@@ -553,16 +549,16 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// registry CrawlDaemon as MBean so it can be used with jconsole
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName name = new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon");
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon");
} catch (Exception e) {
LOG.log(Level.SEVERE,
- "Failed to register CrawlDaemon as a MBean Object : "
- + e.getMessage());
+ "Failed to register CrawlDaemon as a MBean Object : "
+ + e.getMessage());
}
} catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to create CrawlDaemon : "
- + e.getMessage());
+ + e.getMessage());
} finally {
// terminate the CrawlDaemon
LOG.log(Level.INFO, "Terminating CrawlDaemon");
@@ -570,4 +566,4 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/oodt/blob/7a5e0fa3/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
index 77d82ee..1306685 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
@@ -134,7 +134,6 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase {
for (Thread worker : this.workerMap.values())
if (worker != null) {
worker.interrupt();
- worker = null;
}
}
[04/12] oodt git commit: OODT-890 remove unneeded boxing, unboxing,
swap indexof to contains, stringbuffer to builder
Posted by ma...@apache.org.
OODT-890 remove unneeded boxing, unboxing, swap indexof to contains, stringbuffer to builder
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/1e5b0f9f
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/1e5b0f9f
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/1e5b0f9f
Branch: refs/heads/master
Commit: 1e5b0f9f274e12bf4d3460878d3f69aa91eb1546
Parents: 15df02a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:08:51 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:08:51 2015 +0000
----------------------------------------------------------------------
.../filemgr/structs/FreeTextQueryCriteria.java | 9 +++------
.../oodt/cas/filemgr/tools/SolrIndexer.java | 13 ++++---------
.../main/java/org/apache/oodt/grid/Server.java | 2 +-
.../metadata/extractors/ExternConfigReader.java | 11 ++++++-----
.../org/apache/oodt/pcs/opsui/OpsuiApp.java | 5 ++---
.../org/apache/oodt/cas/pge/util/XmlHelper.java | 2 +-
.../handlers/ofsn/AbstractCrawlLister.java | 5 ++---
.../queuerepo/TestXmlQueueRepository.java | 20 +++++++++++---------
8 files changed, 30 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
index 7615bab..5fc05e9 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
@@ -18,6 +18,7 @@
package org.apache.oodt.cas.filemgr.structs;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.StringTokenizer;
@@ -57,9 +58,7 @@ public class FreeTextQueryCriteria extends QueryCriteria {
values = new ArrayList<String>();
noiseWordHash = new HashSet<String>();
- for (String noiseWord : noiseWords) {
- noiseWordHash.add(noiseWord);
- }
+ Collections.addAll(noiseWordHash, noiseWords);
}
/**
@@ -73,9 +72,7 @@ public class FreeTextQueryCriteria extends QueryCriteria {
values = v;
noiseWordHash = new HashSet<String>();
- for (String noiseWord : noiseWords) {
- noiseWordHash.add(noiseWord);
- }
+ Collections.addAll(noiseWordHash, noiseWords);
}
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index f99b055..493d3d7 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -29,6 +29,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
@@ -747,25 +748,19 @@ public class SolrIndexer {
if (properties.getProperty(IGNORE_TYPES) != null) {
String[] values = properties.getProperty(IGNORE_TYPES).trim()
.split(",");
- for (String value : values) {
- ignoreTypes.add(value);
- }
+ Collections.addAll(ignoreTypes, values);
}
if (properties.getProperty(IGNORE_VALUES) != null) {
String[] values = properties.getProperty(IGNORE_VALUES).trim().split(
",");
- for (String value : values) {
- ignoreValues.add(value);
- }
+ Collections.addAll(ignoreValues, values);
}
if (properties.getProperty(REPLACEMENT_KEYS) != null) {
String[] values = properties.getProperty(REPLACEMENT_KEYS).trim()
.split(",");
- for (String value : values) {
- replacementKeys.add(value);
- }
+ Collections.addAll(replacementKeys, values);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/grid/src/main/java/org/apache/oodt/grid/Server.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/Server.java b/grid/src/main/java/org/apache/oodt/grid/Server.java
index f84cadf..3babd2e 100755
--- a/grid/src/main/java/org/apache/oodt/grid/Server.java
+++ b/grid/src/main/java/org/apache/oodt/grid/Server.java
@@ -87,7 +87,7 @@ public abstract class Server implements Serializable {
if (urlList.isEmpty())
clazz = Class.forName(className);
else {
- URL[] urls = (URL[]) urlList.toArray(EMPTY_URL_ARRAY);
+ URL[] urls = (URL[]) urlList.toArray(new URL[urlList.size()]);
URLClassLoader loader = new URLClassLoader(urls, getClass()
.getClassLoader());
clazz = loader.loadClass(className);
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
index 3a736eb..8bc749c 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
@@ -24,14 +24,15 @@ import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.commons.xml.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
-//JDK imports
import java.io.File;
import java.io.FileInputStream;
import java.util.Vector;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+
+//JDK imports
/**
* @author mattmann
@@ -117,7 +118,7 @@ public final class ExternConfigReader implements MetExtractorConfigReader,
}
config.setArgList((String[]) argVector
- .toArray(new String[] {}));
+ .toArray(new String[argVector.size()]));
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
index 94824a7..b8fdb02 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
@@ -33,6 +33,7 @@ import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
import org.apache.wicket.util.file.File;
import java.io.Serializable;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.Vector;
@@ -190,9 +191,7 @@ public class OpsuiApp extends WebApplication implements Serializable {
"org.apache.oodt.pcs.trace.excludeList").split(",");
List<String> excludes = new Vector<String>();
- for (String type : types) {
- excludes.add(type);
- }
+ Collections.addAll(excludes, types);
return excludes;
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
index 453f2ac..4a905fc 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
@@ -311,7 +311,7 @@ public class XmlHelper {
String writer = getWriter(fileElem, metadata);
List<String> args = getArgs(fileElem, metadata);
dynamicConfigFiles.add(new DynamicConfigFile(path, writer, args
- .toArray(new String[0])));
+ .toArray(new String[args.size()])));
}
}
return dynamicConfigFiles;
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
index 34f76f7..3159996 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
@@ -23,6 +23,7 @@ import org.apache.oodt.product.ProductException;
import java.io.File;
import java.io.FileFilter;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.Stack;
@@ -99,9 +100,7 @@ public abstract class AbstractCrawlLister implements OFSNListHandler {
productFiles = dir.listFiles(FILE_FILTER);
}
- for (File productFile : productFiles) {
- fileList.add(productFile);
- }
+ Collections.addAll(fileList, productFiles);
if (recur) {
File[] subdirs = dir.listFiles(DIR_FILTER);
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java b/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
index c2f144b..9abcdc4 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
@@ -18,15 +18,17 @@
package org.apache.oodt.cas.resource.queuerepo;
//JDK imports
+import org.apache.oodt.cas.resource.scheduler.QueueManager;
+import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
+
import java.io.File;
import java.util.Arrays;
+import java.util.Collections;
-//OODT imports
-import org.apache.oodt.cas.resource.scheduler.QueueManager;
-import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
+import junit.framework.TestCase;
+//OODT imports
//Junit imports
-import junit.framework.TestCase;
/**
* @author bfoster
@@ -50,21 +52,21 @@ public class TestXmlQueueRepository extends TestCase {
public void testMapping() throws QueueManagerException {
assertTrue(this.queueManager.getQueues().containsAll(Arrays.asList("quick", "high", "long")));
- assertEquals(this.queueManager.getNodes("quick"), Arrays.asList("localhost"));
- assertEquals(this.queueManager.getNodes("high"), Arrays.asList("localhost"));
- assertEquals(this.queueManager.getNodes("long"), Arrays.asList("localhost"));
+ assertEquals(this.queueManager.getNodes("quick"), Collections.singletonList("localhost"));
+ assertEquals(this.queueManager.getNodes("high"), Collections.singletonList("localhost"));
+ assertEquals(this.queueManager.getNodes("long"), Collections.singletonList("localhost"));
assertTrue(this.queueManager.getQueues("localhost").containsAll(Arrays.asList("quick", "high", "long")));
this.queueManager.addQueue("test-queue-1");
this.queueManager.addNodeToQueue("test-node-1", "test-queue-1");
- assertEquals(this.queueManager.getQueues("test-node-1"), Arrays.asList("test-queue-1"));
+ assertEquals(this.queueManager.getQueues("test-node-1"), Collections.singletonList("test-queue-1"));
this.queueManager.addNodeToQueue("test-node-1","quick");
assertEquals(this.queueManager.getQueues("test-node-1"), Arrays.asList("quick", "test-queue-1"));
this.queueManager.removeQueue("quick");
- assertEquals(this.queueManager.getQueues("test-node-1"), Arrays.asList("test-queue-1"));
+ assertEquals(this.queueManager.getQueues("test-node-1"), Collections.singletonList("test-queue-1"));
assertEquals(this.queueManager.getQueues("localhost"), Arrays.asList("high", "long"));
}
[08/12] oodt git commit: OODT-907 remove collection never queried
Posted by ma...@apache.org.
OODT-907 remove collection never queried
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/00965458
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/00965458
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/00965458
Branch: refs/heads/master
Commit: 009654585116ff90bf3534883e92bd1fc2c12f67
Parents: b9cf911
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:36:30 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:36:30 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/cas/filemgr/browser/model/CasDB.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/00965458/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 37b6b9f..eb04d97 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
@@ -67,16 +67,8 @@ public class CasDB {
if (filemgrUrl != null) {
try {
Vector<ProductType> v = (Vector<ProductType>) client.getProductTypes();
- Vector<String> names = new Vector<String>();
types = new String[v.size()];
- for (ProductType aV : v) {
- names.add(aV.getName());
- }
-
- Collections.sort(names);
- names.toArray(types);
-
} catch (RepositoryManagerException e) {
// e.printStackTrace();
}
[12/12] oodt git commit: OODT-907 remove co
Posted by ma...@apache.org.
OODT-907 remove co
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/905c96a9
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/905c96a9
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/905c96a9
Branch: refs/heads/master
Commit: 905c96a95169e88a70e33734d280d3e457993f49
Parents: 7a5e0fa
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:53:40 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:53:40 2015 +0000
----------------------------------------------------------------------
.../apache/oodt/cas/pushpull/daemon/Daemon.java | 122 ++++++++++---------
1 file changed, 63 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/905c96a9/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
index 661e242..cee0373 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
@@ -55,7 +55,7 @@ import javax.management.ObjectName;
* @author bfoster
*/
public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
- DaemonMBean {
+ DaemonMBean {
private static final long serialVersionUID = 7660972939723142802L;
@@ -115,7 +115,8 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
* @throws SecurityException
*/
public Daemon(int rmiRegPort, int daemonID, Config config,
- DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException {
+ DaemonInfo daemonInfo, SiteInfo siteInfo) throws RemoteException,
+ InstantiationException {
super();
this.rmiRegPort = rmiRegPort;
@@ -133,20 +134,20 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
registerRMIServer();
} catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to bind to RMI server : "
- + e.getMessage());
+ + e.getMessage());
}
try {
// registry CrawlDaemon as MBean so it can be used with jconsole
mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName name = new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
- + this.getDaemonID());
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
+ + this.getDaemonID());
mbs.registerMBean(this, name);
} catch (Exception e) {
LOG.log(Level.SEVERE,
- "Failed to register CrawlDaemon as a MBean Object : "
- + e.getMessage());
+ "Failed to register CrawlDaemon as a MBean Object : "
+ + e.getMessage());
}
}
@@ -154,17 +155,18 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
return "Daemon" + this.getDaemonID();
}
- private void registerRMIServer() throws RemoteException {
+ private void registerRMIServer() throws RemoteException,
+ MalformedURLException, NotBoundException, AlreadyBoundException {
try {
Naming.bind("//localhost:" + this.rmiRegPort + "/daemon"
- + this.getDaemonID(), this);
+ + this.getDaemonID(), this);
LOG.log(Level.INFO, "Created Daemon ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort);
+ + " on RMI registry port " + this.rmiRegPort);
} catch (Exception e) {
e.printStackTrace();
throw new RemoteException("Failed to bind Daemon with ID = "
- + this.getDaemonID() + " to RMI registry at port "
- + this.rmiRegPort);
+ + this.getDaemonID() + " to RMI registry at port "
+ + this.rmiRegPort);
}
}
@@ -188,9 +190,9 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// check if Daemon should sleep first
long timeTilNextRun;
if ((timeTilNextRun = Daemon.this.calculateTimeTilNextRun()) != 0
- && !(Daemon.this.beforeToday(daemonInfo
- .getFirstRunDateTime()) && daemonInfo
- .runOnReboot()))
+ && !(Daemon.this.beforeToday(daemonInfo
+ .getFirstRunDateTime()) && daemonInfo
+ .runOnReboot()))
sleep(timeTilNextRun);
for (keepRunning = true; keepRunning;) {
@@ -209,7 +211,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
try {
rs.retrieveFiles(daemonInfo.getPropFilesInfo(),
- daemonInfo.getDataFilesInfo());
+ daemonInfo.getDataFilesInfo());
} catch (Exception e) {
e.printStackTrace();
} finally {
@@ -222,15 +224,15 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
Daemon.this.notifyDaemonListenerOfFinish();
Daemon.this.calculateAndStoreElapsedTime(startTime);
if (Daemon.this.keepRunning
- && daemonInfo.getTimeIntervalInMilliseconds() >= 0) {
+ && daemonInfo.getTimeIntervalInMilliseconds() >= 0) {
sleep(Daemon.this.calculateTimeTilNextRun());
} else {
break;
}
}
LOG.log(Level.INFO, "Daemon with ID = "
- + Daemon.this.getDaemonID() + " on RMI registry port "
- + Daemon.this.rmiRegPort + " is shutting down");
+ + Daemon.this.getDaemonID() + " on RMI registry port "
+ + Daemon.this.rmiRegPort + " is shutting down");
Daemon.this.unregister();
}
}).start();
@@ -240,10 +242,10 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
try {
// unregister CrawlDaemon from RMI registry
Naming.unbind("//localhost:" + this.rmiRegPort + "/daemon"
- + this.getDaemonID());
+ + this.getDaemonID());
this.mbs.unregisterMBean(new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
- + this.getDaemonID()));
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
+ + this.getDaemonID()));
UnicastRemoteObject.unexportObject(this, true);
this.daemonListener.wasUnregisteredWith(this);
} catch (Exception e) {
@@ -268,10 +270,10 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
return 0;
} else {
int numOfPeriods = (int) (diff / daemonInfo
- .getTimeIntervalInMilliseconds());
+ .getTimeIntervalInMilliseconds());
long nextRunTime = gcStartDateTime.getTimeInMillis()
- + ((numOfPeriods + 1) * daemonInfo
- .getTimeIntervalInMilliseconds());
+ + ((numOfPeriods + 1) * daemonInfo
+ .getTimeIntervalInMilliseconds());
return nextRunTime - now.getTimeInMillis();
}
}
@@ -293,9 +295,9 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
private void sleep(long length) {
if (length > 0) {
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort
- + " is going to sleep until "
- + new Date(System.currentTimeMillis() + length));
+ + " on RMI registry port " + this.rmiRegPort
+ + " is going to sleep until "
+ + new Date(System.currentTimeMillis() + length));
synchronized (this) {
try {
wait(length);
@@ -314,13 +316,13 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
public synchronized void pauseDaemon() {
try {
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort
- + " has been stopped");
+ + " on RMI registry port " + this.rmiRegPort
+ + " has been stopped");
this.wait(0);
} catch (Exception e) {
}
LOG.log(Level.INFO, "Daemon with ID = " + this.getDaemonID()
- + " on RMI registry port " + this.rmiRegPort + " has resumed");
+ + " on RMI registry port " + this.rmiRegPort + " has resumed");
}
/**
@@ -388,24 +390,24 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
public String[] downloadedFilesInStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea().list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return !name.startsWith("Downloading_")
- && !(name.endsWith("info.tmp") || name
- .endsWith("cas"));
- }
- });
+ .getStagingArea().list(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return !name.startsWith("Downloading_")
+ && !(name.endsWith("info.tmp") || name
+ .endsWith("cas"));
+ }
+ });
}
public String[] downloadingFilesInStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea().list(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return name.startsWith("Downloading_")
- && !(name.endsWith("info.tmp") || name
- .endsWith("cas"));
- }
- });
+ .getStagingArea().list(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.startsWith("Downloading_")
+ && !(name.endsWith("info.tmp") || name
+ .endsWith("cas"));
+ }
+ });
}
public int numberOfFilesDownloadingInStagingArea() {
@@ -438,35 +440,36 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// ***************DataFilesInfo*******************
public String getDataFilesRemoteSite() {
RemoteSite remoteSite = this.daemonInfo.getDataFilesInfo()
- .getDownloadInfo().getRemoteSite();
+ .getDownloadInfo().getRemoteSite();
return (remoteSite == null) ? "" : remoteSite.toString();
}
public String getDataFilesRenamingConv() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getRenamingConv();
+ .getRenamingConv();
}
public boolean getDeleteDataFilesFromServer() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .deleteFromServer();
+ .deleteFromServer();
}
public String getQueryMetadataElementName() {
String element = this.daemonInfo.getDataFilesInfo()
- .getQueryMetadataElementName();
+ .getQueryMetadataElementName();
if (element == null || element.equals(""))
+ element = "Filename";
return this.daemonInfo.getDataFilesInfo().getQueryMetadataElementName();
}
public File getDataFilesStagingArea() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .getStagingArea();
+ .getStagingArea();
}
public boolean getAllowAliasOverride() {
return this.daemonInfo.getDataFilesInfo().getDownloadInfo()
- .isAllowAliasOverride();
+ .isAllowAliasOverride();
}
// **************DataFilesInfo********************
@@ -474,18 +477,18 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// **************PropFilesInfo********************
public String getPropertyFilesRemoteSite() {
RemoteSite remoteSite = this.daemonInfo.getPropFilesInfo()
- .getDownloadInfo().getRemoteSite();
+ .getDownloadInfo().getRemoteSite();
return (remoteSite == null) ? "" : remoteSite.toString();
}
public String getPropertyFilesRenamingConv() {
return this.daemonInfo.getPropFilesInfo().getDownloadInfo()
- .getRenamingConv();
+ .getRenamingConv();
}
public boolean getDeletePropertyFilesFromServer() {
return this.daemonInfo.getPropFilesInfo().getDownloadInfo()
- .deleteFromServer();
+ .deleteFromServer();
}
public String getPropertyFilesOnSuccessDir() {
@@ -541,6 +544,7 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
if (args[i].equals("--rmiPort"))
rmiPort = Integer.parseInt(args[++i]);
else if (args[i].equals("--waitForNotification"))
+ waitForCrawlNotification = true;
}
LocateRegistry.createRegistry(rmiPort);
@@ -549,16 +553,16 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
// registry CrawlDaemon as MBean so it can be used with jconsole
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName name = new ObjectName(
- "org.apache.oodt.cas.pushpull.daemon:type=Daemon");
+ "org.apache.oodt.cas.pushpull.daemon:type=Daemon");
} catch (Exception e) {
LOG.log(Level.SEVERE,
- "Failed to register CrawlDaemon as a MBean Object : "
- + e.getMessage());
+ "Failed to register CrawlDaemon as a MBean Object : "
+ + e.getMessage());
}
} catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to create CrawlDaemon : "
- + e.getMessage());
+ + e.getMessage());
} finally {
// terminate the CrawlDaemon
LOG.log(Level.INFO, "Terminating CrawlDaemon");
@@ -566,4 +570,4 @@ public class Daemon extends UnicastRemoteObject implements DaemonRmiInterface,
}
-}
+}
\ No newline at end of file
[03/12] oodt git commit: OODT-905 swap for for foreach...
Posted by ma...@apache.org.
OODT-905 swap for for foreach...
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/15df02af
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/15df02af
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/15df02af
Branch: refs/heads/master
Commit: 15df02af0b869f8e99c7a8b87498bd4a3d3b5c5b
Parents: 63e6a13
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:04:44 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:04:44 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/cas/catalog/query/parser/ParseException.java | 4 ++--
grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/15df02af/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
index c523e8a..a4ce38b 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
@@ -95,8 +95,8 @@ public class ParseException extends Exception {
if (maxSize < expectedTokenSequence.length) {
maxSize = expectedTokenSequence.length;
}
- for (int j = 0; j < expectedTokenSequence.length; j++) {
- expected.append(tokenImage[expectedTokenSequence[j]]).append(' ');
+ for (int anExpectedTokenSequence : expectedTokenSequence) {
+ expected.append(tokenImage[anExpectedTokenSequence]).append(' ');
}
if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
expected.append("...");
http://git-wip-us.apache.org/repos/asf/oodt/blob/15df02af/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
index 3ae41ab..478202d 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
@@ -84,8 +84,8 @@ public class ProfileQueryServlet extends QueryServlet {
if (results == null) {
results = Collections.EMPTY_LIST; // Assume nothing
}
- for (Iterator j = results.iterator(); j.hasNext(); ) { // For each matching profile
- Profile profile = (Profile) j.next(); // Get the profile
+ for (Object result1 : results) { // For each matching profile
+ Profile profile = (Profile) result1; // Get the profile
if (transformer == null) { // No transformer/doc yet?
transformer = createTransformer(); // Then make the transformer
doc = Profile.createProfileDocument(); // And the doc
[07/12] oodt git commit: OODT-890 remove unneeded boxing, unboxing,
swap indexof to contains, stringbuffer to builder
Posted by ma...@apache.org.
OODT-890 remove unneeded boxing, unboxing, swap indexof to contains, stringbuffer to builder
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/b9cf9110
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/b9cf9110
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/b9cf9110
Branch: refs/heads/master
Commit: b9cf91101660b96593d675eec121ea6b563c5683
Parents: 3939769
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:34:30 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:34:30 2015 +0000
----------------------------------------------------------------------
.../gui/perspective/build/BuildPerspective.java | 8 ++-
.../apache/oodt/commons/activity/Incident.java | 34 ++++++------
.../apache/oodt/commons/exec/EnvUtilities.java | 9 ++--
.../org/apache/oodt/commons/util/XMLTest.java | 2 +-
.../oodt/cas/crawl/daemon/CrawlDaemon.java | 6 +--
.../curation/util/CurationXmlStructFactory.java | 13 ++---
.../catalog/DataSourceCatalogFactory.java | 2 +-
.../oodt/cas/filemgr/catalog/LuceneCatalog.java | 4 +-
.../filemgr/catalog/LuceneCatalogFactory.java | 2 +-
.../catalog/solr/DefaultProductSerializer.java | 26 ++++-----
.../extractors/AbstractFilemgrMetExtractor.java | 15 +++---
.../oodt/cas/filemgr/tools/DeleteProduct.java | 10 ++--
.../filemgr/tools/OptimizeLuceneCatalog.java | 2 +-
.../oodt/cas/filemgr/tools/SolrIndexer.java | 42 +++++++--------
.../cas/filemgr/versioning/BasicVersioner.java | 17 +++---
.../oodt/cas/metadata/SerializableMetadata.java | 12 ++---
.../oodt/opendapps/util/ProfileChecker.java | 2 +-
.../apache/oodt/pcs/util/FileManagerUtils.java | 2 +-
.../apache/oodt/pcs/input/PGEXMLFileUtils.java | 3 +-
.../pushpull/filerestrictions/VirtualFile.java | 2 +-
.../oodt/security/sso/opensso/SSOProxy.java | 49 +++++++----------
.../health/VisibilityAndSortToggler.java | 2 +-
.../webcomponents/health/VisibilityToggler.java | 2 +-
.../cas/product/data/DataDeliveryServlet.java | 2 -
.../oodt/cas/product/rdf/RDFDatasetServlet.java | 49 ++++++++---------
.../oodt/cas/product/rss/RSSProductServlet.java | 4 --
.../product/rss/RSSProductTransferServlet.java | 57 ++++++++++----------
.../PrioritizedQueueBasedWorkflowEngine.java | 3 +-
.../oodt/cas/workflow/engine/TaskQuerier.java | 18 +++----
.../engine/ThreadPoolWorkflowEngine.java | 18 +++----
.../processor/WorkflowProcessorQueue.java | 7 ++-
.../engine/runner/AbstractEngineRunnerBase.java | 12 ++---
.../MemoryWorkflowInstanceRepository.java | 4 +-
.../repository/XMLWorkflowRepository.java | 2 +-
.../workflow/system/XmlRpcWorkflowManager.java | 6 +--
.../cas/workflow/tools/InstanceRepoCleaner.java | 5 +-
36 files changed, 208 insertions(+), 245 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
index d7966ec..90c7d20 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/build/BuildPerspective.java
@@ -285,10 +285,14 @@ public class BuildPerspective extends MultiStatePerspective {
mainViews = new HashMap<View, ViewState>();
propView = createPropView();
- propView.registerListener(this);
+ if (propView != null) {
+ propView.registerListener(this);
+ }
treeView = createTreeView();
- treeView.registerListener(this);
+ if (treeView != null) {
+ treeView.registerListener(this);
+ }
tabbedPane = new JTabbedPane();
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java b/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java
index e95293f..ff1d062 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons.activity;
@@ -84,7 +84,7 @@ public class Incident implements Serializable, Comparable {
*/
public int compareTo(Object obj) {
Incident rhs = (Incident) obj;
- int idComp = id == null && rhs.id != null? -1 : id == null && rhs.id == null? 0 : id != null && rhs.id == null? 1
+ int idComp = id == null && rhs.id != null ? -1 : id == null ? 0 : rhs.id == null ? 1
: id.compareTo(rhs.id);
if (idComp == 0)
return time.compareTo(rhs.time);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java b/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java
index 939238b..3e7fd2c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java
+++ b/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java
@@ -159,12 +159,9 @@ public final class EnvUtilities {
buf.append(line).append("\n");
}
- if (reader != null) {
- try {
- reader.close();
- } catch (Exception ignore) {
- }
-
+ try {
+ reader.close();
+ } catch (Exception ignore) {
}
return new ByteArrayInputStream(buf.toString().getBytes());
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java b/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
index f2098b9..e91ca83 100644
--- a/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
@@ -44,7 +44,7 @@ public class XMLTest extends TestCase {
*/
public void testDocumentCreation() {
Document doc = XML.createDocument();
- assertTrue(doc instanceof Document);
+ assertTrue(doc != null);
}
/** Test the {@link XML#createDOMParser} and {@link XML#serialize} methods.
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
index bc9ca2a..cb13ad2 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
@@ -20,13 +20,13 @@ package org.apache.oodt.cas.crawl.daemon;
//OODT imports
import org.apache.oodt.cas.crawl.ProductCrawler;
+import org.apache.xmlrpc.WebServer;
-//JDK imports
import java.util.logging.Level;
import java.util.logging.Logger;
+//JDK imports
//APACHE imports
-import org.apache.xmlrpc.WebServer;
/**
* @author mattmann
@@ -161,7 +161,7 @@ public class CrawlDaemon {
*/
public boolean stop() {
this.running = false;
- return this.running;
+ return false;
}
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/curator/services/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
index ec04c37..3aeb7a8 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
@@ -19,16 +19,17 @@
package org.apache.oodt.cas.curation.util;
//JDK imports
-import java.net.URLEncoder;
-import java.util.List;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.util.XmlStructFactory;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import java.net.URLEncoder;
+import java.util.List;
+
//OODT imports
-import org.apache.oodt.commons.xml.XMLUtils;
-import org.apache.oodt.cas.filemgr.structs.ProductType;
-import org.apache.oodt.cas.filemgr.util.XmlStructFactory;
/**
*
@@ -86,7 +87,7 @@ public class CurationXmlStructFactory {
Element valElem = doc.createElement("val");
if (val == null) {
throw new Exception("Attempt to write null value "
- + "for property: [" + key + "]: val: [" + val + "]");
+ + "for property: [" + key + "]: val: [null]");
}
valElem
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
index e027d37..1f4f1c8 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
@@ -148,7 +148,7 @@ public class DataSourceCatalogFactory implements CatalogFactory {
*/
public Catalog createCatalog() {
if (validationLayer==null) {
- return new LenientDataSourceCatalog(dataSource, validationLayer, fieldIdStr,
+ return new LenientDataSourceCatalog(dataSource, null, fieldIdStr,
pageSize, cacheUpdateMinutes, productIdString, orderedValues);
} else {
return new DataSourceCatalog(dataSource, validationLayer, fieldIdStr,
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/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 86d4a59..fe49e42 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
@@ -1196,9 +1196,7 @@ public class LuceneCatalog implements Catalog {
if (cp.getReferences() != null && cp.getReferences().size() > 0) {
// make sure there is a data store ref for each of the refs
for (Reference r : cp.getReferences()) {
- if (r.getDataStoreReference() == null
- || (r.getDataStoreReference() != null && r
- .getDataStoreReference().equals(""))) {
+ if (r.getDataStoreReference() == null || (r.getDataStoreReference().equals(""))) {
return false;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
index a80c52f..1f64633 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
@@ -76,7 +76,7 @@ public class LuceneCatalogFactory implements CatalogFactory {
throw new IllegalArgumentException(
"error initializing lucene catalog: "
+ "[org.apache.oodt.cas.filemgr.catalog.lucene.idxPath="
- + indexFilePath);
+ + null);
}
//do env var replacement
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java
index 82d13ec..f758b4f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java
@@ -16,16 +16,6 @@
*/
package org.apache.oodt.cas.filemgr.catalog.solr;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.Reference;
@@ -37,6 +27,16 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
/**
* Default implementation of {@link ProductSerializer}
* that transforms a CAS product into a single Solr document based on the following rules:
@@ -257,17 +257,17 @@ public class DefaultProductSerializer implements ProductSerializer {
if (values.isEmpty()) {
// use special value to flag removal
- delFields.add( this.encodeUpdateField(key, Parameters.NULL, replace) );
+ delFields.add( this.encodeUpdateField(key, Parameters.NULL, true) );
} else {
for (String value : values) {
- setFields.add( this.encodeUpdateField(key, value, replace) );
+ setFields.add( this.encodeUpdateField(key, value, true) );
}
}
} else {
for (String value : values) {
- addFields.add( this.encodeUpdateField(key, value, replace) );
+ addFields.add( this.encodeUpdateField(key, value, false) );
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/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 5eec97d..e2c4e1d 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
@@ -75,17 +75,16 @@ public abstract class AbstractFilemgrMetExtractor implements
protected void validateProduct(Product product, Metadata met)
throws MetExtractionException {
- if (product.getProductType() == null
- || (product.getProductType() != null && (product
- .getProductType().getName() == null || (product
- .getProductType().getName() != null && product
- .getProductType().getName().equals(""))))) {
+ if (product.getProductType() == null || ((product
+ .getProductType().getName() == null || (product
+ .getProductType()
+ .getName()
+ .equals(""))))) {
throw new MetExtractionException("Product Type undefined");
}
- if (product.getProductReferences() == null
- || (product.getProductReferences() != null && product
- .getProductReferences().size() == 0)) {
+ if (product.getProductReferences() == null || (product
+ .getProductReferences().size() == 0)) {
throw new MetExtractionException("Product references undefined");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
index 5da89bf..f85853e 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
@@ -134,13 +134,11 @@ public class DeleteProduct {
LOG.log(Level.WARNING, "Error reading prod id: line: [" + line
+ "]: Message: " + e.getMessage(), e);
} finally {
- if (br != null) {
- try {
- br.close();
- } catch (Exception ignore) {
- }
-
+ try {
+ br.close();
+ } catch (Exception ignore) {
}
+
}
return prodIds;
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
index 2d402fc..06d1d79 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/OptimizeLuceneCatalog.java
@@ -61,7 +61,7 @@ public class OptimizeLuceneCatalog {
try {
writer = new IndexWriter(catalogPath, new StandardAnalyzer(),
- createIndex);
+ false);
writer.setMergeFactor(this.mergeFactor);
long timeBefore = System.currentTimeMillis();
writer.optimize();
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index 493d3d7..d75d652 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -18,22 +18,6 @@
package org.apache.oodt.cas.filemgr.tools;
//JDK imports
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.Logger;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -60,6 +44,22 @@ import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.common.SolrInputDocument;
import org.springframework.util.StringUtils;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Logger;
+
/**
* Indexes products from the File Manager catalog to a Solr instance. Uses an
* associated config file, indexer.properties to specify how to perform the
@@ -698,12 +698,10 @@ public class SolrIndexer {
LOG.severe("Error reading product id: line: [" + line + "]: Message: "
+ e.getMessage());
} finally {
- if (br != null) {
- try {
- br.close();
- } catch (Exception ignore) {
- }
- }
+ try {
+ br.close();
+ } catch (Exception ignore) {
+ }
}
return productIds;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
index a9319a1..437c4d2 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
@@ -18,20 +18,21 @@
package org.apache.oodt.cas.filemgr.versioning;
//JDK imports
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
+import org.apache.oodt.cas.metadata.Metadata;
+
import java.io.File;
import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
-import java.net.MalformedURLException;
-import java.util.logging.Logger;
import java.util.logging.Level;
+import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
/**
* @author mattmann
@@ -70,9 +71,7 @@ public class BasicVersioner implements Versioner {
if (product.getProductStructure()
.equals(Product.STRUCTURE_HIERARCHICAL)) {
- if (product.getProductReferences() == null
- || (product.getProductReferences() != null && product
- .getProductReferences().size() == 0)) {
+ if (product.getProductReferences() == null || (product.getProductReferences().size() == 0)) {
throw new VersioningException(
"Hierarchical product and references not set!");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
index 34fae67..a47c8be 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
@@ -17,6 +17,10 @@ package org.apache.oodt.cas.metadata;
//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.IOException;
import java.io.InputStream;
@@ -35,11 +39,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
/**
* @author mattmann
* @author bfoster
@@ -191,8 +190,7 @@ public class SerializableMetadata extends Metadata implements Serializable {
Element valElem = document.createElement("val");
if (value == null) {
throw new Exception("Attempt to write null value "
- + "for property: [" + key + "]: val: ["
- + value + "]");
+ + "for property: [" + key + "]: val: [null]");
}
if (this.useCDATA)
valElem.appendChild(document
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java
index a84daba..8451807 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileChecker.java
@@ -58,7 +58,7 @@ public class ProfileChecker {
boolean ok = true;
sb.append("\nChecking profile=").append(profile.getProfileAttributes().getID());
- ok = ok && checkResourceAttribute("Identifier", profile.getResourceAttributes().getIdentifier(), true, sb);
+ ok = checkResourceAttribute("Identifier", profile.getResourceAttributes().getIdentifier(), true, sb);
ok = ok && checkResourceAttribute("Title", profile.getResourceAttributes().getTitle(), true, sb);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/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 c6bd26a..2705707 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
@@ -357,7 +357,7 @@ public class FileManagerUtils implements PCSConfigMetadata {
public static boolean check(String propName, String propValue,
Metadata metadata) {
if (propValue == null) {
- LOG.log(Level.SEVERE, "PCS: " + propName + ": value: " + propValue);
+ LOG.log(Level.SEVERE, "PCS: " + propName + ": value: " + null);
metadata.replaceMetadata("ApplicationSuccess", "false");
return false;
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
index 6d69d26..b4d412b 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
@@ -77,8 +77,7 @@ public final class PGEXMLFileUtils {
NodeList rowNodeList = matrix.getElementsByTagName("tr");
// there has to be at least one 1
- if (rowNodeList == null
- || (rowNodeList != null && rowNodeList.getLength() <= 0)) {
+ if (rowNodeList == null || (rowNodeList.getLength() <= 0)) {
throw new PGEConfigFileException(
"there must be at least one row in a matrix!");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/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 d3a4a2d..ddb8bb0 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
@@ -126,7 +126,7 @@ public class VirtualFile {
}
public static VirtualFile mergeTwoFiles(VirtualFile vf1, VirtualFile vf2) {
- if (vf1.isDir && vf1.isDir) {
+ if (vf1.isDir) {
VirtualFile newFile = VirtualFile.createRootDir();
newFile.children.addAll(vf1.children);
newFile.children.addAll(vf2.children);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
index 6a47838..972fedf 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java
@@ -18,6 +18,12 @@
package org.apache.oodt.security.sso.opensso;
//JDK imports
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.methods.PostMethod;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -26,11 +32,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//APACHE imports
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.PostMethod;
/**
*
@@ -216,21 +217,16 @@ public class SSOProxy implements SSOMetKeys {
LOG.log(Level.WARNING, "Error reading service response line: [" + line
+ "]: Message: " + e.getMessage());
} finally {
- if (is != null) {
- try {
- is.close();
- } catch (Exception ignore) {
- }
-
+ try {
+ is.close();
+ } catch (Exception ignore) {
}
- if (br != null) {
- try {
- br.close();
- } catch (Exception ignore) {
- }
-
+ try {
+ br.close();
+ } catch (Exception ignore) {
}
+
}
return details;
@@ -271,21 +267,16 @@ public class SSOProxy implements SSOMetKeys {
LOG.log(Level.WARNING, "Error reading service response line: [" + line
+ "]: Message: " + e.getMessage());
} finally {
- if (is != null) {
- try {
- is.close();
- } catch (Exception ignore) {
- }
-
+ try {
+ is.close();
+ } catch (Exception ignore) {
}
- if (br != null) {
- try {
- br.close();
- } catch (Exception ignore) {
- }
-
+ try {
+ br.close();
+ } catch (Exception ignore) {
}
+
}
return details;
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
index 0845375..586f1c9 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityAndSortToggler.java
@@ -56,7 +56,7 @@ class VisibilityAndSortToggler extends VisibilityToggler {
Link<Link> sortLink;
Link<Link> unsortLink = null;
- sortLink = new Link<Link>(sortLinkId, new Model<Link>(unsortLink)) {
+ sortLink = new Link<Link>(sortLinkId, new Model<Link>(null)) {
/*
* (non-Javadoc)
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
index 62993cd..6f4ea72 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/VisibilityToggler.java
@@ -56,7 +56,7 @@ public class VisibilityToggler extends WebMarkupContainer {
final WebMarkupContainer moreComponent = new WebMarkupContainer(moreId);
add(moreComponent);
- showLink = new Link<Link>(showLinkId, new Model<Link>(hideLink)) {
+ showLink = new Link<Link>(showLinkId, new Model<Link>(null)) {
/*
* (non-Javadoc)
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
index be68235..970eff4 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java
@@ -66,8 +66,6 @@ public class DataDeliveryServlet extends HttpServlet implements
} catch (Exception e) {
throw new ServletException("Failed to get filemgr url : " + e.getMessage(), e);
}
- if (fileMgrURL == null)
- fileMgrURL = "http://localhost:9000";
client = new XmlRpcFileManagerClient(new URL(fileMgrURL));
} catch (MalformedURLException ex) {
throw new ServletException(ex);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
index f66aab0..50b7026 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
@@ -19,11 +19,32 @@
package org.apache.oodt.cas.product.rdf;
//JDK imports
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.WordUtils;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+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.util.PathUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.Vector;
+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,27 +52,8 @@ 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.List;
-import java.util.Vector;
-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.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.WordUtils;
//OODT imports
-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.ProductType;
-import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.commons.xml.XMLUtils;
/**
*
@@ -105,11 +107,6 @@ public class RDFDatasetServlet extends HttpServlet {
"filemgr.url") );
} catch (Exception e) {
throw new ServletException("Failed to get filemgr url : " + e.getMessage(), e);
- }
-
- if (fileManagerUrl == null) {
- // try the default port
- fileManagerUrl = "http://localhost:9000";
}
fClient = null;
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/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 e1cf5ae..285bc3c 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
@@ -108,10 +108,6 @@ public class RSSProductServlet extends HttpServlet {
} catch (Exception e) {
throw new ServletException("Failed to get filemgr url : " + e.getMessage(), e);
}
- if (fileManagerUrl == null) {
- // try the default port
- fileManagerUrl = "http://localhost:9000";
- }
this.getFileManager(fileManagerUrl);
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
index 389469a..3574e1f 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
@@ -19,11 +19,34 @@
package org.apache.oodt.cas.product.rss;
//JDK imports
+import org.apache.oodt.cas.filemgr.structs.FileTransferStatus;
+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.DataTransferException;
+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;
+
+import java.io.File;
+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.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,30 +54,10 @@ 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.List;
-import java.util.Date;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.text.ParseException;
-//OODT imports
import static org.apache.oodt.cas.product.rss.RSSConfigMetKeys.RSS_TRANSFER_CONF_KEY;
-import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
-import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import org.apache.oodt.cas.filemgr.structs.FileTransferStatus;
-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;
+
+//OODT imports
/**
* @author mattmann
@@ -109,13 +112,9 @@ public class RSSProductTransferServlet extends HttpServlet {
"filemgr.url") );
} catch (Exception e) {
throw new ServletException("Failed to get filemgr url : " + e.getMessage(), e);
- }
- if (fileManagerUrl == null) {
- // try the default port
- fileManagerUrl = "http://localhost:9000";
}
- fClient = null;
+ fClient = null;
try {
fClient = new XmlRpcFileManagerClient(new URL(fileManagerUrl));
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java
index 11ec7b9..66102ec 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java
@@ -241,8 +241,7 @@ public class PrioritizedQueueBasedWorkflowEngine implements WorkflowEngine {
private synchronized void persist(WorkflowInstance inst) throws EngineException {
try {
- if (inst.getId() == null
- || (inst.getId() != null && inst.getId().equals(""))) {
+ if (inst.getId() == null || (inst.getId().equals(""))) {
// we have to persist it by adding it
// rather than updating it
repo.addWorkflowInstance(inst);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java
index c745b8d..56e6fe5 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java
@@ -18,12 +18,6 @@
package org.apache.oodt.cas.workflow.engine;
//JDK imports
-import java.util.List;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-//OODT imports
import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessorHelper;
@@ -35,6 +29,13 @@ import org.apache.oodt.cas.workflow.structs.PrioritySorter;
import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
+import java.util.List;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+//OODT imports
+
/**
*
* The purpose of this class is to constantly pop off tasks that are run to run
@@ -132,7 +133,7 @@ public class TaskQuerier implements Runnable {
processorsToRun.add(tp);
}
- if (processorsToRun != null && processorsToRun.size() > 1) {
+ if (processorsToRun.size() > 1) {
prioritizer.sort(processorsToRun);
}
@@ -199,8 +200,7 @@ public class TaskQuerier implements Runnable {
private synchronized void persist(WorkflowInstance instance) {
if (this.repo != null) {
try {
- if (instance.getId() == null
- || (instance.getId() != null && instance.getId().equals(""))) {
+ if (instance.getId() == null || (instance.getId().equals(""))) {
// we have to persist it by adding it
// rather than updating it
repo.addWorkflowInstance(instance);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
index 6b512f0..805d782 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
@@ -365,10 +365,9 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
Date workflowStartDateTime;
- if (inst.getStartDateTimeIsoStr() == null
- || (inst.getStartDateTimeIsoStr() != null && (inst
- .getStartDateTimeIsoStr().equals("") || inst
- .getStartDateTimeIsoStr().equals("null")))) {
+ if (inst.getStartDateTimeIsoStr() == null || ((inst
+ .getStartDateTimeIsoStr().equals("") || inst
+ .getStartDateTimeIsoStr().equals("null")))) {
return 0.0;
}
@@ -398,10 +397,10 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
Date workflowTaskStartDateTime;
- if (inst.getCurrentTaskStartDateTimeIsoStr() == null
- || (inst.getCurrentTaskStartDateTimeIsoStr() != null && (inst
- .getCurrentTaskStartDateTimeIsoStr().equals("") || inst
- .getCurrentTaskStartDateTimeIsoStr().equals("null")))) {
+ if (inst.getCurrentTaskStartDateTimeIsoStr() == null || ((inst
+ .getCurrentTaskStartDateTimeIsoStr().equals("")
+ || inst
+ .getCurrentTaskStartDateTimeIsoStr().equals("null")))) {
return 0.0;
}
@@ -435,8 +434,7 @@ public class ThreadPoolWorkflowEngine implements WorkflowEngine, WorkflowStatus
throws EngineException {
try {
- if (wInst.getId() == null
- || (wInst.getId() != null && wInst.getId().equals(""))) {
+ if (wInst.getId() == null || (wInst.getId().equals(""))) {
// we have to persist it by adding it
// rather than updating it
instRep.addWorkflowInstance(wInst);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
index 7d5507f..b594604 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
@@ -107,8 +107,7 @@ public class WorkflowProcessorQueue {
public synchronized void persist(WorkflowInstance inst) {
try {
- if (inst.getId() == null
- || (inst.getId() != null && inst.getId().equals(""))) {
+ if (inst.getId() == null || (inst.getId().equals(""))) {
// we have to persist it by adding it
// rather than updating it
repo.addWorkflowInstance(inst);
@@ -134,7 +133,7 @@ public class WorkflowProcessorQueue {
LOG.log(Level.SEVERE,
"Unable to process Graph for workflow instance: [" + inst.getId()
+ "]");
- return processor;
+ return null;
}
if (isCompositeProcessor(inst)) {
@@ -446,7 +445,7 @@ public class WorkflowProcessorQueue {
e.printStackTrace();
}
- return task;
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java
index 456c698..0b8b092 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java
@@ -18,10 +18,6 @@
package org.apache.oodt.cas.workflow.engine.runner;
//JDK imports
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-//OODT imports
import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
@@ -29,6 +25,11 @@ import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+//OODT imports
+
/**
*
* An abstract base class providing helper functionality to persist
@@ -76,8 +77,7 @@ public abstract class AbstractEngineRunnerBase extends EngineRunner {
protected synchronized void persist(WorkflowInstance instance) {
if(instRep == null) return;
try {
- if (instance.getId() == null
- || (instance.getId() != null && instance.getId().equals(""))) {
+ if (instance.getId() == null || (instance.getId().equals(""))) {
// we have to persist it by adding it
// rather than updating it
instRep.addWorkflowInstance(instance);
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
index 279572f..32d53bc 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
@@ -204,9 +204,7 @@ public class MemoryWorkflowInstanceRepository extends
throws InstanceRepositoryException {
int cnt = 0;
- if (this.workflowInstMap != null
- && this.workflowInstMap.keySet() != null
- && this.workflowInstMap.keySet().size() > 0) {
+ if (this.workflowInstMap != null && this.workflowInstMap.keySet().size() > 0) {
for (Object o : this.workflowInstMap.keySet()) {
String wInstId = (String) o;
WorkflowInstance inst = (WorkflowInstance) this.workflowInstMap
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
index 6456887..361dcaf 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
@@ -290,7 +290,7 @@ public class XMLWorkflowRepository implements WorkflowRepository {
@Override
public String addWorkflow(Workflow workflow) throws RepositoryException {
// first check to see that its tasks are all present
- if(workflow.getTasks() == null || (workflow.getTasks() != null && workflow.getTasks().size() == 0)){
+ if(workflow.getTasks() == null || (workflow.getTasks().size() == 0)){
throw new RepositoryException("Attempt to define a new worklfow: ["+workflow.getName()+"] with no tasks.");
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
index 693511e..55e11d3 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
@@ -676,10 +676,8 @@ public class XmlRpcWorkflowManager {
if (wInsts != null && wInsts.size() > 0) {
for (Object wInst1 : wInsts) {
WorkflowInstance wInst = (WorkflowInstance) wInst1;
- if (wInst.getWorkflow() == null ||
- (wInst.getWorkflow() != null &&
- (wInst.getWorkflow().getName() == null ||
- wInst.getWorkflow().getId() == null))) {
+ if (wInst.getWorkflow() == null || ((wInst.getWorkflow().getName() == null
+ || wInst.getWorkflow().getId() == null))) {
wInst.setWorkflow(safeGetWorkflowById(wInst.getWorkflow()
.getId()));
} else {
http://git-wip-us.apache.org/repos/asf/oodt/blob/b9cf9110/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
index be77073..83196e9 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java
@@ -115,9 +115,8 @@ public class InstanceRepoCleaner {
LOG.log(Level.INFO, "Existing status: [" + inst.getStatus()
+ "]: setting to [" + WorkflowStatus.FINISHED + "]");
inst.setEndDateTimeIsoStr(endDateTimeIsoStr);
- if (inst.getStartDateTimeIsoStr() == null
- || (inst.getStartDateTimeIsoStr() != null && inst
- .getStartDateTimeIsoStr().equals(""))) {
+ if (inst.getStartDateTimeIsoStr() == null || (inst
+ .getStartDateTimeIsoStr().equals(""))) {
inst.setStartDateTimeIsoStr(endDateTimeIsoStr);
}
inst.setStatus(WorkflowStatus.FINISHED);
[02/12] oodt git commit: remove unused imports
Posted by ma...@apache.org.
remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/63e6a135
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/63e6a135
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/63e6a135
Branch: refs/heads/master
Commit: 63e6a1359080c891ef1af8f9c047494d51ce402d
Parents: dd7577b
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:03:27 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:03:27 2015 +0000
----------------------------------------------------------------------
.../struct/impl/dictionary/WorkflowManagerDictionary.java | 1 -
.../java/org/apache/oodt/cas/catalog/system/Catalog.java | 1 -
.../oodt/cas/catalog/system/impl/CatalogServiceLocal.java | 1 -
.../cas/catalog/system/impl/TestCatalogServiceLocal.java | 1 -
.../oodt/cas/cli/option/store/CmdLineOptionStore.java | 1 -
.../cli/option/store/spring/SpringCmdLineOptionStore.java | 1 -
.../org/apache/oodt/cas/cli/parser/CmdLineParser.java | 1 -
.../org/apache/oodt/cas/cli/parser/StdCmdLineParser.java | 1 -
.../main/java/org/apache/oodt/commons/MultiServer.java | 1 -
.../org/apache/oodt/commons/activity/ActivityTracker.java | 1 -
.../apache/oodt/commons/activity/CompositeActivity.java | 1 -
.../oodt/commons/activity/SQLDatabaseRetrieval.java | 1 -
.../apache/oodt/commons/activity/SQLDatabaseStorage.java | 1 -
.../oodt/commons/activity/XMLStandardOutputStorage.java | 1 -
.../org/apache/oodt/commons/util/LogEventMultiplexer.java | 1 -
.../java/org/apache/oodt/commons/ConfigurationTest.java | 1 -
.../org/apache/oodt/cas/crawl/action/IngestAncillary.java | 1 -
.../oodt/cas/curation/util/ExtractorConfigReader.java | 1 -
.../oodt/cas/curation/util/ExtractorConfigWriter.java | 1 -
.../oodt/cas/filemgr/catalog/DataSourceCatalog.java | 1 -
.../filemgr/catalog/MappedDataSourceCatalogFactory.java | 1 -
.../cas/filemgr/datatransfer/RemoteDataTransferer.java | 1 -
.../cas/filemgr/datatransfer/TransferStatusTracker.java | 1 -
.../org/apache/oodt/cas/filemgr/ingest/StdIngester.java | 1 -
.../oodt/cas/filemgr/repository/XMLRepositoryManager.java | 1 -
.../java/org/apache/oodt/cas/filemgr/structs/Product.java | 1 -
.../oodt/cas/filemgr/system/auth/SecureWebServer.java | 1 -
.../org/apache/oodt/cas/filemgr/tools/DeleteProduct.java | 1 -
.../oodt/cas/filemgr/tools/MetadataBasedProductMover.java | 1 -
.../java/org/apache/oodt/cas/filemgr/tools/QueryTool.java | 1 -
.../apache/oodt/cas/filemgr/tools/RangeQueryTester.java | 1 -
.../apache/oodt/cas/filemgr/util/XmlStructFactory.java | 1 -
.../oodt/cas/filemgr/validation/XMLValidationLayer.java | 1 -
.../oodt/cas/filemgr/versioning/DateTimeVersioner.java | 1 -
.../oodt/cas/filemgr/versioning/VersioningUtils.java | 1 -
.../cas/filemgr/repository/TestXMLRepositoryManager.java | 1 -
.../oodt/cas/filemgr/structs/type/TestTypeHandler.java | 1 -
.../apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java | 1 -
.../cas/filemgr/validation/TestXMLValidationLayer.java | 1 -
.../src/main/java/org/apache/oodt/grid/ConfigServlet.java | 1 -
.../src/main/java/org/apache/oodt/grid/Configuration.java | 1 -
.../java/org/apache/oodt/grid/ProductQueryServlet.java | 3 +--
.../java/org/apache/oodt/grid/ProfileQueryServlet.java | 1 -
.../org/apache/oodt/pcs/health/CrawlPropertiesFile.java | 1 -
.../java/org/apache/oodt/pcs/tools/PCSLongLister.java | 1 -
.../src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java | 1 -
.../java/org/apache/oodt/pcs/util/FileManagerUtils.java | 1 -
.../org/apache/oodt/pcs/input/PGEConfigFileReader.java | 1 -
.../org/apache/oodt/pcs/input/PGEConfigFileWriter.java | 1 -
.../java/org/apache/oodt/cas/pge/PGETaskInstance.java | 1 -
.../oodt/cas/pge/config/XmlFilePgeConfigBuilder.java | 1 -
.../main/java/org/apache/oodt/cas/pge/util/XmlHelper.java | 2 --
.../org/apache/oodt/profile/EnumeratedProfileElement.java | 1 -
.../src/main/java/org/apache/oodt/profile/Profile.java | 1 -
.../main/java/org/apache/oodt/profile/ProfileElement.java | 1 -
.../src/main/java/org/apache/oodt/profile/Utility.java | 1 -
.../profile/gui/pstructs/ProfileAttributesPrinter.java | 1 -
.../oodt/profile/gui/pstructs/ProfileElementPrinter.java | 1 -
.../apache/oodt/profile/gui/pstructs/ProfilePrinter.java | 1 -
.../profile/gui/pstructs/ResourceAttributesPrinter.java | 1 -
.../oodt/profile/handlers/cas/util/ProfileUtils.java | 1 -
.../lightweight/SearchableResourceAttributes.java | 1 -
.../lightweight/LightweightProfileServerTest.java | 1 -
.../oodt/cas/pushpull/protocol/ProtocolHandler.java | 1 -
.../apache/oodt/cas/pushpull/protocol/ProtocolPath.java | 1 -
.../cas/pushpull/retrievalsystem/FileRetrievalSystem.java | 1 -
.../oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java | 1 -
.../apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java | 1 -
.../oodt/cas/resource/queuerepo/XmlQueueRepository.java | 1 -
.../oodt/cas/resource/structs/NameValueJobInput.java | 1 -
.../oodt/cas/resource/util/XmlRpcStructFactory.java | 1 -
.../oodt/cas/resource/monitor/TestAssignmentMonitor.java | 1 -
.../java/org/apache/oodt/cas/product/data/DataUtils.java | 1 -
.../apache/oodt/cas/product/rdf/RDFDatasetServlet.java | 1 -
.../apache/oodt/cas/product/rdf/RDFProductServlet.java | 1 -
.../java/org/apache/oodt/cas/product/rdf/RDFUtils.java | 2 +-
.../apache/oodt/cas/product/rss/RSSProductServlet.java | 1 -
.../oodt/cas/product/rss/RSSProductTransferServlet.java | 1 -
.../cas/workflow/cli/action/GetTaskByIdCliAction.java | 2 --
.../workflow/engine/processor/WorkflowProcessorQueue.java | 1 -
.../instrepo/AbstractPaginatibleInstanceRepository.java | 10 +++++-----
.../instrepo/LuceneWorkflowInstanceRepository.java | 1 -
.../instrepo/MemoryWorkflowInstanceRepository.java | 1 -
.../cas/workflow/instrepo/WorkflowInstanceMetMap.java | 1 -
.../oodt/cas/workflow/lifecycle/WorkflowLifecycle.java | 1 -
.../cas/workflow/lifecycle/WorkflowLifecycleManager.java | 1 -
.../oodt/cas/workflow/system/XmlRpcWorkflowManager.java | 2 --
.../cas/workflow/system/XmlRpcWorkflowManagerClient.java | 1 -
.../cas/workflow/util/GenericWorkflowObjectFactory.java | 1 -
.../org/apache/oodt/cas/workflow/util/ScriptFile.java | 1 -
.../oodt/cas/workflow/util/XmlRpcStructFactory.java | 1 -
.../instrepo/TestLuceneWorkflowInstanceRepository.java | 1 -
.../workflow/system/TestXmlRpcWorkflowManagerClient.java | 1 -
.../org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java | 1 -
.../java/org/apache/oodt/xmlps/profile/DBMSExecutor.java | 1 -
.../apache/oodt/xmlps/profile/XMLPSProfileHandler.java | 1 -
.../main/java/org/apache/oodt/xmlps/structs/CDERow.java | 1 -
.../oodt/xmlps/product/TestXMLPSProductHandler.java | 1 -
.../main/java/org/apache/oodt/xmlquery/QueryResult.java | 1 -
.../src/main/java/org/apache/oodt/xmlquery/XMLQuery.java | 1 -
100 files changed, 7 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
index 4506dff..9b7fdb8 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
@@ -17,7 +17,6 @@
package org.apache.oodt.cas.catalog.struct.impl.dictionary;
//OODT imports
-import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
import org.apache.oodt.cas.catalog.query.*;
import org.apache.oodt.cas.catalog.struct.Dictionary;
import org.apache.oodt.cas.catalog.term.Term;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
index 7a16067..457605c 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
@@ -31,7 +31,6 @@ import org.apache.oodt.cas.catalog.term.TermBucket;
import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
-import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/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 41ba30c..b545ce8 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
@@ -17,7 +17,6 @@
package org.apache.oodt.cas.catalog.system.impl;
//OODT imports
-import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
import org.apache.oodt.cas.catalog.exception.CatalogException;
import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
import org.apache.oodt.cas.catalog.mapping.IngestMapper;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
----------------------------------------------------------------------
diff --git a/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java b/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
index 1a9fd24..e710264 100644
--- a/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
+++ b/catalog/src/test/java/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
@@ -19,7 +19,6 @@ package org.apache.oodt.cas.catalog.system.impl;
//JDK imports
import java.io.File;
import java.io.IOException;
-import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
index d6342d9..07acb27 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/CmdLineOptionStore.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.cli.option.store;
import java.util.Set;
//OODT imports
-import org.apache.oodt.cas.cli.exception.CmdLineOptionStoreException;
import org.apache.oodt.cas.cli.option.CmdLineOption;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
index 3af6a0d..f9ba23b 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/store/spring/SpringCmdLineOptionStore.java
@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.Set;
//OODT imports
-import org.apache.oodt.cas.cli.exception.CmdLineOptionStoreException;
import org.apache.oodt.cas.cli.option.CmdLineOption;
import org.apache.oodt.cas.cli.option.store.CmdLineOptionStore;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
index 9a3be89..174c18d 100644
--- a/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/parser/CmdLineParser.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.cli.parser;
import java.util.List;
//OODT imports
-import org.apache.oodt.cas.cli.exception.CmdLineParserException;
import org.apache.oodt.cas.cli.util.ParsedArg;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java b/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
index 2a77bb8..a5884c8 100755
--- a/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
+++ b/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineParser.java
@@ -36,7 +36,6 @@ package org.apache.oodt.cas.cli.parser;
import java.util.List;
//OODT imports
-import org.apache.oodt.cas.cli.exception.CmdLineParserException;
import org.apache.oodt.cas.cli.util.ParsedArg;
//Google imports
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/MultiServer.java b/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
index ba8af6f..b26ed09 100644
--- a/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/MultiServer.java
@@ -25,7 +25,6 @@ import java.rmi.registry.Registry;
import java.rmi.server.RemoteObject;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java b/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
index a126790..8bd9f9f 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
@@ -19,7 +19,6 @@ package org.apache.oodt.commons.activity;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java b/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
index fd021eb..c0c3c8b 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
@@ -18,7 +18,6 @@
package org.apache.oodt.commons.activity;
import java.util.Collection;
-import java.util.Iterator;
/**
* A composite activity multiplexes incidents to multiple other activities.
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
index 4879620..276f7d3 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
@@ -23,7 +23,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
index dc7aa78..7dd2e2d 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
@@ -20,7 +20,6 @@ package org.apache.oodt.commons.activity;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Iterator;
import java.util.List;
import javax.sql.DataSource;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
index 828c61e..47e0eb7 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
@@ -17,7 +17,6 @@
package org.apache.oodt.commons.activity;
-import java.io.IOException;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java b/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
index 7d519e9..13a138c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/LogEventMultiplexer.java
@@ -17,7 +17,6 @@ package org.apache.oodt.commons.util;
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.oodt.commons.io.LogEvent;
import org.apache.oodt.commons.io.LogListener;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
index fce3d9d..35ba9e2 100644
--- a/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/ConfigurationTest.java
@@ -16,7 +16,6 @@
package org.apache.oodt.commons;
import java.io.*;
-import java.net.MalformedURLException;
import java.util.*;
import junit.framework.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
index 905f51e..4cf0399 100755
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
//OODT imports
-import org.apache.oodt.cas.crawl.structs.exceptions.CrawlerActionException;
import org.apache.oodt.cas.filemgr.ingest.Ingester;
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
index 2a711e7..54c341c 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
@@ -23,7 +23,6 @@ import org.apache.oodt.cas.metadata.util.PathUtils;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
----------------------------------------------------------------------
diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
index 3a3a08e..82b19fc 100644
--- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
+++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
@@ -21,7 +21,6 @@ package org.apache.oodt.cas.curation.util;
import org.apache.oodt.cas.curation.structs.ExtractorConfig;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
index 0663b95..306d86f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
@@ -47,7 +47,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import java.util.TreeMap;
import java.util.UUID;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/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 df3d1ff..75dcf3c 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
@@ -22,7 +22,6 @@ 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;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
index 8d0c397..5f9f287 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
@@ -33,7 +33,6 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
index 86f1794..f6a7944 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
@@ -29,7 +29,6 @@ import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
index 7b6a5c2..828dea7 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
@@ -36,7 +36,6 @@ import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
index 1c8623e..31120f8 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
@@ -30,7 +30,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/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 5f26656..d441142 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
@@ -28,7 +28,6 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
index bc0e087..46d87d6 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
@@ -19,7 +19,6 @@ package org.apache.oodt.cas.filemgr.system.auth;
//JDK imports
import java.util.List;
-import java.util.Iterator;
import java.util.ArrayList;
import java.util.Vector;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
index 2912688..5da89bf 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
@@ -34,7 +34,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
index ac647e0..694bf3c 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.java
@@ -31,7 +31,6 @@ import java.io.File;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
-import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java
index 80245ae..1a3174d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java
@@ -42,7 +42,6 @@ import org.apache.oodt.cas.filemgr.util.SqlParser;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
index dcd9d3b..bd7c84d 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
@@ -19,7 +19,6 @@ package org.apache.oodt.cas.filemgr.tools;
//JDK imports
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
index fda21e4..46b1a7a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
index 8c0d4c8..97c0620 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
@@ -31,7 +31,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
index 3e06198..e72ab97 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
@@ -27,7 +27,6 @@ import org.apache.oodt.commons.util.DateConvert;
//JDK imports
import java.text.SimpleDateFormat;
import java.text.ParseException;
-import java.util.Iterator;
import java.util.Date;
import java.util.List;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
index 078ef93..f690847 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
@@ -30,7 +30,6 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.List;
import java.util.Stack;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
index 9954473..073d6f7 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
@@ -26,7 +26,6 @@ import org.apache.oodt.commons.exec.EnvUtilities;
//JDK imports
import java.io.File;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
index 60b9eda..af24067 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
@@ -47,7 +47,6 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
index f7d71e0..d7799ba 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
@@ -31,7 +31,6 @@ import org.apache.oodt.cas.metadata.SerializableMetadata;
import java.io.File;
import java.io.FileInputStream;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
//Junit imports
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
index 921bc72..dcba44c 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
@@ -31,7 +31,6 @@ import java.io.FileFilter;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java b/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
index 9494fda..3d8cd5b 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ConfigServlet.java
@@ -22,7 +22,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/grid/src/main/java/org/apache/oodt/grid/Configuration.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/Configuration.java b/grid/src/main/java/org/apache/oodt/grid/Configuration.java
index c894052..ee5cdc6 100755
--- a/grid/src/main/java/org/apache/oodt/grid/Configuration.java
+++ b/grid/src/main/java/org/apache/oodt/grid/Configuration.java
@@ -26,7 +26,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
index 4f1df63..fdf3d61 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
@@ -19,9 +19,8 @@ package org.apache.oodt.grid;
import java.io.BufferedInputStream;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
-import javax.servlet.ServletException;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
index 4fa9a17..3ae41ab 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProfileQueryServlet.java
@@ -27,7 +27,6 @@ import org.w3c.dom.Node;
import java.io.IOException;
import java.util.*;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.transform.OutputKeys;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
index d887dc7..388fa1b 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/health/CrawlPropertiesFile.java
@@ -25,7 +25,6 @@ import org.apache.oodt.cas.metadata.util.PathUtils;
//JDK imports
import java.io.FileInputStream;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
index 72ecaaa..496fbf0 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
@@ -29,7 +29,6 @@ import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.io.File;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.Stack;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
index ae31bd2..aeacaec 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java
@@ -20,7 +20,6 @@ package org.apache.oodt.pcs.tools;
//JDK imports
import java.net.URL;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
//OODT imports
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/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 a75550c..c6bd26a 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
@@ -38,7 +38,6 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
index 327714a..d84c5ca 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
@@ -24,7 +24,6 @@ import org.xml.sax.InputSource;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import javax.xml.parsers.DocumentBuilder;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
index 5d6de33..baa698d 100644
--- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
+++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
@@ -21,7 +21,6 @@ import org.w3c.dom.Element;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
index 0b16ac8..839f0a8 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
@@ -46,7 +46,6 @@ import static org.apache.oodt.cas.pge.util.GenericPgeObjectFactory.createSciPgeC
//JDK imports
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java b/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
index bcf1be2..20580f3 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
@@ -40,7 +40,6 @@ import static org.apache.oodt.cas.pge.util.XmlHelper.isWorkflowMetKey;
//JDK imports
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.List;
//OODT imports
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
index 0fd6d61..453f2ac 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
@@ -58,7 +58,6 @@ import static org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys.QUERY_FILE_MANAGER
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
@@ -76,7 +75,6 @@ import org.apache.oodt.cas.pge.config.RegExprOutputFiles;
import org.apache.oodt.commons.xml.XMLUtils;
//DOM imports
-import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
index a0aa99c..c80f628 100644
--- a/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
+++ b/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
@@ -27,7 +27,6 @@ import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.Resource;
import java.net.URI;
-import java.util.Iterator;
import org.w3c.dom.Element;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/Profile.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/Profile.java b/profile/src/main/java/org/apache/oodt/profile/Profile.java
index 2cb6184..69820b5 100644
--- a/profile/src/main/java/org/apache/oodt/profile/Profile.java
+++ b/profile/src/main/java/org/apache/oodt/profile/Profile.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java b/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
index 6224177..58664dc 100644
--- a/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
+++ b/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
@@ -25,7 +25,6 @@ import java.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/Utility.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/Utility.java b/profile/src/main/java/org/apache/oodt/profile/Utility.java
index a5b74da..0abb44b 100644
--- a/profile/src/main/java/org/apache/oodt/profile/Utility.java
+++ b/profile/src/main/java/org/apache/oodt/profile/Utility.java
@@ -26,7 +26,6 @@ import org.apache.jena.rdf.model.ModelFactory;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.rdf.model.Property;
-import java.util.Iterator;
import java.util.Collection;
import org.apache.jena.rdf.model.Bag;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
index 614d122..385153a 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
@@ -25,7 +25,6 @@ package org.apache.oodt.profile.gui.pstructs;
import org.apache.oodt.profile.ProfileAttributes;
-import java.util.Iterator;
/**
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
index 3f8c260..ed431f9 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
@@ -24,7 +24,6 @@
package org.apache.oodt.profile.gui.pstructs;
import org.apache.oodt.profile.ProfileElement;
-import java.util.Iterator;
/**
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
index 2909ea8..680f653 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
@@ -26,7 +26,6 @@ package org.apache.oodt.profile.gui.pstructs;
import org.apache.oodt.profile.Profile;
import org.apache.oodt.profile.ProfileElement;
-import java.util.Iterator;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
index 81a7932..84302fd 100755
--- a/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
+++ b/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
@@ -24,7 +24,6 @@
package org.apache.oodt.profile.gui.pstructs;
import org.apache.oodt.profile.ResourceAttributes;
-import java.util.Iterator;
/**
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
index 7a2b379..7add2f2 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
@@ -19,7 +19,6 @@
package org.apache.oodt.profile.handlers.cas.util;
//CAS imports
-import java.util.Iterator;
import java.util.List;
import org.apache.oodt.cas.filemgr.structs.Product;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
index 854a63f..d5fc3a0 100644
--- a/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
+++ b/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
@@ -19,7 +19,6 @@
package org.apache.oodt.profile.handlers.lightweight;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import org.apache.oodt.profile.ResourceAttributes;
import org.w3c.dom.Element;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java b/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
index 6c0f263..d8373ee 100644
--- a/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
+++ b/profile/src/test/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServerTest.java
@@ -23,7 +23,6 @@ import org.apache.oodt.profile.ProfileException;
import org.apache.oodt.xmlquery.XMLQuery;
import java.net.URI;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
index 6a41dbb..de28eb6 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
@@ -30,7 +30,6 @@ import org.apache.oodt.cas.pushpull.exceptions.RemoteConnectionException;
//JDK imports
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
----------------------------------------------------------------------
diff --git a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
index 7235e82..6ea4f5d 100644
--- a/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
+++ b/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.pushpull.protocol;
//JDK imports
import java.io.Serializable;
-import java.net.MalformedURLException;
/**
* This class wraps up a URL for a given path, and whether the path specified by
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/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 3ccb510..49fec6b 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
@@ -23,7 +23,6 @@ import org.apache.oodt.cas.pushpull.config.Config;
import org.apache.oodt.cas.pushpull.config.SiteInfo;
import org.apache.oodt.cas.pushpull.exceptions.AlreadyInDatabaseException;
import org.apache.oodt.cas.pushpull.exceptions.CrawlerException;
-import org.apache.oodt.cas.pushpull.exceptions.ProtocolFileException;
import org.apache.oodt.cas.pushpull.exceptions.RemoteConnectionException;
import org.apache.oodt.cas.pushpull.exceptions.ThreadEvaluatorException;
import org.apache.oodt.cas.pushpull.exceptions.ToManyFailedDownloadsException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/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 865d08f..e211aa5 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
@@ -21,7 +21,6 @@ package org.apache.oodt.cas.pushpull.retrievalsystem;
//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;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java
index 61ecb30..4f5fa4c 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java
@@ -32,7 +32,6 @@ import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
//JDK imports
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
index cc8ba86..0988f4a 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/queuerepo/XmlQueueRepository.java
@@ -29,7 +29,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java b/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
index c178f64..4c19c9b 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.resource.structs;
//JDK imports
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
index 021e146..51a1eb6 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
@@ -25,7 +25,6 @@ import org.apache.oodt.cas.resource.structs.ResourceNode;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java b/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
index 6514cd2..7eece62 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
@@ -28,7 +28,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
index 5941922..df64812 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
@@ -29,7 +29,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.ZipEntry;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
index 7c237c1..f66aab0 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
@@ -32,7 +32,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.util.List;
-import java.util.Iterator;
import java.util.Vector;
import java.util.logging.Logger;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
index 71e3307..3af58b6 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
@@ -32,7 +32,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.util.List;
-import java.util.Iterator;
import java.util.Vector;
import java.util.logging.Logger;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
index a8933ba..496388b 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
@@ -26,7 +26,7 @@ import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.File;
import java.io.FileNotFoundException;
-import java.util.Iterator;
+
import javax.servlet.ServletConfig;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/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 5237f6b..e1cf5ae 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
@@ -41,7 +41,6 @@ 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;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
----------------------------------------------------------------------
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
index 0cb1a5b..389469a 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
@@ -33,7 +33,6 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.util.List;
import java.util.Date;
-import java.util.Iterator;
import java.util.logging.Logger;
import java.util.logging.Level;
import org.w3c.dom.Document;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
index aee4f90..47cd829 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetTaskByIdCliAction.java
@@ -16,8 +16,6 @@
*/
package org.apache.oodt.cas.workflow.cli.action;
-import java.util.Iterator;
-
//OODT imports
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
index 2b36b6b..7d5507f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
@@ -24,7 +24,6 @@ import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
import org.apache.oodt.cas.workflow.repository.WorkflowRepository;
import org.apache.oodt.cas.workflow.structs.*;
-import org.apache.oodt.cas.workflow.structs.exceptions.EngineException;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
index edc69ed..5b29f54 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
@@ -19,17 +19,17 @@
package org.apache.oodt.cas.workflow.instrepo;
//JDK imports
-import java.util.Iterator;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
+import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
+import org.apache.oodt.commons.pagination.PaginationUtils;
+
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
-import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
-import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import org.apache.oodt.commons.pagination.PaginationUtils;
/**
* @author mattmann
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
index d42c5e3..2b2184d 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
@@ -33,7 +33,6 @@ import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryExcepti
//JDK imports
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
index 4e6c462..279572f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
@@ -30,7 +30,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Date;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
index 3705080..547dfbd 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetMap.java
@@ -23,7 +23,6 @@ import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
index 602b958..1978697 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.workflow.lifecycle;
//JDK imports
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
index e2c6a07..287a8ba 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
@@ -20,7 +20,6 @@ package org.apache.oodt.cas.workflow.lifecycle;
//JDK imports
import java.text.NumberFormat;
-import java.util.Iterator;
import java.util.List;
//OODT imports
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
index 8fdd95a..693511e 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
@@ -33,14 +33,12 @@ import org.apache.xmlrpc.WebServer;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
index 1d54673..cfa013f 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
@@ -27,7 +27,6 @@ import java.net.URL;
import java.util.Hashtable;
import java.util.Vector;
import java.util.List;
-import java.util.Iterator;
import java.util.logging.Logger;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
index c86cd40..3a6f474 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
@@ -39,7 +39,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.List;
import java.util.Vector;
-import java.util.Iterator;
/**
* Generic Workflow object construction utilities.
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
index 5b9f047..871dc55 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
@@ -21,7 +21,6 @@ package org.apache.oodt.cas.workflow.util;
//JDK imports
import java.util.List;
import java.util.Vector;
-import java.util.Iterator;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
index cf0d706..9a7808c 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
@@ -19,7 +19,6 @@ package org.apache.oodt.cas.workflow.util;
//JDK imports
import java.util.List;
-import java.util.Iterator;
import java.util.Hashtable;
import java.util.Set;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
index 7056042..aaf290b 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
@@ -31,7 +31,6 @@ import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryExcepti
//JDK imports
import java.io.File;
import java.io.FileInputStream;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
index 0375d48..b5c8bb2 100644
--- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
+++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient.java
@@ -31,7 +31,6 @@ import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryExcepti
//JDK imports
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
index abe299e..5f42558 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/DatabaseTableGroup.java
@@ -18,7 +18,6 @@
package org.apache.oodt.xmlps.mapping;
//JDK imports
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
index 9c0ac12..3795a1b 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
@@ -36,7 +36,6 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
index 03e9719..5f66e14 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
@@ -30,7 +30,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.sql.SQLException;
-import java.util.Iterator;
import java.util.List;
import java.util.Stack;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/oodt/blob/63e6a135/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
----------------------------------------------------------------------
diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
index a882583..f7b92e0 100644
--- a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
+++ b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDERow.java
@@ -18,7 +18,6 @@
package org.apache.oodt.xmlps.structs;
//JDK imports
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
[10/12] oodt git commit: OODT-890 replace == with .equals()
Posted by ma...@apache.org.
OODT-890 replace == with .equals()
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/4a50c609
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/4a50c609
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/4a50c609
Branch: refs/heads/master
Commit: 4a50c609d97621bfdfb43a02ee730e60de2ea5af
Parents: 7ebb59a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:41:36 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:41:36 2015 +0000
----------------------------------------------------------------------
.../structs/query/QueryResultComparator.java | 4 +---
.../examples/TestTikaAutoDetectExtractor.java | 18 +++++++++---------
.../pushpull/filerestrictions/VirtualFile.java | 2 +-
.../cas/resource/mux/XmlBackendRepository.java | 18 +++++++++---------
4 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/4a50c609/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResultComparator.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResultComparator.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResultComparator.java
index 9552d11..9bab383 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResultComparator.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResultComparator.java
@@ -45,11 +45,9 @@ public class QueryResultComparator implements Comparator<QueryResult> {
public int compare(QueryResult qr1, QueryResult qr2) {
String m1 = qr1.getMetadata().getMetadata(sortByMetKey);
String m2 = qr2.getMetadata().getMetadata(sortByMetKey);
- if (m1 == m2)
+ if (m1.equals(m2))
return 0;
// return null last, since they are the least interesting
- if (m1 == null)
- return 1;
if (m2 == null)
return -1;
return m1.compareTo(m2);
http://git-wip-us.apache.org/repos/asf/oodt/blob/4a50c609/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java
index 331b67a..189f369 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestTikaAutoDetectExtractor.java
@@ -18,21 +18,21 @@
package org.apache.oodt.cas.filemgr.metadata.extractors.examples;
//JDK imports
-import java.net.URL;
-
-//Junit imports
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-// JUnit static imports
+import java.net.URL;
+
import static junit.framework.Assert.*;
+//Junit imports
+// JUnit static imports
//OODT imports
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
@RunWith(JUnit4.class)
@@ -57,6 +57,6 @@ public class TestTikaAutoDetectExtractor {
assertNotNull(outputMetadata);
assertTrue(outputMetadata.getAllKeys().size() > 0);
assertTrue(outputMetadata.containsKey("X-Parsed-By"));
- assertFalse(outputMetadata.getMetadata("X-Parsed-By") == "org.apache.tika.parser.EmptyParser");
+ assertFalse(outputMetadata.getMetadata("X-Parsed-By").equals("org.apache.tika.parser.EmptyParser"));
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/4a50c609/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 ddb8bb0..c49f35a 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
@@ -195,7 +195,7 @@ public class VirtualFile {
StringBuilder path = new StringBuilder(this.regExp);
VirtualFile parent = this.parent;
while (parent != null) {
- path.insert(0, (parent.regExp != "/" ? parent.regExp : "") + "/");
+ path.insert(0, (!parent.regExp.equals("/") ? parent.regExp : "") + "/");
parent = parent.parent;
}
return path.toString();
http://git-wip-us.apache.org/repos/asf/oodt/blob/4a50c609/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
index ffa2779..da0a82d 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/XmlBackendRepository.java
@@ -16,14 +16,6 @@
*/
package org.apache.oodt.cas.resource.mux;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.oodt.cas.resource.scheduler.Scheduler;
import org.apache.oodt.cas.resource.structs.exceptions.RepositoryException;
import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
@@ -32,6 +24,14 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* Class to load BackendManager from XML file.
* @author starchmd
@@ -175,7 +175,7 @@ public class XmlBackendRepository implements BackendRepository {
NodeList children = elem.getElementsByTagName(tag);
try {
String attr;
- if (children.getLength() != 1 || (attr = ((Element)children.item(0)).getAttribute("factory")) == "") {
+ if (children.getLength() != 1 || (attr = ((Element) children.item(0)).getAttribute("factory")).equals("")) {
throw new RepositoryException("Could not find exactly one "+tag+", with factory set, in queue: "+queue);
}
return attr;
[09/12] oodt git commit: OODT-907 remove collection never queried
Posted by ma...@apache.org.
OODT-907 remove collection never queried
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/7ebb59a7
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/7ebb59a7
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/7ebb59a7
Branch: refs/heads/master
Commit: 7ebb59a771e18ccea26602cb6788c4bc5b670503
Parents: 0096545
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:37:42 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:37:42 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/cas/filemgr/browser/model/CasDB.java | 9 ---------
.../cas/workflow/gui/perspective/view/impl/GraphView.java | 4 +---
.../workflow/event/EventToWorkflowViewer.java | 10 +++-------
.../workflow/repository/PackagedWorkflowRepository.java | 3 ---
4 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/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 eb04d97..5d185c0 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
@@ -26,7 +26,6 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.Metadata;
import java.net.URL;
-import java.util.Collections;
import java.util.Hashtable;
import java.util.Vector;
@@ -88,16 +87,8 @@ public class CasDB {
ProductType pt = client.getProductTypeByName(productTypeName);
Vector<Element> v = (Vector<Element>) client
.getElementsByProductType(pt);
- Vector<String> names = new Vector<String>();
elements = new String[v.size()];
- for (Element aV : v) {
- names.add(aV.getElementName());
- }
-
- Collections.sort(names);
- names.toArray(elements);
-
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
index e576112..210dee3 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
@@ -701,14 +701,12 @@ public class GraphView extends DefaultTreeView {
this.directedGraph.addVertex(modelGraph.getModel());
DefaultGraphCell modelCell = this.m_jgAdapter.getVertexCell(modelGraph
.getModel());
- Vector<DefaultGraphCell> group = new Vector<DefaultGraphCell>();
- group.add(modelCell);
+
HashMap<Object, Object> map = new HashMap<Object, Object>();
for (int i = 0; i < modelGraph.getChildren().size(); i++) {
ModelGraph child = modelGraph.getChildren().get(i);
DefaultGraphCell curCell = addGroups(child, nested, state);
- group.add(curCell);
Rectangle2D bounds = (Rectangle2D) ((Map<Object, Object>) nested
.get(curCell)).get("bounds");
if (bounds.getX() < top_x)
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
index 0d917a8..e3203c3 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
@@ -18,9 +18,6 @@
package org.apache.oodt.cas.webcomponents.workflow.event;
-import java.util.List;
-import java.util.Vector;
-
import org.apache.oodt.cas.webcomponents.workflow.WorkflowMgrConn;
import org.apache.oodt.cas.workflow.structs.Workflow;
import org.apache.wicket.PageParameters;
@@ -37,6 +34,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import java.util.List;
+
/**
*
* Describe your class here.
@@ -50,13 +49,10 @@ public class EventToWorkflowViewer extends Panel {
private static final long serialVersionUID = -5120511045763328237L;
private final WorkflowMgrConn wm;
-
- private final List<Workflow> workflows;
-
+
public EventToWorkflowViewer(String id, String workflowUrlStr, final Class<? extends WebPage> viewerPage) {
super(id);
this.wm = new WorkflowMgrConn(workflowUrlStr);
- this.workflows = new Vector<Workflow>();
WebMarkupContainer wTable = new WebMarkupContainer("wtable");
wTable.setVisible(false);
PropertyModel<List<Workflow>> workflowsModel = new PropertyModel<List<Workflow>>(this, "workflows");
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
index ea6db55..50ed8b5 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
@@ -50,8 +50,6 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
private Map<String, ParentChildWorkflow> workflows;
- private List<Graph> graphs;
-
private Map<String, WorkflowCondition> conditions;
private Map<String, WorkflowTask> tasks;
@@ -367,7 +365,6 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
this.conditions = new HashMap<String, WorkflowCondition>();
this.eventWorkflowMap = new HashMap<String, List<ParentChildWorkflow>>();
this.globalConfGroups = new HashMap<String, Metadata>();
- this.graphs = new Vector<Graph>();
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder parser;
[05/12] oodt git commit: OODT-890 remove unneeded boxing, unboxing,
swap indexof to contains, stringbuffer to builder
Posted by ma...@apache.org.
OODT-890 remove unneeded boxing, unboxing, swap indexof to contains, stringbuffer to builder
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/eadd1425
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/eadd1425
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/eadd1425
Branch: refs/heads/master
Commit: eadd142574b2eb637f7194b0d635a3c8c5b2de74
Parents: 1e5b0f9
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:16:39 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:16:39 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java | 2 +-
.../apache/oodt/commons/database/DatabaseConnectionBuilder.java | 2 +-
.../src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/eadd1425/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java
index 7bac32a..340b607 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java
@@ -47,7 +47,7 @@ public class TokenMgrError extends Error
* Replaces unprintable characters by their escaped (or unicode escaped)
* equivalents in the given string
*/
- protected static final String addEscapes(String str) {
+ protected static String addEscapes(String str) {
StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/eadd1425/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
index 1d98191..e997812 100644
--- a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
+++ b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
@@ -38,7 +38,7 @@ import org.apache.commons.pool.impl.GenericObjectPool;
*/
public final class DatabaseConnectionBuilder {
- public static final DataSource buildDataSource(String user, String pass,
+ public static DataSource buildDataSource(String user, String pass,
String driver, String url) {
DataSource ds;
http://git-wip-us.apache.org/repos/asf/oodt/blob/eadd1425/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 d441142..cfc7d41 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
@@ -261,7 +261,7 @@ public class Product {
this.rootRef = rootRef;
}
- public static final Product getDefaultFlatProduct(String name,
+ public static Product getDefaultFlatProduct(String name,
String defaultProductTypeId) {
Product defaultProduct = new Product();
defaultProduct.setProductName(name);