Author: mattmann
Date: Sat Jul 17 05:28:41 2010
New Revision: 965017
URL: http://svn.apache.org/viewvc?rev=965017&view=rev
Log:
- OODT-15 WIP: filemgr now builds; fix all unit tests; integrate with latest
metadata changes; depend on stable jug from maven central; depend on stable
lucene from maven central
Modified:
incubator/oodt/trunk/filemgr/pom.xml
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResult.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
Modified: incubator/oodt/trunk/filemgr/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/pom.xml?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/pom.xml (original)
+++ incubator/oodt/trunk/filemgr/pom.xml Sat Jul 17 05:28:41 2010
@@ -6,25 +6,16 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>2.0</version>
+ <version>${oodt.version}</version>
+ <relativePath>../core/pom.xml</relativePath>
</parent>
- <artifactId>filemgr</artifactId>
+ <artifactId>cas-filemgr</artifactId>
<name>Catalog and Archive File Management Component</name>
- <version>1.9.0-dev</version>
<description>The file management component of a Catalog and Archive Service.
This component
purposefully separates data stores and metadata stores as standard
interfaces, and
provides some out of the box backend implementations of them (including
one based
on the javax.sql.DataSource interface). This component provides
everything that you need
to catalog, archive and manage files, and directories, and their
associated metadata.</description>
- <ciManagement>
- <notifiers>
- <notifier>
- <configuration>
- <address>[email protected]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
<build>
<plugins>
<plugin>
@@ -74,13 +65,13 @@
<dependencies>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>commons</artifactId>
- <version>1.2.0-dev</version>
+ <artifactId>oodt-commons</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>metadata</artifactId>
- <version>1.7.0-dev</version>
+ <artifactId>cas-metadata</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -95,7 +86,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -123,14 +114,15 @@
<version>2.0.0</version>
</dependency>
<dependency>
- <groupId>jug</groupId>
- <artifactId>jug-asl</artifactId>
+ <groupId>org.safehaus.jug</groupId>
+ <artifactId>jug</artifactId>
<version>2.0.0</version>
+ <classifier>asl</classifier>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>
<artifactId>xmlrpc</artifactId>
- <version>2.1-dev</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
Sat Jul 17 05:28:41 2010
@@ -212,14 +212,7 @@ public class LuceneCatalog implements Ca
for (Iterator<Element> i = metadataTypes.iterator(); i.hasNext();) {
Element element = i.next();
- List<String> values = m.getAllMetadata(element.getElementName());
-
- if (values != null) {
- for (Iterator<String> j = values.iterator(); j.hasNext();) {
- String value = j.next();
- removeMetadata(currMet, element.getElementName(), value);
- }
- }
+ currMet.removeMetadata(element.getElementName());
}
p.setMetadata(currMet);
@@ -1195,20 +1188,6 @@ public class LuceneCatalog implements Ca
return doc;
}
- private boolean removeMetadata(Metadata m, String key, String value) {
- List<String> currVals = m.getAllMetadata(key);
-
- if (currVals != null) {
- for (Iterator<String> i = currVals.iterator(); i.hasNext();) {
- String curVal = i.next();
- if (curVal.equals(value)) {
- return currVals.remove(curVal);
- }
- }
- }
- return false;
- }
-
private boolean hasMetadataAndRefs(CompleteProduct cp) {
if (cp.getMetadata() != null && cp.getProduct() != null) {
if (cp.getReferences() != null && cp.getReferences().size() > 0) {
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
Sat Jul 17 05:28:41 2010
@@ -22,6 +22,7 @@ package org.apache.oodt.cas.filemgr.inge
import org.apache.oodt.cas.filemgr.structs.exceptions.IngestException;
import org.apache.oodt.cas.metadata.MetExtractor;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.cas.metadata.util.GenericMetadataObjectFactory;
//JDK imports
@@ -114,7 +115,7 @@ public class CmdLineIngester extends Std
String productID = null;
if (metFilePath != null) {
productID = ingester.ingest(new URL(fmUrlStr), new File(
- filePath), new Metadata(
+ filePath), new SerializableMetadata(
new FileInputStream(metFilePath)));
} else {
extractor = GenericMetadataObjectFactory
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResult.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResult.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResult.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryResult.java
Sat Jul 17 05:28:41 2010
@@ -81,17 +81,17 @@ public class QueryResult {
if (format == null)
return concatMetadataIntoString(metadata);
String outputString = format;
- for (Entry<String, List<String>> entry : (Set<Entry<String,
List<String>>>) metadata
+ for (Entry<String, Object> entry : (Set<Entry<String, Object>>)
metadata
.getHashtable().entrySet())
- outputString = outputString.replaceAll("\\$" + entry.getKey(),
StringUtils.collectionToDelimitedString(entry.getValue(), ","));
+ outputString = outputString.replaceAll("\\$" + entry.getKey(),
StringUtils.collectionToDelimitedString((List<String>)entry.getValue(), ","));
return outputString;
}
private static String concatMetadataIntoString(Metadata metadata) {
String outputString = "";
- for (Entry<String, List<String>> entry : (Set<Entry<String,
List<String>>>) metadata
+ for (Entry<String, Object> entry : (Set<Entry<String, Object>>)
metadata
.getHashtable().entrySet())
- outputString +=
StringUtils.collectionToDelimitedString(entry.getValue(), ",") + ",";
+ outputString +=
StringUtils.collectionToDelimitedString((List<String>)entry.getValue(), ",") +
",";
return outputString.substring(0, outputString.length() - 1);
}
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
Sat Jul 17 05:28:41 2010
@@ -673,7 +673,7 @@ public class XmlRpcFileManager {
Hashtable<String, String> metadata) throws CatalogException {
Product p = XmlRpcStructFactory.getProductFromXmlRpc(productHash);
Metadata m = new Metadata();
- m.addMetadata(metadata);
+ m.addMetadata((Hashtable)metadata);
return addMetadata(p, m);
}
@@ -697,7 +697,7 @@ public class XmlRpcFileManager {
// now add the metadata
Metadata m = new Metadata();
- m.addMetadata(metadata);
+ m.addMetadata((Hashtable)metadata);
addMetadata(p, m);
if (!clientTransfer) {
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
Sat Jul 17 05:28:41 2010
@@ -39,6 +39,7 @@ import java.io.File;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
import
org.apache.oodt.cas.filemgr.structs.exceptions.QueryFormulationException;
import
org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
@@ -1386,7 +1387,7 @@ public class XmlRpcFileManagerClient {
try {
Metadata metadata = null;
URL metaUrl = new File(new URI(metadataFileName)).toURL();
- metadata = new Metadata(metaUrl.openStream());
+ metadata = new SerializableMetadata(metaUrl.openStream());
System.out.println("ingestProduct: Result: "
+ client.ingestProduct(product, metadata,
clientTransfer));
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java
Sat Jul 17 05:28:41 2010
@@ -22,6 +22,7 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
@@ -91,7 +92,7 @@ public final class MetadataDumper {
private void writeMetFileToDir(Metadata met, String fullMetFilePath) {
try {
- XMLUtils.writeXmlFile(met.toXML(), fullMetFilePath);
+ XMLUtils.writeXmlFile(new SerializableMetadata(met).toXML(),
fullMetFilePath);
} catch (Exception e) {
LOG.log(Level.WARNING, "Met file not generated: reason: "
+ e.getMessage(), e);
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
Sat Jul 17 05:28:41 2010
@@ -359,7 +359,7 @@ public final class XmlRpcStructFactory {
Metadata typeMet = new Metadata();
if (productTypeHash.get("typeMetadata") != null) {
typeMet
- .addMetadata((Hashtable<String, String>)
productTypeHash.get("typeMetadata"));
+ .addMetadata((Hashtable)
productTypeHash.get("typeMetadata"));
}
if (productTypeHash.get("typeExtractors") != null) {
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
(original)
+++
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
Sat Jul 17 05:28:41 2010
@@ -99,7 +99,7 @@ public final class XmlStructFactory {
Element metadataRoot = XMLUtils.getFirstElement("metadata",
productTypeElem);
if (metadataRoot != null) {
- Hashtable<String, List<String>> metHash = new Hashtable<String,
List<String>>();
+ Hashtable<String, Object> metHash = new Hashtable<String,
Object>();
met = new Metadata();
NodeList keyValElems = metadataRoot.getElementsByTagName("keyval");
Modified:
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
(original)
+++
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
Sat Jul 17 05:28:41 2010
@@ -34,6 +34,7 @@ import org.apache.oodt.cas.filemgr.struc
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;
@@ -103,7 +104,7 @@ public class TestCachedIngester extends
Metadata prodMet = null;
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
@@ -174,7 +175,7 @@ public class TestCachedIngester extends
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
Modified:
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
(original)
+++
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
Sat Jul 17 05:28:41 2010
@@ -34,6 +34,7 @@ import org.apache.oodt.cas.filemgr.syste
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.filemgr.util.XmlRpcStructFactory;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.commons.util.DateConvert;
//Junit imports
@@ -176,7 +177,7 @@ public class TestLocalCache extends Test
Metadata prodMet = null;
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
Modified:
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
(original)
+++
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
Sat Jul 17 05:28:41 2010
@@ -26,6 +26,7 @@ import org.apache.oodt.cas.filemgr.syste
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.filemgr.util.XmlRpcStructFactory;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.commons.util.DateConvert;
//JDK imports
@@ -192,7 +193,7 @@ public class TestRmiCache extends TestCa
Metadata prodMet = null;
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
Modified:
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
(original)
+++
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
Sat Jul 17 05:28:41 2010
@@ -29,6 +29,7 @@ import org.apache.oodt.cas.filemgr.struc
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 junit.framework.TestCase;
@@ -62,7 +63,7 @@ public class TestStdIngester extends Tes
Metadata prodMet = null;
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
Modified:
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
(original)
+++
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
Sat Jul 17 05:28:41 2010
@@ -27,6 +27,7 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.query.QueryResult;
import org.apache.oodt.cas.filemgr.util.SqlParser;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
//JDK imports
import java.io.File;
@@ -214,7 +215,7 @@ public class TestXmlRpcFileManagerClient
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
Modified:
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
(original)
+++
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
Sat Jul 17 05:28:41 2010
@@ -25,6 +25,7 @@ import org.apache.oodt.cas.filemgr.struc
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;
//JDK imports
import java.io.File;
@@ -219,7 +220,7 @@ public class TestExpImpCatalog extends T
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
Modified:
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java?rev=965017&r1=965016&r2=965017&view=diff
==============================================================================
---
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
(original)
+++
incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
Sat Jul 17 05:28:41 2010
@@ -23,6 +23,7 @@ import org.apache.oodt.cas.filemgr.inges
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManager;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
//JDK imports
import java.io.File;
@@ -77,7 +78,7 @@ public class TestMetadataBasedProductMov
StdIngester ingester = new StdIngester(transferServiceFacClass);
try {
- prodMet = new Metadata(new FileInputStream(
+ prodMet = new SerializableMetadata(new FileInputStream(
"./src/testdata/ingest/test.txt.met"));
// now add the right file location
