Author: bfoster
Date: Sat May 3 08:07:09 2014
New Revision: 1592161
URL: http://svn.apache.org/r1592161
Log:
This is the best short-term idea i've got... introduce properties which allows
you to force server-side only versioning:
org.apache.oodt.cas.filemgr.serverside.versioning ... if the property is not
set or used then filemgr works as it always has... but at least uniform usage
can now be enabled.
Also put in some clean up code around the running of the MetExtractors
OODT-681
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java?rev=1592161&r1=1592160&r2=1592161&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
Sat May 3 08:07:09 2014
@@ -56,9 +56,9 @@ import org.apache.oodt.cas.filemgr.versi
import org.apache.oodt.cas.filemgr.versioning.VersioningUtils;
import org.apache.oodt.cas.filemgr.datatransfer.TransferStatusTracker;
-
import com.google.common.collect.Lists;
+
//JDK imports
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -719,12 +719,9 @@ public class XmlRpcFileManager {
m.addMetadata((Hashtable)metadata);
addMetadata(p, m);
- if (!clientTransfer) {
- LOG.log(Level.FINEST,
- "File Manager: ingest: no client transfer enabled, "
- + "server transfering product: [" + p.getProductName() + "]");
-
- // version the product
+ // version the product
+ if (!clientTransfer || (clientTransfer
+ &&
Boolean.getBoolean("org.apache.oodt.cas.filemgr.serverside.versioning"))) {
Versioner versioner = null;
try {
versioner = GenericFileManagerObjectFactory
@@ -738,7 +735,12 @@ public class XmlRpcFileManager {
+ e.getMessage());
throw new VersioningException(e);
}
+ }
+ if (!clientTransfer) {
+ LOG.log(Level.FINEST,
+ "File Manager: ingest: no client transfer enabled, "
+ + "server transfering product: [" + p.getProductName() +
"]");
// add the newly versioned references to the data store
addProductReferences(p);
@@ -1090,18 +1092,16 @@ public class XmlRpcFileManager {
product.setProductType(repositoryManager.getProductTypeById(product
.getProductType().getProductTypeId()));
} catch (RepositoryManagerException e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, "Failed to load ProductType " + product
+ .getProductType().getProductTypeId(), e);
return null;
}
Metadata met = new Metadata();
met.addMetadata(metadata.getHashtable());
- if (product.getProductType().getExtractors() != null
- && product.getProductType().getExtractors().size() > 0) {
- for (Iterator<ExtractorSpec> i =
product.getProductType().getExtractors()
- .iterator(); i.hasNext();) {
- ExtractorSpec spec = i.next();
+ if (product.getProductType().getExtractors() != null) {
+ for (ExtractorSpec spec: product.getProductType().getExtractors())
{
FilemgrMetExtractor extractor = GenericFileManagerObjectFactory
.getExtractorFromClassName(spec.getClassName());
extractor.configure(spec.getConfiguration());
@@ -1112,13 +1112,12 @@ public class XmlRpcFileManager {
try {
met = extractor.extractMetadata(product, met);
} catch (MetExtractionException e) {
- e.printStackTrace();
- LOG.log(Level.WARNING,
+ LOG.log(Level.SEVERE,
"Exception extractor metadata from product: ["
+ product.getProductName()
+ "]: using extractor: ["
+ extractor.getClass().getName()
- + "]: Message: " + e.getMessage());
+ + "]: Message: " + e.getMessage(), e);
}
}
}
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java?rev=1592161&r1=1592160&r2=1592161&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
Sat May 3 08:07:09 2014
@@ -1202,25 +1202,27 @@ public class XmlRpcFileManagerClient {
product.setProductId(productId);
- // version the product
- Versioner versioner = GenericFileManagerObjectFactory
- .getVersionerFromClassName(product.getProductType()
- .getVersioner());
- versioner.createDataStoreReferences(product, metadata);
-
- // add the newly versioned references to the data store
- try {
- addProductReferences(product);
- } catch (CatalogException e) {
- LOG
- .log(
- Level.SEVERE,
- "ingestProduct: RepositoryManagerException
"
- + "when adding Product References
for Product : "
- + product.getProductName()
- + " to RepositoryManager: Message:
"
- + e.getMessage());
- throw e;
+ if
(!Boolean.getBoolean("org.apache.oodt.cas.filemgr.serverside.versioning")) {
+ // version the product
+ Versioner versioner = GenericFileManagerObjectFactory
+ .getVersionerFromClassName(product.getProductType()
+ .getVersioner());
+ versioner.createDataStoreReferences(product, metadata);
+
+ // add the newly versioned references to the data store
+ try {
+ addProductReferences(product);
+ } catch (CatalogException e) {
+ LOG
+ .log(
+ Level.SEVERE,
+ "ingestProduct:
RepositoryManagerException "
+ + "when adding Product
References for Product : "
+ + product.getProductName()
+ + " to RepositoryManager:
Message: "
+ + e.getMessage());
+ throw e;
+ }
}
// now transfer the product
