You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ah...@apache.org on 2010/07/07 10:02:28 UTC
svn commit: r961284 [1/3] - in /incubator/oodt/trunk/filemgr/src/main/java:
gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/
org/apache/oodt/cas/filemgr/catalog/
org/apache/oodt/cas/filemgr/datatransfer/
org/apache/oodt/cas/filemgr/ingest/ org/apac...
Author: ahart
Date: Wed Jul 7 08:02:25 2010
New Revision: 961284
URL: http://svn.apache.org/viewvc?rev=961284&view=rev
Log:
progress towards OODT-15: rename packages and imports to 'org.apache.*' (cas-filemgr)
Added:
incubator/oodt/trunk/filemgr/src/main/java/org/
incubator/oodt/trunk/filemgr/src/main/java/org/apache/
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/ (props changed)
- copied from r961256, incubator/oodt/trunk/filemgr/src/main/java/gov/nasa/jpl/oodt/
Removed:
incubator/oodt/trunk/filemgr/src/main/java/gov/nasa/jpl/oodt/
Modified:
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
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/catalog/LuceneCatalogFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalog.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/AbstractCacheServerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.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/ingest/Ingester.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCacheFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RemoteableCache.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RmiCache.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RmiCacheFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RmiCacheServer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/RmiCacheServerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/AbstractFilemgrMetExtractor.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/FilemgrMetExtractor.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManager.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManager.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/RepositoryManagerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManagerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Element.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ExtractorSpec.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FileTransferStatus.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductPage.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Query.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/QueryCriteria.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/RangeQueryCriteria.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/TermQueryCriteria.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/CacheException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/CatalogException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/ConnectionException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/DataTransferException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/IngestException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/QueryFormulationException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/RepositoryManagerException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/ValidationLayerException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/VersioningException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/mime/MimeType.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/mime/MimeTypeException.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/mime/MimeTypes.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/mime/MimeTypesReader.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/ComplexQuery.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/QueryFilter.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/structs/query/QueryResultComparator.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/AsciiSortableVersionConverter.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/conv/VersionConverter.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/filter/FilterAlgor.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/filter/ObjectTimeEvent.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/query/filter/TimeEvent.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/type/TypeHandler.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/type/ValueReplaceTypeHandler.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/type/examples/MajorMinorVersionTypeHandler.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/system/auth/Dispatcher.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/Result.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DeleteProduct.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/DumpDbElementsToXml.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataBasedProductMover.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/tools/OptimizeLuceneCatalog.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductTypeDocTool.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/RangeQueryTester.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/DbStructFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/Pagination.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/QueryUtils.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.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/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/ValidationLayerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayerFactory.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/SingleFileBasicVersioner.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/Versioner.java
incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/VersioningUtils.java
Propchange: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/Catalog.java Wed Jul 7 08:02:25 2010
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
//JDK imports
import java.util.List;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.util.Pagination;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+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.util.Pagination;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.metadata.Metadata;
/**
* @author mattmann
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogFactory.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
/**
* @author mattmann
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java Wed Jul 7 08:02:25 2010
@@ -15,25 +15,25 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.BooleanQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Element;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.QueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.RangeQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.TermQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
-import gov.nasa.jpl.oodt.cas.filemgr.util.DbStructFactory;
-import gov.nasa.jpl.oodt.cas.commons.pagination.PaginationUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.structs.BooleanQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.Element;
+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.QueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
+import org.apache.oodt.cas.filemgr.util.DbStructFactory;
+import org.apache.oodt.cas.commons.pagination.PaginationUtils;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.metadata.Metadata;
import jpl.eda.util.DateConvert;
//JDK imports
@@ -108,8 +108,8 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addMetadata(gov.nasa.jpl.oodt.cas.metadata.Metadata,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#addMetadata(org.apache.oodt.cas.metadata.Metadata,
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void addMetadata(Metadata m, Product product)
throws CatalogException {
@@ -166,8 +166,8 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addMetadata(gov.nasa.jpl.oodt.cas.metadata.Metadata,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#addMetadata(org.apache.oodt.cas.metadata.Metadata,
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void removeMetadata(Metadata m, Product product)
throws CatalogException {
@@ -217,7 +217,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addProduct(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#addProduct(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void addProduct(Product product)
throws CatalogException {
@@ -315,7 +315,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#modifyProduct(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#modifyProduct(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void modifyProduct(Product product)
throws CatalogException {
@@ -382,7 +382,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#removeProduct(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#removeProduct(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void removeProduct(Product product)
throws CatalogException {
@@ -455,7 +455,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#setProductTransferStatus(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#setProductTransferStatus(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void setProductTransferStatus(Product product)
throws CatalogException {
@@ -516,7 +516,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addProductReferences(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#addProductReferences(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void addProductReferences(Product product)
throws CatalogException {
@@ -608,7 +608,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductById(java.lang.String)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductById(java.lang.String)
*/
public Product getProductById(String productId) throws CatalogException {
Connection conn = null;
@@ -680,7 +680,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductByName(java.lang.String)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductByName(java.lang.String)
*/
public Product getProductByName(String productName) throws CatalogException {
Connection conn = null;
@@ -754,7 +754,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductReferences(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductReferences(org.apache.oodt.cas.filemgr.structs.Product)
*/
public List<Reference> getProductReferences(Product product) throws CatalogException {
Connection conn = null;
@@ -830,7 +830,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProducts()
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProducts()
*/
public List<Product> getProducts() throws CatalogException {
Connection conn = null;
@@ -908,7 +908,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductsByProductType(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductsByProductType(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public List<Product> getProductsByProductType(ProductType type)
throws CatalogException {
@@ -1172,8 +1172,8 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#query(gov.nasa.jpl.oodt.cas.filemgr.structs.Query
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#query(org.apache.oodt.cas.filemgr.structs.Query
+ * org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public List<String> query(Query query, ProductType type) throws CatalogException {
return paginateQuery(query, type, -1);
@@ -1182,7 +1182,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int)
*/
public List<Product> getTopNProducts(int n) throws CatalogException {
return getTopNProducts(n, null);
@@ -1191,8 +1191,8 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int,
+ * org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public List<Product> getTopNProducts(int n, ProductType type)
throws CatalogException {
@@ -1287,7 +1287,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
*/
public ValidationLayer getValidationLayer() throws CatalogException {
if (validationLayer == null) {
@@ -1439,7 +1439,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getNumProducts(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getNumProducts(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public int getNumProducts(ProductType type) throws CatalogException {
Connection conn = null;
@@ -1521,7 +1521,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getFirstPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getFirstPage(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public ProductPage getFirstPage(ProductType type) {
Query query = new Query();
@@ -1539,7 +1539,7 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getLastProductPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getLastProductPage(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public ProductPage getLastProductPage(ProductType type) {
ProductPage lastPage = null;
@@ -1558,8 +1558,8 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getNextPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getNextPage(org.apache.oodt.cas.filemgr.structs.ProductType,
+ * org.apache.oodt.cas.filemgr.structs.ProductPage)
*/
public ProductPage getNextPage(ProductType type, ProductPage currentPage) {
if (currentPage == null) {
@@ -1586,8 +1586,8 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getPrevPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getPrevPage(org.apache.oodt.cas.filemgr.structs.ProductType,
+ * org.apache.oodt.cas.filemgr.structs.ProductPage)
*/
public ProductPage getPrevPage(ProductType type, ProductPage currentPage) {
if (currentPage == null) {
@@ -1613,8 +1613,8 @@ public class DataSourceCatalog implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#pagedQuery(gov.nasa.jpl.oodt.cas.filemgr.structs.Query,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, int)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#pagedQuery(org.apache.oodt.cas.filemgr.structs.Query,
+ * org.apache.oodt.cas.filemgr.structs.ProductType, int)
*/
public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
throws CatalogException {
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java Wed Jul 7 08:02:25 2010
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
//OODT imports
-import gov.nasa.jpl.oodt.cas.commons.database.DatabaseConnectionBuilder;
-import gov.nasa.jpl.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.metadata.util.PathUtils;
//JDK imports
import javax.sql.DataSource;
@@ -64,35 +64,35 @@ public class DataSourceCatalogFactory im
jdbcUrl = PathUtils
.replaceEnvVariables(System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.url"));
+ .getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.url"));
user = PathUtils
.replaceEnvVariables(System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.user"));
+ .getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.user"));
pass = PathUtils
.replaceEnvVariables(System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.pass"));
+ .getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.pass"));
driver = PathUtils
.replaceEnvVariables(System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.driver"));
+ .getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.driver"));
dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass,
driver, jdbcUrl);
String validationLayerFactoryClass = System
.getProperty("filemgr.validationLayer.factory",
- "gov.nasa.jpl.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory");
+ "org.apache.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory");
validationLayer = GenericFileManagerObjectFactory
.getValidationLayerFromFactory(validationLayerFactoryClass);
fieldIdStr = Boolean
- .getBoolean("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.quoteFields");
+ .getBoolean("org.apache.oodt.cas.filemgr.catalog.datasource.quoteFields");
pageSize = Integer
.getInteger(
- "gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.pageSize",
+ "org.apache.oodt.cas.filemgr.catalog.datasource.pageSize",
20).intValue();
cacheUpdateMinutes = Long
.getLong(
- "gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.cacheUpdateMinutes",
+ "org.apache.oodt.cas.filemgr.catalog.datasource.cacheUpdateMinutes",
5L).longValue();
}
@@ -108,7 +108,7 @@ public class DataSourceCatalogFactory im
this.dataSource = ds;
String validationLayerFactoryClass = System
.getProperty("filemgr.validationLayer.factory",
- "gov.nasa.jpl.oodt.cas.validation.DataSourceValidationLayerFactory");
+ "org.apache.oodt.cas.validation.DataSourceValidationLayerFactory");
validationLayer = GenericFileManagerObjectFactory
.getValidationLayerFromFactory(validationLayerFactoryClass);
}
@@ -116,7 +116,7 @@ public class DataSourceCatalogFactory im
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
+ * @see org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
*/
public Catalog createCatalog() {
return new DataSourceCatalog(dataSource, validationLayer, fieldIdStr,
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=961284&r1=961256&r2=961284&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 Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
//JDK imports
import java.io.File;
@@ -28,21 +28,21 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.BooleanQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Element;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.QueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.RangeQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.TermQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
-import gov.nasa.jpl.oodt.cas.commons.pagination.PaginationUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.structs.BooleanQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.Element;
+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.QueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
+import org.apache.oodt.cas.commons.pagination.PaginationUtils;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.metadata.Metadata;
//JUG imports
import org.safehaus.uuid.UUID;
@@ -146,8 +146,8 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addMetadata(gov.nasa.jpl.oodt.cas.metadata.Metadata,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#addMetadata(org.apache.oodt.cas.metadata.Metadata,
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void addMetadata(Metadata m, Product product)
throws CatalogException {
@@ -174,8 +174,8 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#removeMetadata(gov.nasa.jpl.oodt.cas.metadata.Metadata,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#removeMetadata(org.apache.oodt.cas.metadata.Metadata,
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void removeMetadata(Metadata m, Product product)
throws CatalogException {
@@ -237,7 +237,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addProduct(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#addProduct(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void addProduct(Product product)
throws CatalogException {
@@ -268,7 +268,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#modifyProduct(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#modifyProduct(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void modifyProduct(Product product)
throws CatalogException {
@@ -298,7 +298,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#removeProduct(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#removeProduct(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void removeProduct(Product product)
throws CatalogException {
@@ -308,7 +308,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#setProductTransferStatus(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#setProductTransferStatus(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void setProductTransferStatus(Product product)
throws CatalogException {
@@ -322,7 +322,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addProductReferences(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#addProductReferences(org.apache.oodt.cas.filemgr.structs.Product)
*/
public synchronized void addProductReferences(Product product)
throws CatalogException {
@@ -351,7 +351,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductById(java.lang.String)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductById(java.lang.String)
*/
public Product getProductById(String productId) throws CatalogException {
CompleteProduct prod = getCompleteProductById(productId, false);
@@ -413,7 +413,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductByName(java.lang.String)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductByName(java.lang.String)
*/
public Product getProductByName(String productName) throws CatalogException {
return getProductByName(productName, false);
@@ -463,7 +463,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductReferences(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductReferences(org.apache.oodt.cas.filemgr.structs.Product)
*/
public List<Reference> getProductReferences(Product product) throws CatalogException {
Product prod = getProductById(product.getProductId(), true);
@@ -476,7 +476,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProducts()
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProducts()
*/
public List<Product> getProducts() throws CatalogException {
return getProducts(false);
@@ -531,7 +531,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductsByProductType(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProductsByProductType(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public List<Product> getProductsByProductType(ProductType type)
throws CatalogException {
@@ -636,8 +636,8 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#query(gov.nasa.jpl.oodt.cas.filemgr.structs.Query,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#query(org.apache.oodt.cas.filemgr.structs.Query,
+ * org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public List<String> query(Query query, ProductType type) throws CatalogException {
// paginate products returns full products, but the query method
@@ -660,7 +660,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int)
*/
public List<Product> getTopNProducts(int n) throws CatalogException {
List<Product> products = null;
@@ -715,8 +715,8 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int,
+ * org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public List<Product> getTopNProducts(int n, ProductType type)
throws CatalogException {
@@ -742,7 +742,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
*/
public ValidationLayer getValidationLayer() throws CatalogException {
return valLayer;
@@ -751,7 +751,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getNumProducts(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getNumProducts(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public int getNumProducts(ProductType type) throws CatalogException {
Query query = new Query();
@@ -761,7 +761,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getFirstPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getFirstPage(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public ProductPage getFirstPage(ProductType type) {
ProductPage firstPage = null;
@@ -805,7 +805,7 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getLastProductPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getLastProductPage(org.apache.oodt.cas.filemgr.structs.ProductType)
*/
public ProductPage getLastProductPage(ProductType type) {
ProductPage lastPage = null;
@@ -841,8 +841,8 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getNextPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getNextPage(org.apache.oodt.cas.filemgr.structs.ProductType,
+ * org.apache.oodt.cas.filemgr.structs.ProductPage)
*/
public ProductPage getNextPage(ProductType type, ProductPage currentPage) {
if (currentPage == null) {
@@ -885,8 +885,8 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getPrevPage(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage)
+ * @see org.apache.oodt.cas.filemgr.util.Pagination#getPrevPage(org.apache.oodt.cas.filemgr.structs.ProductType,
+ * org.apache.oodt.cas.filemgr.structs.ProductPage)
*/
public ProductPage getPrevPage(ProductType type, ProductPage currentPage) {
if (currentPage == null) {
@@ -928,8 +928,8 @@ public class LuceneCatalog implements Ca
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#pagedQuery(gov.nasa.jpl.oodt.cas.filemgr.structs.Query,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, int)
+ * @see org.apache.oodt.cas.filemgr.catalog.Catalog#pagedQuery(org.apache.oodt.cas.filemgr.structs.Query,
+ * org.apache.oodt.cas.filemgr.structs.ProductType, int)
*/
public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
throws CatalogException {
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java Wed Jul 7 08:02:25 2010
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
/**
* @author mattmann
@@ -56,11 +56,11 @@ public class LuceneCatalogFactory implem
*/
public LuceneCatalogFactory() throws IllegalArgumentException {
indexFilePath = System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath");
+ .getProperty("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath");
if (indexFilePath == null) {
throw new IllegalArgumentException(
"error initializing lucene catalog: "
- + "[gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath="
+ + "[org.apache.oodt.cas.filemgr.catalog.lucene.idxPath="
+ indexFilePath);
}
@@ -69,29 +69,29 @@ public class LuceneCatalogFactory implem
String validationLayerFactoryClass = System
.getProperty("filemgr.validationLayer.factory",
- "gov.nasa.jpl.oodt.cas.validation.DataSourceValidationLayerFactory");
+ "org.apache.oodt.cas.validation.DataSourceValidationLayerFactory");
validationLayer = GenericFileManagerObjectFactory
.getValidationLayerFromFactory(validationLayerFactoryClass);
- pageSize = Integer.getInteger("gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.pageSize", 20).intValue();
+ pageSize = Integer.getInteger("org.apache.oodt.cas.filemgr.catalog.lucene.pageSize", 20).intValue();
commitLockTimeOut = Long
.getLong(
- "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
+ "org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
60).longValue();
writeLockTimeOut = Long
.getLong(
- "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
+ "org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
60).longValue();
mergeFactor = Integer.getInteger(
- "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20)
+ "org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20)
.intValue();
}
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
+ * @see org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
*/
public Catalog createCatalog() {
return new LuceneCatalog(indexFilePath, validationLayer, pageSize,
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalog.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalog.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalog.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
//JDK imports
import java.util.List;
@@ -23,15 +23,15 @@ import java.util.Properties;
import javax.sql.DataSource;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog;
+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.validation.ValidationLayer;
+import org.apache.oodt.cas.metadata.Metadata;
/**
* @author mattmann
@@ -74,9 +74,9 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#addMetadata(
- * gov.nasa.jpl.oodt.cas.metadata.Metadata,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#addMetadata(
+ * org.apache.oodt.cas.metadata.Metadata,
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
@Override
public synchronized void addMetadata(Metadata metadata, Product product)
@@ -91,8 +91,8 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#addProductReferences(
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#addProductReferences(
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
@Override
public synchronized void addProductReferences(Product product)
@@ -107,8 +107,8 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#getMetadata(
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#getMetadata(
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
@Override
public Metadata getMetadata(Product product) throws CatalogException {
@@ -123,8 +123,8 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#getProductReferences(
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#getProductReferences(
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
@Override
public List<Reference> getProductReferences(Product product) throws CatalogException {
@@ -139,8 +139,8 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#modifyProduct(
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#modifyProduct(
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
@Override
public synchronized void modifyProduct(Product product)
@@ -155,9 +155,9 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#removeMetadata(
- * gov.nasa.jpl.oodt.cas.metadata.Metadata,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#removeMetadata(
+ * org.apache.oodt.cas.metadata.Metadata,
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
@Override
public synchronized void removeMetadata(Metadata metadata, Product product)
@@ -172,8 +172,8 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#removeProduct(
- * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#removeProduct(
+ * org.apache.oodt.cas.filemgr.structs.Product)
*/
@Override
public synchronized void removeProduct(Product product)
@@ -188,8 +188,8 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#pagedQuery(gov.nasa.jpl.oodt.cas.filemgr.structs.Query,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, int)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#pagedQuery(org.apache.oodt.cas.filemgr.structs.Query,
+ * org.apache.oodt.cas.filemgr.structs.ProductType, int)
*/
@Override
public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
@@ -204,8 +204,8 @@ public class MappedDataSourceCatalog ext
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalog#query(gov.nasa.jpl.oodt.cas.filemgr.structs.Query,
- * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#query(org.apache.oodt.cas.filemgr.structs.Query,
+ * org.apache.oodt.cas.filemgr.structs.ProductType)
*/
@Override
public List<String> query(Query query, ProductType type) throws CatalogException {
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.catalog;
+package org.apache.oodt.cas.filemgr.catalog;
//JDK imports
import java.io.FileInputStream;
@@ -24,10 +24,10 @@ import java.io.IOException;
import java.util.Properties;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.metadata.util.PathUtils;
/**
* @author mattmann
@@ -44,7 +44,7 @@ public class MappedDataSourceCatalogFact
protected Properties typeMap;
- private static final String TYPE_MAP_KEY = "gov.nasa.jpl.oodt.cas.filemgr."
+ private static final String TYPE_MAP_KEY = "org.apache.oodt.cas.filemgr."
+ "catalog.mappeddatasource.mapFile";
public MappedDataSourceCatalogFactory() throws FileNotFoundException,
@@ -60,7 +60,7 @@ public class MappedDataSourceCatalogFact
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory#createCatalog()
+ * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory#createCatalog()
*/
@Override
public Catalog createCatalog() {
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransfer.java Wed Jul 7 08:02:25 2010
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.DataTransferException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
+import org.apache.oodt.cas.filemgr.structs.Product;
//JDK imports
import java.io.IOException;
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/DataTransferFactory.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
/**
* @author mattmann
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferFactory.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
/**
* @author woollard
@@ -34,7 +34,7 @@ public class InPlaceDataTransferFactory
}
/* (non-Javadoc)
- * @see gov.nasa.jpl.oodt.cas.datatransfer.DataTransferFactory#createDataTransfer()
+ * @see org.apache.oodt.cas.datatransfer.DataTransferFactory#createDataTransfer()
*/
public DataTransfer createDataTransfer() {
return new InPlaceDataTransferer();
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferer.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferer.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/InPlaceDataTransferer.java Wed Jul 7 08:02:25 2010
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.DataTransferException;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
//JDK imports
import java.io.IOException;
@@ -59,7 +59,7 @@ public class InPlaceDataTransferer imple
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.datatransfer.DataTransfer#setFileManagerUrl(java.net.URL)
+ * @see org.apache.oodt.cas.filemgr.datatransfer.DataTransfer#setFileManagerUrl(java.net.URL)
*/
public void setFileManagerUrl(URL url) {
try {
@@ -75,7 +75,7 @@ public class InPlaceDataTransferer imple
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.datatransfer.DataTransfer#transferProduct(gov.nasa.jpl.oodt.cas.data.structs.Product)
+ * @see org.apache.oodt.cas.datatransfer.DataTransfer#transferProduct(org.apache.oodt.cas.data.structs.Product)
*/
public void transferProduct(Product product) throws DataTransferException,
IOException {
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferFactory.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
/**
* @author mattmann
@@ -34,7 +34,7 @@ public class LocalDataTransferFactory im
}
/* (non-Javadoc)
- * @see gov.nasa.jpl.oodt.cas.datatransfer.DataTransferFactory#createDataTransfer()
+ * @see org.apache.oodt.cas.datatransfer.DataTransferFactory#createDataTransfer()
*/
public DataTransfer createDataTransfer() {
return new LocalDataTransferer();
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java Wed Jul 7 08:02:25 2010
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
//APACHE Imports
import org.apache.commons.io.FileUtils;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.DataTransferException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.mime.MimeTypes;
-import gov.nasa.jpl.oodt.cas.filemgr.versioning.VersioningUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.structs.mime.MimeTypes;
+import org.apache.oodt.cas.filemgr.versioning.VersioningUtils;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
//JDK imports
import java.io.IOException;
@@ -74,7 +74,7 @@ public class LocalDataTransferer impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.datatransfer.DataTransfer#setFileManagerUrl(java.net.URL)
+ * @see org.apache.oodt.cas.filemgr.datatransfer.DataTransfer#setFileManagerUrl(java.net.URL)
*/
public void setFileManagerUrl(URL url) {
try {
@@ -89,7 +89,7 @@ public class LocalDataTransferer impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.datatransfer.DataTransfer#transferProduct(gov.nasa.jpl.oodt.cas.data.structs.Product)
+ * @see org.apache.oodt.cas.datatransfer.DataTransfer#transferProduct(org.apache.oodt.cas.data.structs.Product)
*/
public void transferProduct(Product product) throws DataTransferException,
IOException {
@@ -131,7 +131,7 @@ public class LocalDataTransferer impleme
MimeTypes mimeTypeRepo = MimeTypes
.buildRepository(System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository"));
+ .getProperty("org.apache.oodt.cas.filemgr.mime.type.repository"));
String productName = null;
String productRepo = null;
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferFactory.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
//JDK imports
import java.util.logging.Level;
@@ -44,7 +44,7 @@ public class RemoteDataTransferFactory i
*/
public RemoteDataTransferFactory() throws InstantiationException {
chunkSize = Integer.getInteger(
- "gov.nasa.jpl.oodt.cas.filemgr.datatransfer.remote.chunkSize",
+ "org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize",
1024).intValue();
LOG.log(Level.INFO, "RemoteDataTransfer enabled: using chunk size: ["
@@ -54,7 +54,7 @@ public class RemoteDataTransferFactory i
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.datatransfer.DataTransferFactory#createDataTransfer()
+ * @see org.apache.oodt.cas.filemgr.datatransfer.DataTransferFactory#createDataTransfer()
*/
public DataTransfer createDataTransfer() {
return new RemoteDataTransferer(chunkSize);
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java Wed Jul 7 08:02:25 2010
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.DataTransferException;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
//JDK imports
import java.io.File;
@@ -77,7 +77,7 @@ public class RemoteDataTransferer implem
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.datatransfer.DataTransfer#setFileManagerUrl(java.net.URL)
+ * @see org.apache.oodt.cas.filemgr.datatransfer.DataTransfer#setFileManagerUrl(java.net.URL)
*/
public void setFileManagerUrl(URL url) {
try {
@@ -94,7 +94,7 @@ public class RemoteDataTransferer implem
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.datatransfer.DataTransfer#transferProduct(gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+ * @see org.apache.oodt.cas.filemgr.datatransfer.DataTransfer#transferProduct(org.apache.oodt.cas.filemgr.structs.Product)
*/
public void transferProduct(Product product) throws DataTransferException,
IOException {
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/TransferStatusTracker.java Wed Jul 7 08:02:25 2010
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.datatransfer;
+package org.apache.oodt.cas.filemgr.datatransfer;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.FileTransferStatus;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.structs.FileTransferStatus;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/AbstractCacheServerFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/AbstractCacheServerFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/AbstractCacheServerFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/AbstractCacheServerFactory.java Wed Jul 7 08:02:25 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.ingest;
+package org.apache.oodt.cas.filemgr.ingest;
//OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
//JDK imports
import java.net.MalformedURLException;
@@ -51,13 +51,13 @@ public abstract class AbstractCacheServe
public AbstractCacheServerFactory() throws InstantiationException {
rangeQueryElementName = System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.rangeQueryElementName");
+ .getProperty("org.apache.oodt.cas.filemgr.ingest.cache.rangeQueryElementName");
// before we replace env vars, try to replace date vars
rangeStartDateTime = System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.range.start");
+ .getProperty("org.apache.oodt.cas.filemgr.ingest.cache.range.start");
rangeEndDateTime = System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.range.end");
+ .getProperty("org.apache.oodt.cas.filemgr.ingest.cache.range.end");
try {
rangeStartDateTime = PathUtils
@@ -68,20 +68,20 @@ public abstract class AbstractCacheServe
}
uniqueElementName = System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.uniqueElementName");
+ .getProperty("org.apache.oodt.cas.filemgr.ingest.cache.uniqueElementName");
productTypeNames = Arrays.asList(PathUtils.replaceEnvVariables(
- System.getProperty("gov.nasa.jpl.oodt.cas.filemgr.ingest."
+ System.getProperty("org.apache.oodt.cas.filemgr.ingest."
+ "cache.productType")).split(","));
try {
fmUrl = new URL(
System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.filemgr.url"));
+ .getProperty("org.apache.oodt.cas.filemgr.ingest.cache.filemgr.url"));
} catch (MalformedURLException e) {
throw new InstantiationException(
"Unable to construct file manager url for: ["
+ System
- .getProperty("gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.filemgr.url")
+ .getProperty("org.apache.oodt.cas.filemgr.ingest.cache.filemgr.url")
+ "]: malformed URL exception.");
}
}
@@ -89,7 +89,7 @@ public abstract class AbstractCacheServe
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.CacheFactory#createCache()
+ * @see org.apache.oodt.cas.filemgr.ingest.CacheFactory#createCache()
*/
public abstract Cache createCache() throws InstantiationException;
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Cache.java Wed Jul 7 08:02:25 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.ingest;
+package org.apache.oodt.cas.filemgr.ingest;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CacheException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CacheException;
//JDK imports
import java.net.URL;
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CacheFactory.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.ingest;
+package org.apache.oodt.cas.filemgr.ingest;
/**
* @author mattmann
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java Wed Jul 7 08:02:25 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.ingest;
+package org.apache.oodt.cas.filemgr.ingest;
//JDK imports
import java.io.File;
@@ -25,9 +25,9 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CacheException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CacheException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
/**
* @author mattmann
@@ -97,7 +97,7 @@ public class CachedIngester extends StdI
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.StdIngester#hasProduct(java.net.URL,
+ * @see org.apache.oodt.cas.filemgr.ingest.StdIngester#hasProduct(java.net.URL,
* java.io.File)
*/
public boolean hasProduct(URL fmUrl, File prodFile) throws CatalogException {
@@ -107,7 +107,7 @@ public class CachedIngester extends StdI
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.StdIngester#hasProduct(java.net.URL,
+ * @see org.apache.oodt.cas.filemgr.ingest.StdIngester#hasProduct(java.net.URL,
* java.lang.String)
*/
public boolean hasProduct(URL fmUrl, String productName)
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=961284&r1=961256&r2=961284&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 Wed Jul 7 08:02:25 2010
@@ -16,13 +16,13 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.ingest;
+package org.apache.oodt.cas.filemgr.ingest;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.IngestException;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractor;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.metadata.util.GenericMetadataObjectFactory;
+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.util.GenericMetadataObjectFactory;
//JDK imports
import java.io.BufferedReader;
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/Ingester.java Wed Jul 7 08:02:25 2010
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.ingest;
+package org.apache.oodt.cas.filemgr.ingest;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.IngestException;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractor;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.IngestException;
+import org.apache.oodt.cas.metadata.MetExtractor;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java?rev=961284&r1=961256&r2=961284&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java Wed Jul 7 08:02:25 2010
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.ingest;
+package org.apache.oodt.cas.filemgr.ingest;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.RangeQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.TermQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CacheException;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Query;
+import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CacheException;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
//JDK imports
import java.net.URL;
@@ -102,7 +102,7 @@ public class LocalCache implements Cache
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#sync(java.util.List)
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#sync(java.util.List)
*/
public void sync(List<String> uniqueElementProductTypeNames) throws CacheException {
sync(DEFAULT_UNIQUE_MET_KEY, uniqueElementProductTypeNames);
@@ -111,7 +111,7 @@ public class LocalCache implements Cache
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#sync(java.lang.String,
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#sync(java.lang.String,
* java.util.List)
*/
public void sync(String uniqueElementName,
@@ -140,7 +140,7 @@ public class LocalCache implements Cache
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#clear()
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#clear()
*/
public void clear() {
this.uniqueElements.clear();
@@ -149,7 +149,7 @@ public class LocalCache implements Cache
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#size()
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#size()
*/
public int size() {
return this.uniqueElements.size();
@@ -158,7 +158,7 @@ public class LocalCache implements Cache
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#contains(java.lang.String)
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#contains(java.lang.String)
*/
public boolean contains(String productName) {
return this.uniqueElements.contains(productName);
@@ -167,7 +167,7 @@ public class LocalCache implements Cache
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#setFileManager(java.net.URL)
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#setFileManager(java.net.URL)
*/
public void setFileManager(URL fmUrl) {
try {
@@ -182,7 +182,7 @@ public class LocalCache implements Cache
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#sync()
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#sync()
*/
public void sync() throws CacheException {
if (this.uniqueElementName == null
@@ -198,7 +198,7 @@ public class LocalCache implements Cache
}
/* (non-Javadoc)
- * @see gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache#getFileManagerUrl()
+ * @see org.apache.oodt.cas.filemgr.ingest.Cache#getFileManagerUrl()
*/
public URL getFileManagerUrl() {
return this.fm.getFileManagerUrl();