Repository: oodt Updated Branches: refs/heads/OODT-755 c8804a9b1 -> dbe3e0220
OODT-755 clean up commit Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/dbe3e022 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/dbe3e022 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/dbe3e022 Branch: refs/heads/OODT-755 Commit: dbe3e02203480f3d26106cb0d61a876896d4aa5d Parents: c8804a9 Author: Tom Barber <[email protected]> Authored: Thu Oct 15 22:11:26 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Thu Oct 15 22:11:26 2015 +0100 ---------------------------------------------------------------------- .../cas/filemgr/system/XmlRpcFileManager.java | 34 +++++++++++++++----- .../filemgr/system/XmlRpcFileManagerClient.java | 26 +++++++++++---- 2 files changed, 45 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/dbe3e022/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java index f22ab6c..b7370c1 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java @@ -17,7 +17,6 @@ package org.apache.oodt.cas.filemgr.system; -//APACHE imports import com.google.common.collect.Lists; import org.apache.oodt.cas.filemgr.catalog.Catalog; @@ -26,8 +25,20 @@ import org.apache.oodt.cas.filemgr.datatransfer.TransferStatusTracker; import org.apache.oodt.cas.filemgr.metadata.ProductMetKeys; import org.apache.oodt.cas.filemgr.metadata.extractors.FilemgrMetExtractor; import org.apache.oodt.cas.filemgr.repository.RepositoryManager; -import org.apache.oodt.cas.filemgr.structs.*; -import org.apache.oodt.cas.filemgr.structs.exceptions.*; +import org.apache.oodt.cas.filemgr.structs.Element; +import org.apache.oodt.cas.filemgr.structs.ExtractorSpec; +import org.apache.oodt.cas.filemgr.structs.FileTransferStatus; +import org.apache.oodt.cas.filemgr.structs.Product; +import org.apache.oodt.cas.filemgr.structs.ProductPage; +import org.apache.oodt.cas.filemgr.structs.ProductType; +import org.apache.oodt.cas.filemgr.structs.Query; +import org.apache.oodt.cas.filemgr.structs.Reference; +import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; +import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException; +import org.apache.oodt.cas.filemgr.structs.exceptions.QueryFormulationException; +import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException; +import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException; +import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException; import org.apache.oodt.cas.filemgr.structs.query.ComplexQuery; import org.apache.oodt.cas.filemgr.structs.query.QueryFilter; import org.apache.oodt.cas.filemgr.structs.query.QueryResult; @@ -44,16 +55,23 @@ import org.apache.oodt.cas.metadata.exceptions.MetExtractionException; import org.apache.oodt.commons.date.DateUtils; import org.apache.xmlrpc.WebServer; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.util.*; +import java.util.Arrays; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -//OODT imports -//JDK imports /** * @author mattmann @@ -683,7 +701,7 @@ public class XmlRpcFileManager { public String ingestProduct(Hashtable<String, Object> productHash, Hashtable<String, String> metadata, boolean clientTransfer) throws VersioningException, RepositoryManagerException, - DataTransferException, CatalogException { + DataTransferException, CatalogException { Product p = XmlRpcStructFactory.getProductFromXmlRpc(productHash); http://git-wip-us.apache.org/repos/asf/oodt/blob/dbe3e022/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java index c26eaec..832c4af 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java @@ -17,22 +17,37 @@ package org.apache.oodt.cas.filemgr.system; -//APACHE imports import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpMethodRetryHandler; import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.oodt.cas.cli.CmdLineUtility; import org.apache.oodt.cas.filemgr.datatransfer.DataTransfer; -import org.apache.oodt.cas.filemgr.structs.*; -import org.apache.oodt.cas.filemgr.structs.exceptions.*; +import org.apache.oodt.cas.filemgr.structs.Element; +import org.apache.oodt.cas.filemgr.structs.FileTransferStatus; +import org.apache.oodt.cas.filemgr.structs.Product; +import org.apache.oodt.cas.filemgr.structs.ProductPage; +import org.apache.oodt.cas.filemgr.structs.ProductType; +import org.apache.oodt.cas.filemgr.structs.Query; +import org.apache.oodt.cas.filemgr.structs.Reference; +import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; +import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; +import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException; +import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException; +import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException; +import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException; import org.apache.oodt.cas.filemgr.structs.query.ComplexQuery; import org.apache.oodt.cas.filemgr.structs.query.QueryResult; import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory; import org.apache.oodt.cas.filemgr.util.XmlRpcStructFactory; import org.apache.oodt.cas.filemgr.versioning.Versioner; import org.apache.oodt.cas.metadata.Metadata; -import org.apache.xmlrpc.*; +import org.apache.xmlrpc.CommonsXmlRpcTransport; +import org.apache.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.XmlRpcClientException; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.XmlRpcTransport; +import org.apache.xmlrpc.XmlRpcTransportFactory; import java.io.File; import java.io.FileInputStream; @@ -44,8 +59,6 @@ import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -//JDK imports -//OODT imports /** * @author mattmann (Chris Mattmann) @@ -1287,7 +1300,6 @@ public class XmlRpcFileManagerClient { throw new Exception(e2); } catch (Exception e) { - //e.printStackTrace(); LOG.log(Level.SEVERE, "Failed to ingest product [ id: " + product.getProductId() + "/ name:" +product.getProductName() + "] :" + e.getMessage() + " -- rolling back ingest"); try {
