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/11/02 01:51:20 UTC
[4/6] oodt git commit: OODT-912 remove stackout put with log calls
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestMappedDataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestMappedDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestMappedDataSourceCatalog.java
index fa16e2a..0933f6f 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestMappedDataSourceCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestMappedDataSourceCatalog.java
@@ -21,6 +21,8 @@ package org.apache.oodt.cas.filemgr.catalog;
import java.io.File;
import java.net.URL;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
@@ -33,6 +35,7 @@ import java.util.Properties;
*/
public class TestMappedDataSourceCatalog extends TestDataSourceCatalog {
+ private static Logger LOG = Logger.getLogger(TestDataSourceCatalog.class.getName());
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -54,7 +57,7 @@ public class TestMappedDataSourceCatalog extends TestDataSourceCatalog {
try {
return new MappedDataSourceCatalogFactory().createCatalog();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
return null;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestOrderedDataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestOrderedDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestOrderedDataSourceCatalog.java
index 5e87ddc..5061457 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestOrderedDataSourceCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestOrderedDataSourceCatalog.java
@@ -23,6 +23,8 @@ import org.apache.oodt.cas.metadata.Metadata;
import java.io.File;
import java.net.URL;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* @author mattmann
@@ -34,7 +36,7 @@ import java.util.Properties;
* .
*/
public class TestOrderedDataSourceCatalog extends TestDataSourceCatalog {
-
+ private static Logger LOG = Logger.getLogger(TestOrderedDataSourceCatalog.class.getName());
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -53,7 +55,7 @@ public class TestOrderedDataSourceCatalog extends TestDataSourceCatalog {
try {
return new DataSourceCatalogFactory().createCatalog();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
return null;
}
}
@@ -80,7 +82,7 @@ public class TestOrderedDataSourceCatalog extends TestDataSourceCatalog {
myCat.addProduct(testProduct);
myCat.addMetadata(testMet, testProduct);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/UseMockClientCmdLineActionStore.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/UseMockClientCmdLineActionStore.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/UseMockClientCmdLineActionStore.java
index 9d526e1..d7462e5 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/UseMockClientCmdLineActionStore.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/UseMockClientCmdLineActionStore.java
@@ -45,7 +45,7 @@ public class UseMockClientCmdLineActionStore extends SpringCmdLineActionStore {
}
}
- public Set<CmdLineAction> loadSupportedActions() throws CmdLineActionStoreException {
+ public Set<CmdLineAction> loadSupportedActions() {
Set<CmdLineAction> actions = super.loadSupportedActions();
for (CmdLineAction action : actions) {
if (action instanceof FileManagerCliAction) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
index fe4df37..5531865 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
@@ -19,15 +19,7 @@
package org.apache.oodt.cas.filemgr.ingest;
//JDK imports
-import java.io.File;
-import java.io.FileInputStream;
-import java.net.URL;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
-//OODT imports
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.exceptions.CacheException;
@@ -35,11 +27,23 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManager;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
-
-// Jnit imports
import org.apache.oodt.commons.util.DateConvert;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import junit.framework.TestCase;
+//OODT imports
+// Jnit imports
+
/**
* @author mattmann
* @version $Revision$
@@ -49,7 +53,7 @@ import junit.framework.TestCase;
* </p>.
*/
public class TestCachedIngester extends TestCase {
-
+ private static Logger LOG = Logger.getLogger(TestCachedIngester.class.getName());
private static final int FM_PORT = 50010;
private XmlRpcFileManager fm;
@@ -282,7 +286,7 @@ public class TestCachedIngester extends TestCase {
try {
fm = new XmlRpcFileManager(FM_PORT);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
index 618e85b..ef1300c 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
@@ -19,15 +19,7 @@
package org.apache.oodt.cas.filemgr.ingest;
//JDK imports
-import java.io.File;
-import java.io.FileInputStream;
-import java.net.URL;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
-//OODT imports
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
@@ -38,9 +30,21 @@ import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.commons.util.DateConvert;
-//Junit imports
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import junit.framework.TestCase;
+//OODT imports
+//Junit imports
+
/**
* @author mattmann
* @version $Revision$
@@ -51,6 +55,7 @@ import junit.framework.TestCase;
*/
public class TestLocalCache extends TestCase {
+ private static Logger LOG = Logger.getLogger(TestLocalCache.class.getName());
private LocalCache cache;
private static final int FM_PORT = 50010;
@@ -197,7 +202,7 @@ public class TestLocalCache extends TestCase {
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
index 5d64370..d8521a9 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
@@ -19,6 +19,7 @@
package org.apache.oodt.cas.filemgr.ingest;
//OODT imports
+
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
@@ -29,7 +30,6 @@ import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.commons.util.DateConvert;
-//JDK imports
import java.io.File;
import java.io.FileInputStream;
import java.net.URL;
@@ -37,10 +37,14 @@ import java.util.Date;
import java.util.List;
import java.util.Properties;
import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-//Junit imports
import junit.framework.TestCase;
+//JDK imports
+//Junit imports
+
/**
* @author mattmann
* @version $Revision$
@@ -51,6 +55,7 @@ import junit.framework.TestCase;
*/
public class TestRmiCache extends TestCase {
+ private static Logger LOG = Logger.getLogger(TestRmiCache.class.getName());
private RmiCache cache;
private RmiCacheServer cacheServer;
@@ -166,7 +171,7 @@ public class TestRmiCache extends TestCase {
cacheServer.launchServer(new URL(FM_URL), RMI_PORT);
cache = new RmiCache(rmiServerURN);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail("Error performing test setup: Message: " + e.getMessage());
}
}
@@ -213,7 +218,7 @@ public class TestRmiCache extends TestCase {
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/TestProduct.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/TestProduct.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/TestProduct.java
index f8f65e8..74dc012 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/TestProduct.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/TestProduct.java
@@ -19,18 +19,23 @@
package org.apache.oodt.cas.filemgr.structs;
//OODT imports
+
import org.apache.oodt.commons.xml.XMLUtils;
-//JDK imports
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.net.URL;
import java.util.Collections;
import java.util.Properties;
-//Junit imports
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import junit.framework.TestCase;
+//JDK imports
+//Junit imports
+
/**
* @author mattmann
* @version $Revision$
@@ -42,6 +47,7 @@ import junit.framework.TestCase;
*/
public class TestProduct extends TestCase {
+ private static Logger LOG = Logger.getLogger(TestProduct.class.getName());
private Properties initialProperties = new Properties(System.getProperties());
public void setUp() throws Exception {
@@ -107,7 +113,7 @@ public class TestProduct extends TestCase {
try {
XMLUtils.writeXmlToStream(product.toXML(), os);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 af24067..2017817 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
@@ -17,9 +17,6 @@
package org.apache.oodt.cas.filemgr.structs.type;
-import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
-import org.apache.oodt.commons.database.SqlScript;
-import org.apache.oodt.commons.pagination.PaginationUtils;
import org.apache.oodt.cas.filemgr.catalog.Catalog;
import org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog;
import org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory;
@@ -38,6 +35,11 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManager;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.commons.database.SqlScript;
+import org.apache.oodt.commons.pagination.PaginationUtils;
+import org.apache.xmlrpc.XmlRpcException;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -53,12 +55,15 @@ import java.util.Properties;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.sql.DataSource;
-import org.apache.xmlrpc.XmlRpcException;
+
import junit.framework.TestCase;
public class TestTypeHandler extends TestCase {
-
+
+ private static Logger LOG = Logger.getLogger(TestTypeHandler.class.getName());
+
String tmpDirPath;
DataSource publicDataSource;
@@ -156,7 +161,7 @@ public class TestTypeHandler extends TestCase {
testProduct.setProductType(fmClient.getProductTypeByName("GenericFile"));
testProduct.setProductId(fmClient.ingestProduct(testProduct, met, false));
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -188,7 +193,7 @@ public class TestTypeHandler extends TestCase {
testProduct.setProductType(genericFile = fmClient.getProductTypeByName("GenericFile"));
testProduct.setProductId(fmClient.ingestProduct(testProduct, met, false));
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -290,7 +295,7 @@ public class TestTypeHandler extends TestCase {
coreSchemaScript.loadScript();
coreSchemaScript.execute();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -332,8 +337,6 @@ public class TestTypeHandler extends TestCase {
super(ds, valLayer, fieldId, pageSize, cacheUpdateMin);
}
- private final Logger LOG = Logger
- .getLogger(HsqlDbFriendlyDataSourceCatalog.class.getName());
/*
* (non-Javadoc)
@@ -631,7 +634,7 @@ public class TestTypeHandler extends TestCase {
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING, "Exception performing query. Message: "
+ e.getMessage());
try {
@@ -831,7 +834,7 @@ public class TestTypeHandler extends TestCase {
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"Exception performing get num results. Message: "
+ e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
index 2a66dad..c10922f 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManager.java
@@ -18,13 +18,7 @@
package org.apache.oodt.cas.filemgr.system;
//JDK imports
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Properties;
-//OODT imports
+
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.metadata.ProductMetKeys;
@@ -33,9 +27,20 @@ import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
-//Junit imports
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import junit.framework.TestCase;
+//OODT imports
+//Junit imports
+
/**
*
* Test harness for the XmlRpcFileManager.
@@ -44,7 +49,7 @@ import junit.framework.TestCase;
*
*/
public class TestXmlRpcFileManager extends TestCase {
-
+ private static Logger LOG = Logger.getLogger(TestXmlRpcFileManager.class.getName());
private static final int FM_PORT = 50001;
private XmlRpcFileManager fm;
@@ -72,7 +77,7 @@ public class TestXmlRpcFileManager extends TestCase {
try {
met = fmc.getMetadata(fmc.getProductByName("test.txt"));
} catch (CatalogException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -120,7 +125,7 @@ public class TestXmlRpcFileManager extends TestCase {
met = fmc.getReducedMetadata(fmc.getProductByName("test.txt"),
Collections.EMPTY_LIST);
} catch (CatalogException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 d7799ba..8822765 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
@@ -19,6 +19,7 @@
package org.apache.oodt.cas.filemgr.tools;
//OODT imports
+
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
@@ -27,15 +28,19 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
-//JDK imports
import java.io.File;
import java.io.FileInputStream;
import java.net.URL;
import java.util.List;
import java.util.Properties;
-//Junit imports
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import junit.framework.TestCase;
+//JDK imports
+//Junit imports
+
/**
* @author mattmann
* @version $Revision$
@@ -45,7 +50,7 @@ import junit.framework.TestCase;
* </p>.
*/
public class TestExpImpCatalog extends TestCase {
-
+ private static Logger LOG = Logger.getLogger(TestExpImpCatalog.class.getName());
private static final int FM_PORT = 50010;
private XmlRpcFileManager fm;
@@ -70,7 +75,7 @@ public class TestExpImpCatalog extends TestCase {
expImp.doExpImport();
expImp.doExpImport();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -99,7 +104,7 @@ public class TestExpImpCatalog extends TestCase {
assertEquals(1, countProds);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
}
@@ -111,7 +116,7 @@ public class TestExpImpCatalog extends TestCase {
expImp.doExpImport();
expImp.doExpImport();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -141,7 +146,7 @@ public class TestExpImpCatalog extends TestCase {
assertEquals(2, countProds);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -151,7 +156,7 @@ public class TestExpImpCatalog extends TestCase {
try {
expImp.doExpImport();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -168,7 +173,7 @@ public class TestExpImpCatalog extends TestCase {
assertNotNull(prod.getProductReferences());
assertEquals(1, prod.getProductReferences().size());
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
}
@@ -190,7 +195,7 @@ public class TestExpImpCatalog extends TestCase {
expImp = new ExpImpCatalog(new URL("http://localhost:" + FM_PORT),
new URL("http://localhost:" + (FM_PORT + 1)), true);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
index 03254db..6cc2ee4 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
@@ -19,19 +19,25 @@
package org.apache.oodt.cas.filemgr.util;
//OODT imports
+
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.commons.exec.EnvUtilities;
-//JDK imports
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-//Junit imports
import junit.framework.TestCase;
+//JDK imports
+//Junit imports
+
/**
* @author mattmann
* @version $Revision$
@@ -42,6 +48,7 @@ import junit.framework.TestCase;
*/
public class TestXmlStructFactory extends TestCase {
+ private static Logger LOG = Logger.getLogger(TestXmlStructFactory.class.getName());
private static final String origRepoPath = "[HOME]/some/path";
private static final String HOME = EnvUtilities.getEnv("HOME");
@@ -84,7 +91,7 @@ public class TestXmlStructFactory extends TestCase {
+ "]", type.getProductRepositoryPath(), expectedRepoPath);
} catch (ParserConfigurationException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
index 39d9bbe..efdca89 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
@@ -18,21 +18,25 @@
package org.apache.oodt.cas.filemgr.versioning;
//JDK imports
+
+import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.metadata.Metadata;
+
import java.io.File;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
import java.util.TimeZone;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.metadata.Metadata;
+import junit.framework.TestCase;
+//OODT imports
//Junit imports
-import junit.framework.TestCase;
/**
*
@@ -44,6 +48,7 @@ import junit.framework.TestCase;
*/
public class TestAcquisitionDateVersioner extends TestCase {
+ private static Logger LOG = Logger.getLogger(TestAcquisitionDateVersioner.class.getName());
private Properties initialProperties = new Properties(System.getProperties());
public void setUp() throws Exception {
@@ -75,7 +80,7 @@ public class TestAcquisitionDateVersioner extends TestCase {
try {
versioner.createDataStoreReferences(p, met);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -99,7 +104,7 @@ public class TestAcquisitionDateVersioner extends TestCase {
try {
versioner.createDataStoreReferences(p, met);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -122,7 +127,7 @@ public class TestAcquisitionDateVersioner extends TestCase {
try {
versioner.createDataStoreReferences(p, met);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
index 1bfe520..21849d5 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
@@ -18,19 +18,23 @@
package org.apache.oodt.cas.filemgr.versioning;
//JDK imports
-import java.io.File;
-import java.net.URL;
-import java.util.Properties;
-//OODT imports
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.metadata.Metadata;
-//Junit imports
+import java.io.File;
+import java.net.URL;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import junit.framework.TestCase;
+//OODT imports
+//Junit imports
+
/**
*
* Test harness for the {@link DirectoryProductVersioner}.
@@ -41,6 +45,7 @@ import junit.framework.TestCase;
*/
public class TestDirectoryBasedProductVersioner extends TestCase {
+ private static Logger LOG = Logger.getLogger(TestDirectoryBasedProductVersioner.class.getName());
private Properties initialProperties = new Properties(System.getProperties());
public void setUp() throws Exception {
@@ -69,7 +74,7 @@ public class TestDirectoryBasedProductVersioner extends TestCase {
try {
versioner.createDataStoreReferences(p, met);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 3ea12ed..7f6c0d9 100755
--- a/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
+++ b/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
@@ -17,13 +17,6 @@
package org.apache.oodt.grid;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.oodt.product.HttpRedirectException;
import org.apache.oodt.product.LargeProductQueryHandler;
import org.apache.oodt.product.ProductException;
@@ -33,6 +26,13 @@ import org.apache.oodt.xmlquery.LargeResult;
import org.apache.oodt.xmlquery.Result;
import org.apache.oodt.xmlquery.XMLQuery;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
* Product query servlet handles product queries. It always returns the first matching
@@ -212,7 +212,7 @@ public class ProductQueryServlet extends QueryServlet {
}
/** {@inheritDoc} */
- public void close(String id) throws ProductException {
+ public void close(String id) {
handler.close(id);
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 f7827df..c9a9c29 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
@@ -16,7 +16,9 @@
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;
@@ -28,6 +30,8 @@ import java.io.OutputStream;
import java.io.Serializable;
import java.net.URLEncoder;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -50,6 +54,7 @@ import javax.xml.transform.stream.StreamResult;
*/
public class SerializableMetadata extends Metadata implements Serializable {
+ private static Logger LOG = Logger.getLogger(SerializableMetadata.class.getName());
private static final long serialVersionUID = 6863087581652632499L;
private String xmlEncoding;
@@ -157,7 +162,7 @@ public class SerializableMetadata extends Metadata implements Serializable {
xformer.transform(source, result);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new IOException("Error generating metadata xml file!: "
+ e.getMessage());
}
@@ -207,7 +212,7 @@ public class SerializableMetadata extends Metadata implements Serializable {
}
return document;
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new IOException(
"Failed to create XML DOM Document for SerializableMetadata : "
+ e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
index 8b45d7a..b3ba890 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
@@ -21,6 +21,7 @@ package org.apache.oodt.cas.metadata.extractors;
//JDK imports
import java.io.File;
import java.util.logging.Level;
+import java.util.logging.Logger;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
@@ -52,7 +53,7 @@ import org.apache.oodt.cas.metadata.util.PathUtils;
* </p>.
*/
public class CopyAndRewriteExtractor extends CmdLineMetExtractor {
-
+ private static Logger LOG = Logger.getLogger(CopyAndRewriteExtractor.class.getName());
private final static String FILENAME = "Filename";
private final static String FILE_LOCATION = "FileLocation";
@@ -86,7 +87,7 @@ public class CopyAndRewriteExtractor extends CmdLineMetExtractor {
.getProperty("orig.met.file.path"))).toURL()
.openStream());
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new MetExtractionException(
"error parsing original met file: ["
+ ((CopyAndRewriteConfig) this.config)
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
index 084b243..86cd980 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
@@ -128,7 +128,7 @@ public class ExternMetExtractor extends CmdLineMetExtractor implements
sm.loadMetadataFromXmlStream(new FileInputStream(metFile));
return sm;
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new MetExtractionException(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java
index a9a9875..fdf9553 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java
@@ -19,15 +19,15 @@
package org.apache.oodt.cas.metadata.extractors;
//JDK imports
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+
import java.io.File;
import java.io.FileInputStream;
import java.util.logging.Level;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.SerializableMetadata;
-import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
-import org.apache.oodt.cas.metadata.extractors.CmdLineMetExtractor;
/**
* @author mattmann
@@ -97,7 +97,7 @@ public class MetReaderExtractor extends CmdLineMetExtractor {
met.loadMetadataFromXmlStream(new FileInputStream(metFileFullPath));
return met;
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new MetExtractionException(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/TikaCmdLineMetExtractor.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/TikaCmdLineMetExtractor.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/TikaCmdLineMetExtractor.java
index 81258f1..3a7c9e0 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/TikaCmdLineMetExtractor.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/TikaCmdLineMetExtractor.java
@@ -18,19 +18,21 @@
package org.apache.oodt.cas.metadata.extractors;
//JDK imports
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.tika.Tika;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Enumeration;
+import java.util.logging.Level;
import java.util.logging.Logger;
//Apache imports
-import org.apache.commons.lang.StringEscapeUtils;
-
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
-import org.apache.tika.Tika;
/**
* @author rverma
@@ -114,7 +116,7 @@ public class TikaCmdLineMetExtractor extends CmdLineMetExtractor {
return met;
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.severe(e.getMessage());
throw new MetExtractionException(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java
index 9a05ce3..193d640 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java
@@ -19,12 +19,16 @@
package org.apache.oodt.cas.metadata.preconditions;
//JDK imports
+
+import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
+import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
+
import java.io.File;
import java.io.FileInputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
-import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
/**
*
@@ -37,7 +41,7 @@ import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
* </p>.
*/
public class MimeTypeComparator extends PreConditionComparator<String> {
-
+ private static Logger LOG = Logger.getLogger(MimeTypeComparator.class.getName());
private boolean useMagic;
private MimeTypeUtils mimeTypeUtils = new MimeTypeUtils();
@@ -59,7 +63,7 @@ public class MimeTypeComparator extends PreConditionComparator<String> {
}
return tikaMimeType.compareTo(mimeType);
} catch (Throwable e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new PreconditionComparatorException(
"Failed to get mime-type for " + product + " : "
+ e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
index 445f853..ec48dad 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
@@ -48,17 +48,17 @@ public final class GenericMetadataObjectFactory {
extractor = (MetExtractor) metExtractorClass.newInstance();
return extractor;
} catch (ClassNotFoundException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"ClassNotFoundException when loading met extractor class "
+ className + " Message: " + e.getMessage());
} catch (InstantiationException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"InstantiationException when loading met extractor class "
+ className + " Message: " + e.getMessage());
} catch (IllegalAccessException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"IllegalAccessException when loading met extractor class "
+ className + " Message: " + e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
index d078082..da613d5 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
@@ -256,7 +256,7 @@ public final class MimeTypeUtils {
try {
return tika.detect(name);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
return null;
}
}
@@ -275,7 +275,7 @@ public final class MimeTypeUtils {
return tika.detect(f);
} catch (Exception e) {
System.err.println("\n\n\n");
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
System.err.println("\n\n\n");
return null;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
----------------------------------------------------------------------
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java b/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
index 0fbb832..3c523d5 100644
--- a/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
+++ b/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
@@ -146,7 +146,7 @@ public class TestSerializableMetadata extends TestCase {
try {
XMLUtils.writeXmlToStream(metadata.toXML(), out);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -155,7 +155,7 @@ public class TestSerializableMetadata extends TestCase {
metadata2 = new SerializableMetadata(new ByteArrayInputStream(out
.toByteArray()));
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java
index e0ac86d..192494c 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetExtractor.java
@@ -134,7 +134,7 @@ public class DatasetExtractor {
try {
dConn = new DConnect(datasetUrl, true);
} catch (FileNotFoundException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING, datasetUrl
+ " is neither a valid URL nor a filename.");
}
@@ -148,7 +148,7 @@ public class DatasetExtractor {
datasetUrls.add(datasetUrl);
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.SEVERE, " Some DAP2Exception or not a validate DDS", e);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
index 0292660..04f5089 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
@@ -77,7 +77,7 @@ public class OpendapProfileElementExtractor {
throw new NoSuchAttributeException("Att table for [" + varname + "] is null!");
}
} catch (NoSuchAttributeException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING, "Error extracting attribute table for element: ["
+ elemName + "]: Message: " + e.getMessage());
throw e;
@@ -96,7 +96,7 @@ public class OpendapProfileElementExtractor {
try {
attrValues = attr.getValues();
} catch (NoSuchAttributeException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING, "Attempt to resolve attribute: [" + attrName
+ "] failed: Message: " + e.getMessage());
continue;
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
index c17b274..1817d92 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/util/ProfileUtils.java
@@ -17,13 +17,21 @@
package org.apache.oodt.opendapps.util;
-import static org.apache.oodt.opendapps.config.OpendapConfigMetKeys.ENUM_ELEMENT_TYPE;
-import static org.apache.oodt.opendapps.config.OpendapConfigMetKeys.PROF_ATTR_SPEC_TYPE;
-import static org.apache.oodt.opendapps.config.OpendapConfigMetKeys.PROF_ELEM_SPEC_TYPE;
-import static org.apache.oodt.opendapps.config.OpendapConfigMetKeys.RANGED_ELEMENT_TYPE;
-import static org.apache.oodt.opendapps.config.OpendapConfigMetKeys.RES_ATTR_SPEC_TYPE;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.opendapps.OpendapProfileElementExtractor;
+import org.apache.oodt.opendapps.config.ConstantSpec;
+import org.apache.oodt.opendapps.config.DatasetMetElem;
+import org.apache.oodt.opendapps.config.OpendapConfig;
+import org.apache.oodt.opendapps.config.RewriteSpec;
+import org.apache.oodt.profile.EnumeratedProfileElement;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileAttributes;
+import org.apache.oodt.profile.ProfileElement;
+import org.apache.oodt.profile.ResourceAttributes;
+
+import org.springframework.util.StringUtils;
-//JDK imports
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -36,27 +44,17 @@ import java.util.TimeZone;
import java.util.logging.Level;
import java.util.logging.Logger;
-//OPENDAP imports
import opendap.dap.BaseType;
import opendap.dap.DArray;
import opendap.dap.DConnect;
import opendap.dap.DDS;
import opendap.dap.DGrid;
+import static org.apache.oodt.opendapps.config.OpendapConfigMetKeys.*;
+
+//JDK imports
+//OPENDAP imports
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.opendapps.OpendapProfileElementExtractor;
-import org.apache.oodt.opendapps.config.ConstantSpec;
-import org.apache.oodt.opendapps.config.DatasetMetElem;
-import org.apache.oodt.opendapps.config.OpendapConfig;
-import org.apache.oodt.opendapps.config.RewriteSpec;
-import org.apache.oodt.profile.EnumeratedProfileElement;
-import org.apache.oodt.profile.Profile;
-import org.apache.oodt.profile.ProfileAttributes;
-import org.apache.oodt.profile.ProfileElement;
-import org.apache.oodt.profile.ResourceAttributes;
-import org.springframework.util.StringUtils;
/**
*
@@ -124,7 +122,7 @@ public class ProfileUtils {
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING, "Error setting field: [" + spec.getName()
+ "] in resource attributes: Message: " + e.getMessage());
}
@@ -226,7 +224,7 @@ public class ProfileUtils {
}
} catch(Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING, "Error extracting metadata from DDS ("+dConn.URL()+") :" +e.getMessage());
// rethrow the exception so that this dataset is not harvested
throw e;
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
index 14c8eb7..75f2eef 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
@@ -18,19 +18,35 @@
package org.apache.oodt.pcs.tools;
//JDK imports
+
import org.apache.oodt.cas.crawl.daemon.CrawlDaemonController;
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.resource.structs.ResourceNode;
import org.apache.oodt.commons.date.DateUtils;
-import org.apache.oodt.pcs.health.*;
+import org.apache.oodt.pcs.health.CrawlInfo;
+import org.apache.oodt.pcs.health.CrawlPropertiesFile;
+import org.apache.oodt.pcs.health.CrawlerHealth;
+import org.apache.oodt.pcs.health.CrawlerStatus;
+import org.apache.oodt.pcs.health.JobHealthStatus;
+import org.apache.oodt.pcs.health.PCSDaemonStatus;
+import org.apache.oodt.pcs.health.PCSHealthMonitorMetKeys;
+import org.apache.oodt.pcs.health.PCSHealthMonitorReport;
+import org.apache.oodt.pcs.health.WorkflowStatesFile;
import org.apache.oodt.pcs.util.FileManagerUtils;
import org.apache.oodt.pcs.util.ResourceManagerUtils;
import org.apache.oodt.pcs.util.WorkflowManagerUtils;
import org.apache.xmlrpc.XmlRpcClient;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
//APACHE imports
//OODT imports
@@ -44,7 +60,7 @@ import java.util.*;
*/
public final class PCSHealthMonitor implements CoreMetKeys,
PCSHealthMonitorMetKeys {
-
+ private static Logger LOG = Logger.getLogger(PCSHealthMonitor.class.getName());
private FileManagerUtils fm;
private WorkflowManagerUtils wm;
@@ -203,7 +219,7 @@ public final class PCSHealthMonitor implements CoreMetKeys,
try {
mon.quickPrintMonitorToConsole();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 2705707..1219747 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
@@ -284,7 +284,7 @@ public class FileManagerUtils implements PCSConfigMetadata {
try {
types = fmgrClient.getProductTypes();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING, "Unable to retrieve product types from filemgr: ["
+ fmgrClient.getFileManagerUrl() + "]: reason: " + e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java
index efbe3c1..020ec6e 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java
@@ -18,6 +18,10 @@
package org.apache.oodt.pcs.util;
//JDK imports
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient;
+import org.apache.xmlrpc.XmlRpcClient;
+
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
@@ -27,9 +31,6 @@ 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.system.XmlRpcWorkflowManagerClient;
-import org.apache.xmlrpc.XmlRpcClient;
/**
*
@@ -67,7 +68,7 @@ public class WorkflowManagerUtils {
try {
this.client.updateWorkflowInstanceStatus(wInstId, status);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 d84c5ca..7eafa15 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
@@ -180,8 +180,7 @@ public class PGEConfigFileReader {
}
- private void addMonitorLevels(PGEConfigurationFile configFile, Element group)
- throws PGEConfigFileException {
+ private void addMonitorLevels(PGEConfigurationFile configFile, Element group) {
List scalars = PGEXMLFileUtils.getScalars(group);
@@ -290,8 +289,7 @@ public class PGEConfigFileReader {
addScalarFilesToGroup(group, configFile.getRecordedAuxiliaryInputFiles());
}
- private void addScalarFilesToGroup(Element group, PGEGroup pgeGroup)
- throws PGEConfigFileException {
+ private void addScalarFilesToGroup(Element group, PGEGroup pgeGroup) {
// get the scalars, and add them to the group
List scalars = PGEXMLFileUtils.getScalars(group);
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 baa698d..5a9ffea 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
@@ -170,13 +170,12 @@ public final class PGEConfigFileWriter implements PGEConfigFileKeys,
return document;
} catch (ParserConfigurationException pce) {
- pce.printStackTrace();
LOG.log(Level.WARNING, "Error generating pge configuration file!: "
+ pce.getMessage());
throw new Exception("Error generating pge configuration file!: "
+ pce.getMessage());
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw e;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileReaderTest.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileReaderTest.java b/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileReaderTest.java
index c3d41d4..555484d 100644
--- a/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileReaderTest.java
+++ b/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileReaderTest.java
@@ -41,7 +41,7 @@ public class PGEConfigFileReaderTest extends TestCase {
configFile = reader.read(this.getClass().getResource(
"pge-config-example.xml"));
} catch (PGEConfigFileException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java b/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java
index 3b327a8..58eafc5 100644
--- a/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java
+++ b/pcs/input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java
@@ -57,7 +57,7 @@ public class PGEConfigFileWriterTest extends TestCase {
try {
configFileDoc = configFileWriter.getConfigFileXml();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pcs/input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java
----------------------------------------------------------------------
diff --git a/pcs/input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java b/pcs/input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java
index 8304be0..a344a32 100644
--- a/pcs/input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java
+++ b/pcs/input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java
@@ -89,7 +89,7 @@ public class PGEDataHandlerTest extends TestCase {
SAXParser saxParser = factory.newSAXParser();
saxParser.parse(new File(testFilePath), handler);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail("exception reading data out of: [" + testFilePath + "]: Message: "
+ e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 b8fdb02..888c9ca 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
@@ -113,7 +113,7 @@ public class OpsuiApp extends WebApplication implements Serializable {
try {
return (Class<? extends Page>) Class.forName(getHomePageClass());
} catch (ClassNotFoundException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
return HomePage.class;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
index 3122f6f..629b9fb 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
@@ -61,7 +61,7 @@ public class FileManagerFileStager extends FileStager {
@VisibleForTesting
static DataTransfer createDataTransfer(PgeMetadata pgeMetadata,
- Logger logger) throws InstantiationException {
+ Logger logger) {
if (pgeMetadata.getMetadata(QUERY_CLIENT_TRANSFER_SERVICE_FACTORY) != null) {
return GenericFileManagerObjectFactory
.getDataTransferServiceFromFactory(pgeMetadata
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
index db3dc42..5b35e04 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java
@@ -16,9 +16,6 @@
*/
package org.apache.oodt.cas.pge.staging;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
-
import org.apache.commons.lang.Validate;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
@@ -30,6 +27,9 @@ import org.apache.oodt.cas.pge.config.FileStagingInfo;
import org.apache.oodt.cas.pge.exceptions.PGEException;
import org.apache.oodt.cas.pge.metadata.PgeMetadata;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Lists;
+
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -123,5 +123,5 @@ public abstract class FileStager {
protected abstract void stageFile(URI stageFile, File destDir,
PgeMetadata pgeMetadata, Logger logger)
- throws PGEException, IOException, DataTransferException, InstantiationException;
+ throws IOException, DataTransferException, InstantiationException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/main/java/org/apache/oodt/cas/pge/writers/DynamicConfigFileWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/DynamicConfigFileWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/DynamicConfigFileWriter.java
index b174375..45ad789 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/DynamicConfigFileWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/DynamicConfigFileWriter.java
@@ -17,12 +17,15 @@
package org.apache.oodt.cas.pge.writers;
//JDK imports
+
+import org.apache.oodt.cas.metadata.Metadata;
+
import java.io.File;
import java.io.IOException;
+import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
/**
* Abstract interface for generating PGE config input files defining the input
@@ -51,7 +54,7 @@ public abstract class DynamicConfigFileWriter implements SciPgeConfigFileWriter
return this.generateFile(sciPgeConfigFilePath, inputMetadata,
logger, customArgs);
} catch (Exception e) {
- e.printStackTrace();
+ logger.log(Level.SEVERE, e.getMessage());
throw new IOException(e);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
index 063efa2..3f64d7f 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/ExternExtractorMetWriter.java
@@ -23,7 +23,6 @@ import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
import org.apache.oodt.cas.metadata.extractors.ExternConfigReader;
import org.apache.oodt.cas.metadata.extractors.ExternMetExtractor;
-import org.apache.oodt.cas.pge.exceptions.PGEException;
import org.apache.oodt.commons.exceptions.CommonsException;
import java.io.File;
@@ -42,7 +41,7 @@ public class ExternExtractorMetWriter extends PcsMetFileWriter {
@Override
protected Metadata getSciPgeSpecificMetadata(File sciPgeConfigFilePath, Metadata inputMetadata, Object... customArgs)
- throws PGEException, MetExtractorConfigReaderException, MetExtractionException, FileNotFoundException,
+ throws MetExtractorConfigReaderException, MetExtractionException, FileNotFoundException,
ParseException, CommonsException, CasMetadataException {
ExternMetExtractor extractor = new ExternMetExtractor();
extractor.setConfigFile(new ExternConfigReader().parseConfigFile(new File(
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java
index 579c5a4..4a21481 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java
@@ -50,29 +50,24 @@ public abstract class PcsMetFileWriter {
PgeMetadata pgeMetadata, Object... customArgs)
throws PGEException, MetExtractorConfigReaderException, MetExtractionException, CommonsException,
FileNotFoundException, CasMetadataException, ParseException {
- try {
- Metadata inputMetadata = pgeMetadata.asMetadata();
+ Metadata inputMetadata = pgeMetadata.asMetadata();
- inputMetadata.replaceMetadata(CoreMetKeys.FILENAME,
- sciPgeCreatedDataFile.getName());
- inputMetadata.replaceMetadata(CoreMetKeys.FILE_LOCATION,
- sciPgeCreatedDataFile.getParentFile().getAbsolutePath());
- inputMetadata.replaceMetadata(FILE_SIZE, Long.toString(new File(
- inputMetadata.getMetadata(CoreMetKeys.FILE_LOCATION),
- inputMetadata.getMetadata(CoreMetKeys.FILENAME)).length()));
-
- return this.getSciPgeSpecificMetadata(
- sciPgeCreatedDataFile, inputMetadata, customArgs);
- } catch (PGEException e) {
- throw new PGEException("Failed to create PCS metadata file for '"
- + sciPgeCreatedDataFile + "' : " + e.getMessage(), e);
- }
+ inputMetadata.replaceMetadata(CoreMetKeys.FILENAME,
+ sciPgeCreatedDataFile.getName());
+ inputMetadata.replaceMetadata(CoreMetKeys.FILE_LOCATION,
+ sciPgeCreatedDataFile.getParentFile().getAbsolutePath());
+ inputMetadata.replaceMetadata(FILE_SIZE, Long.toString(new File(
+ inputMetadata.getMetadata(CoreMetKeys.FILE_LOCATION),
+ inputMetadata.getMetadata(CoreMetKeys.FILENAME)).length()));
+
+ return this.getSciPgeSpecificMetadata(
+ sciPgeCreatedDataFile, inputMetadata, customArgs);
}
protected abstract Metadata getSciPgeSpecificMetadata(
File sciPgeCreatedDataFile, Metadata inputMetadata,
Object... customArgs)
- throws PGEException, MetExtractorConfigReaderException, MetExtractionException, FileNotFoundException,
+ throws MetExtractorConfigReaderException, MetExtractionException, FileNotFoundException,
ParseException, CommonsException, CasMetadataException;
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
index acac422..41fffb5 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/xslt/XslTransformWriter.java
@@ -19,21 +19,26 @@
package org.apache.oodt.cas.pge.writers.xslt;
//JDK imports
+
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
+import org.apache.oodt.cas.pge.writers.SciPgeConfigFileWriter;
+
import java.io.File;
import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
//OODT imports
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.metadata.SerializableMetadata;
-import org.apache.oodt.cas.pge.writers.SciPgeConfigFileWriter;
/**
*
@@ -46,7 +51,7 @@ import org.apache.oodt.cas.pge.writers.SciPgeConfigFileWriter;
* </p>.
*/
public class XslTransformWriter implements SciPgeConfigFileWriter {
-
+ private static Logger LOG = Logger.getLogger(XslTransformWriter.class.getName());
public File createConfigFile(String sciPgeConfigFilePath,
Metadata inputMetadata, Object... customArgs) throws IOException {
try {
@@ -70,7 +75,7 @@ public class XslTransformWriter implements SciPgeConfigFileWriter {
return sciPgeConfigFile;
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new IOException("Failed to create science PGE config file '"
+ sciPgeConfigFilePath + "' : " + e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/test/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacementTemplateWriterTest.java
----------------------------------------------------------------------
diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacementTemplateWriterTest.java b/pge/src/test/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacementTemplateWriterTest.java
index 2ecc558..9b59e22 100644
--- a/pge/src/test/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacementTemplateWriterTest.java
+++ b/pge/src/test/java/org/apache/oodt/cas/pge/writers/MetadataKeyReplacementTemplateWriterTest.java
@@ -18,16 +18,19 @@
package org.apache.oodt.cas.pge.writers;
//JDK imports
+
+import org.apache.commons.io.FileUtils;
+import org.apache.oodt.cas.metadata.Metadata;
+
import java.io.File;
import java.io.IOException;
+import java.util.logging.Level;
import java.util.logging.Logger;
-//OODT imports
-import org.apache.commons.io.FileUtils;
-import org.apache.oodt.cas.metadata.Metadata;
+import junit.framework.TestCase;
+//OODT imports
//Junit imports
-import junit.framework.TestCase;
/**
*
@@ -65,7 +68,7 @@ public class MetadataKeyReplacementTemplateWriterTest extends TestCase {
try {
writer.generateFile(outPath, met, LOG, templateSourcePath);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
----------------------------------------------------------------------
diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java b/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
index c434e79..61b6ac4 100644
--- a/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
+++ b/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
@@ -17,16 +17,15 @@
package org.apache.oodt.cas.pge.writers;
+import org.apache.commons.io.FileUtils;
+import org.apache.oodt.cas.metadata.Metadata;
+
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.io.FileUtils;
-import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.pge.writers.VelocityConfigFileWriter;
-import org.apache.oodt.cas.pge.writers.VelocityMetadata;
-
import junit.framework.TestCase;
public class VelocityConfigFileWriterTest extends TestCase {
@@ -45,7 +44,7 @@ public class VelocityConfigFileWriterTest extends TestCase {
try {
vcfw.generateFile(config.toString(), metadata, LOG, url.getFile());
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
String output = FileUtils.readFileToString(config);
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java
index 595e3de..95ffe20 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java
@@ -19,19 +19,22 @@
package org.apache.oodt.product.handlers.ofsn;
//JDK imports
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.io.FileUtils;
+import org.apache.oodt.product.ProductException;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
//APACHE imports
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.io.FileUtils;
-
//OODT imports
-import org.apache.oodt.product.ProductException;
/**
*
@@ -44,12 +47,12 @@ import org.apache.oodt.product.ProductException;
public class MD5GetHandler implements OFSNGetHandler {
private MessageDigest md = null;
-
+ private static Logger LOG = Logger.getLogger(MD5GetHandler.class.getName());
public MD5GetHandler() throws InstantiationException {
try {
this.md = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new InstantiationException(e.getMessage());
}
}
@@ -85,7 +88,7 @@ public class MD5GetHandler implements OFSNGetHandler {
is.read(retBytes, 0, length);
return retBytes;
} catch (IOException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new ProductException("Error reading bytes from file: [" + filepath
+ "] MD5: Message: " + e.getMessage());
}
@@ -104,7 +107,7 @@ public class MD5GetHandler implements OFSNGetHandler {
filepath)));
return hash.getBytes().length;
} catch (IOException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
return -1;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
index 0b39838..cb344e9 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
@@ -19,14 +19,18 @@
package org.apache.oodt.product.handlers.ofsn;
//JDK imports
+
+import org.apache.oodt.product.ProductException;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.product.ProductException;
/**
*
@@ -38,7 +42,7 @@ import org.apache.oodt.product.ProductException;
*
*/
public class StdOFSNGetHandler implements OFSNGetHandler {
-
+ private static Logger LOG = Logger.getLogger(StdOFSNGetHandler.class.getName());
/*
* (non-Javadoc)
*
@@ -71,7 +75,7 @@ public class StdOFSNGetHandler implements OFSNGetHandler {
+ "] bytes from product: num actually read: [" + numRead + "]");
}
} catch (IOException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
throw new ProductException("IO exception retrieving chunk of product: ["
+ filepath + "]: Message: " + e.getMessage());
} finally {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNObjectFactory.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNObjectFactory.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNObjectFactory.java
index da7e029..6de92e9 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNObjectFactory.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNObjectFactory.java
@@ -55,17 +55,17 @@ public final class OFSNObjectFactory {
.forName(className);
return listHandler.newInstance();
} catch (ClassNotFoundException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"ClassNotFoundException when loading list handler class " + className
+ " Message: " + e.getMessage());
} catch (InstantiationException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"InstantiationException when loading list handler class " + className
+ " Message: " + e.getMessage());
} catch (IllegalAccessException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"IllegalAccessException when loading list handler class " + className
+ " Message: " + e.getMessage());
@@ -90,17 +90,17 @@ public final class OFSNObjectFactory {
.forName(className);
return getHandler.newInstance();
} catch (ClassNotFoundException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"ClassNotFoundException when loading get handler class " + className
+ " Message: " + e.getMessage());
} catch (InstantiationException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"InstantiationException when loading get handler class " + className
+ " Message: " + e.getMessage());
} catch (IllegalAccessException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
LOG.log(Level.WARNING,
"IllegalAccessException when loading get handler class " + className
+ " Message: " + e.getMessage());
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
index be5aa12..719c245 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
@@ -19,6 +19,9 @@
package org.apache.oodt.product.handlers.ofsn.util;
//OODT imports
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.product.handlers.ofsn.OFSNHandlerConfig;
import org.apache.oodt.product.handlers.ofsn.metadata.OFSNMetKeys;
@@ -27,24 +30,26 @@ import org.apache.oodt.product.handlers.ofsn.metadata.OODTMetKeys;
import org.apache.oodt.xmlquery.QueryElement;
import org.apache.oodt.xmlquery.XMLQuery;
-//JDK imports
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+//JDK imports
//APACHE imports
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
/**
*
@@ -55,7 +60,7 @@ import org.apache.commons.io.FilenameUtils;
*/
public final class OFSNUtils implements OODTMetKeys, OFSNXMLMetKeys,
OFSNMetKeys {
-
+ private static Logger LOG = Logger.getLogger(OFSNUtils.class.getName());
public static String extractFieldFromQuery(XMLQuery query, String name) {
for (Iterator<QueryElement> i = query.getWhereElementSet().iterator(); i
.hasNext();) {
@@ -119,7 +124,7 @@ public final class OFSNUtils implements OODTMetKeys, OFSNXMLMetKeys,
return document;
} catch (ParserConfigurationException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
return null;
}
@@ -155,7 +160,7 @@ public final class OFSNUtils implements OODTMetKeys, OFSNXMLMetKeys,
in.close();
}
} catch (IOException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, e.getMessage());
} finally {
if (out != null) {
try {
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
index fba28c8..e3a43d1 100644
--- a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
+++ b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
@@ -144,12 +144,8 @@ final class ChunkedProductInputStream extends InputStream {
public void close() throws IOException {
checkOpen(); // Open?
- try {
- retriever.close(id); // Tell retriever we're done
- open = false; // Flag it
- } catch (ProductException ex) {
- throw new IOException(ex.getMessage());
- }
+ retriever.close(id); // Tell retriever we're done
+ open = false; // Flag it
}
/**