Repository: oodt Updated Branches: refs/heads/master 35d3b2219 -> f286ded40
http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java index 75a6c4d..f2eff3c 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java @@ -29,6 +29,8 @@ import org.junit.Test; import java.io.File; import java.util.Collections; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import static org.junit.Assert.*; @@ -43,6 +45,8 @@ import static org.junit.Assert.*; */ public class TestPackagedWorkflowRepository { + private static Logger LOG = Logger.getLogger(TestPackagedWorkflowRepository.class.getName()); + private PackagedWorkflowRepository repo; public TestPackagedWorkflowRepository() { @@ -133,7 +137,7 @@ public class TestPackagedWorkflowRepository { cond = this.repo.getWorkflowConditionById("urn:npp:MOA_IASI_L1C_Daily"); } catch(Exception e){ - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -151,7 +155,7 @@ public class TestPackagedWorkflowRepository { cond = this.repo.getWorkflowConditionById("urn:npp:MOA_ORBITS_FileBased"); } 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/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java index 507d20e..f252136 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java @@ -34,9 +34,10 @@ import org.junit.Test; import java.io.File; import java.util.List; import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; import static org.junit.Assert.*; -import static org.junit.Assert.fail; /** @@ -50,6 +51,7 @@ import static org.junit.Assert.fail; */ public class TestWorkflowRepository { + private static Logger LOG = Logger.getLogger(TestWorkflowRepository.class.getName()); private XMLWorkflowRepository workflowRepository = null; private static List workflowDirUris = new Vector(); @@ -90,7 +92,7 @@ public class TestWorkflowRepository { try { w = workflowRepository.getWorkflowByName("backwardsTestWorkflow"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -104,7 +106,7 @@ public class TestWorkflowRepository { w = workflowRepository .getWorkflowById("urn:oodt:backwardsTestWorkflow"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -117,7 +119,7 @@ public class TestWorkflowRepository { try { workflows = workflowRepository.getWorkflows(); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -131,7 +133,7 @@ public class TestWorkflowRepository { try { workflows = workflowRepository.getWorkflowsForEvent("test"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -141,7 +143,7 @@ public class TestWorkflowRepository { try { workflows = workflowRepository.getWorkflowsForEvent("backwards"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -152,7 +154,7 @@ public class TestWorkflowRepository { try { workflows = workflowRepository.getWorkflowsForEvent("externalScript"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -167,7 +169,7 @@ public class TestWorkflowRepository { tasks = workflowRepository .getTasksByWorkflowId("urn:oodt:backwardsTestWorkflow"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -181,7 +183,7 @@ public class TestWorkflowRepository { tasks = workflowRepository .getTasksByWorkflowName("backwardsTestWorkflow"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -195,7 +197,7 @@ public class TestWorkflowRepository { conditions = workflowRepository .getConditionsByTaskId("urn:oodt:GoodbyeWorld"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -209,7 +211,7 @@ public class TestWorkflowRepository { conditions = workflowRepository .getConditionsByTaskName("Goodbye World"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -225,7 +227,7 @@ public class TestWorkflowRepository { cond = workflowRepository.getWorkflowConditionById("urn:oodt:TimeoutCondition"); } catch(Exception e){ - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -241,7 +243,7 @@ public class TestWorkflowRepository { cond = workflowRepository.getWorkflowConditionById("urn:oodt:OptionalCondition"); } catch(Exception e){ - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -255,7 +257,7 @@ public class TestWorkflowRepository { config = workflowRepository .getConfigurationByTaskId("urn:oodt:GoodbyeWorld"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } @@ -269,7 +271,7 @@ public class TestWorkflowRepository { config = workflowRepository .getConfigurationByTaskId("urn:oodt:PropReplaceTask"); } catch (RepositoryException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); fail(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java index c99bdc0..b9a177b 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java @@ -18,6 +18,9 @@ package org.apache.oodt.cas.workflow.system; //JDK imports +import org.apache.commons.io.FileUtils; +import org.apache.oodt.cas.metadata.Metadata; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -26,12 +29,10 @@ import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -//Junit imports import junit.framework.TestCase; +//Junit imports //OODT imports -import org.apache.commons.io.FileUtils; -import org.apache.oodt.cas.metadata.Metadata; /** * @@ -63,7 +64,7 @@ public class TestXmlRpcWorkflowManager extends TestCase { try { workflowInsts = wmgr.getWorkflowInstances(); } catch (Exception e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); } assertNotNull(workflowInsts); @@ -94,7 +95,7 @@ public class TestXmlRpcWorkflowManager extends TestCase { try { client.sendEvent("long", new Metadata()); } catch (Exception e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); throw new RuntimeException(e); } @@ -153,7 +154,7 @@ public class TestXmlRpcWorkflowManager extends TestCase { try { wmgr = new XmlRpcWorkflowManager(WM_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/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java b/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java index de082f9..8046479 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/product/DBMSExecutor.java @@ -18,6 +18,7 @@ package org.apache.oodt.xmlps.product; //OODT imports + import org.apache.oodt.commons.database.DatabaseConnectionBuilder; import org.apache.oodt.xmlps.structs.CDEResult; @@ -25,6 +26,8 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.sql.DataSource; @@ -37,7 +40,7 @@ import javax.sql.DataSource; * . */ public class DBMSExecutor { - + private static Logger LOG = Logger.getLogger(DBMSExecutor.class.getName()); private final DataSource dataSource; public DBMSExecutor() { @@ -55,7 +58,7 @@ public class DBMSExecutor { ResultSet rs = statement.executeQuery(sql); return new CDEResult(rs, conn); } catch (SQLException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); throw e; } // do not close the Statement or Connection here http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java b/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java index 8cfd80a..efd5e58 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java @@ -103,9 +103,9 @@ public class XMLPSProductHandler implements QueryHandler { .load(new FileInputStream(dbPropFilePath)); } catch (FileNotFoundException e) { // TODO Auto-generated catch block - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); } catch (IOException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); throw new InstantiationException(e.getMessage()); } @@ -236,7 +236,7 @@ public class XMLPSProductHandler implements QueryHandler { res.setConstValues(getConstValuesForQuery(query)); query.getResults().add(res); } catch (SQLException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); LOG.log(Level.WARNING, "Error executing sql: [" + sqlBuf.toString() + "]: Message: " + e.getMessage()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 3795a1b..bd9d70f 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 @@ -93,7 +93,7 @@ public class DBMSExecutor { } } catch (SQLException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); throw e; } finally { if (statement != null) { @@ -147,7 +147,7 @@ public class DBMSExecutor { elem.getValues().add(elemDbVal); } } catch (SQLException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); LOG.log(Level.WARNING, "Unable to obtain field: [" + fld.getLocalName() + "] from result set: message: " + e.getMessage()); http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/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 7f2987f..fd7150a 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 @@ -89,9 +89,9 @@ public class XMLPSProfileHandler extends XMLPSProductHandler implements .load(new FileInputStream(dbPropFilePath)); } catch (FileNotFoundException e) { // TODO Auto-generated catch block - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); } catch (IOException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); throw new InstantiationException(e.getMessage()); } @@ -114,7 +114,7 @@ public class XMLPSProfileHandler extends XMLPSProductHandler implements translateToDomain(selectSet, true); translateToDomain(whereSet, false); } catch (Exception e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); throw new ProfileException(e.getMessage()); } return queryAndPackageProfiles(query); @@ -183,7 +183,7 @@ public class XMLPSProfileHandler extends XMLPSProductHandler implements .toString(), this.resLocationSpec); } catch (SQLException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); LOG.log(Level.WARNING, "Error executing sql: [" + sqlBuf.toString() + "]: Message: " + e.getMessage()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java b/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java index f402b6a..ad1534a 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/util/GenericCDEObjectFactory.java @@ -18,11 +18,12 @@ package org.apache.oodt.xmlps.util; //JDK imports +import org.apache.oodt.xmlps.mapping.funcs.MappingFunc; + import java.util.logging.Level; import java.util.logging.Logger; //OODT imports -import org.apache.oodt.xmlps.mapping.funcs.MappingFunc; /** * @@ -48,17 +49,17 @@ public final class GenericCDEObjectFactory { func = (MappingFunc) funcClazz.newInstance(); return func; } catch (ClassNotFoundException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); LOG.log(Level.WARNING, "Unable to load class: [" + className + "]: class not found! message: " + e.getMessage(), e); return null; } catch (InstantiationException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); LOG.log(Level.WARNING, "Unable to load class: [" + className + "]: cannot instantiate! message: " + e.getMessage(), e); return null; } catch (IllegalAccessException e) { - e.printStackTrace(); + LOG.log(Level.SEVERE, e.getMessage()); LOG.log(Level.WARNING, "Unable to load class: [" + className + "]: illegal access! message: " + e.getMessage(), e); return null; http://git-wip-us.apache.org/repos/asf/oodt/blob/f286ded4/xmlps/src/test/java/org/apache/oodt/xmlps/mapping/TestMappingReader.java ---------------------------------------------------------------------- diff --git a/xmlps/src/test/java/org/apache/oodt/xmlps/mapping/TestMappingReader.java b/xmlps/src/test/java/org/apache/oodt/xmlps/mapping/TestMappingReader.java index bddc7ed..d0b37ca 100644 --- a/xmlps/src/test/java/org/apache/oodt/xmlps/mapping/TestMappingReader.java +++ b/xmlps/src/test/java/org/apache/oodt/xmlps/mapping/TestMappingReader.java @@ -18,10 +18,13 @@ package org.apache.oodt.xmlps.mapping; //APACHE imports + import org.apache.oodt.xmlps.mapping.funcs.MappingFunc; import org.apache.oodt.xmlps.structs.CDEValue; import java.io.InputStream; +import java.util.logging.Level; +import java.util.logging.Logger; import junit.framework.TestCase; @@ -29,7 +32,7 @@ import junit.framework.TestCase; * Test suite for XMLPS xml map file reader. */ public class TestMappingReader extends TestCase { - + private static Logger LOG = Logger.getLogger(TestMappingReader.class.getName()); private static final String expectedName = "Test Query Handler"; private static final String expectedId = "urn:oodt:xmlps:testps"; @@ -152,7 +155,7 @@ public class TestMappingReader extends TestCase { try { mapping = MappingReader.getMapping(configFileIs); } 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/xmlquery/src/main/java/org/apache/oodt/product/Retriever.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/product/Retriever.java b/xmlquery/src/main/java/org/apache/oodt/product/Retriever.java index 0e88f06..a7b4ea2 100755 --- a/xmlquery/src/main/java/org/apache/oodt/product/Retriever.java +++ b/xmlquery/src/main/java/org/apache/oodt/product/Retriever.java @@ -42,5 +42,5 @@ public interface Retriever { * @param productID Product ID. * @throws ProductException if an error occurs. */ - void close(String productID) throws ProductException; + void close(String productID); }
