incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r964663 [1/5] - in /incubator/oodt/trunk: ./ commons/ commons/src/main/java/org/apache/oodt/commons/date/ core/ crawler/src/main/java/org/apache/oodt/cas/crawl/ crawler/src/main/java/org/apache/oodt/cas/crawl/action/ crawler/src/main/java/o...
Date Fri, 16 Jul 2010 03:00:31 GMT
Author: kelly
Date: Fri Jul 16 03:00:26 2010
New Revision: 964663

URL: http://svn.apache.org/viewvc?rev=964663&view=rev
Log:
WIP OODT-15 OODT-16
Correct imports for commons classes; add ignores; convert package and imports from gov.nasa.jpl and jpl.eda to org.apache; add FIXME notes regarding namespace URIs and formal public identifiers; remove redundant "cas" appearing in "cas.commons" imports; remove Caltech notices; add ASF notices; adjust groupIds; fix versions; correct spelling; disalbe metadata extraction unit tests; promulgate dependencies; add pcs-input; migrate classes left out of the initial migration; remove executable bits on files that shouldn't be executable; nuke oracle-specific code from profile module; add admonition regarding memory usage when generating documentation.


Added:
    incubator/oodt/trunk/pcs-input/   (with props)
    incubator/oodt/trunk/pcs-input/pom.xml
    incubator/oodt/trunk/pcs-input/src/
    incubator/oodt/trunk/pcs-input/src/main/
    incubator/oodt/trunk/pcs-input/src/main/java/
    incubator/oodt/trunk/pcs-input/src/main/java/org/
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileException.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileReader.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileWriter.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigurationFile.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEDataHandler.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEDataParseKeys.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEGroup.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEMatrix.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEScalar.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEVector.java
    incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java
    incubator/oodt/trunk/pcs-input/src/main/resources/
    incubator/oodt/trunk/pcs-input/src/main/resources/pge-config-example.xml
    incubator/oodt/trunk/pcs-input/src/main/resources/pge-data-sax-example.xml
    incubator/oodt/trunk/pcs-input/src/test/
    incubator/oodt/trunk/pcs-input/src/test/org/
    incubator/oodt/trunk/pcs-input/src/test/org/apache/
    incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/
    incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/
    incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/
    incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEConfigFileReaderTest.java
    incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java
    incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java
Removed:
    incubator/oodt/trunk/mvn/skin/src/main/resources/css/oodt.css
    incubator/oodt/trunk/mvn/skin/src/main/resources/images/arrow.gif
    incubator/oodt/trunk/mvn/skin/src/main/resources/images/logo_first_gov.gif
    incubator/oodt/trunk/mvn/skin/src/main/resources/images/logo_nasa.gif
    incubator/oodt/trunk/mvn/skin/src/main/resources/images/spacer.gif
Modified:
    incubator/oodt/trunk/CHANGES.txt
    incubator/oodt/trunk/README.txt
    incubator/oodt/trunk/commons/pom.xml
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
    incubator/oodt/trunk/core/pom.xml
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerAction.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionCrawlerActionInfoHandler.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionInfoHandler.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionJavaPropHandler.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionPreconditionInfoHandler.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionProductCrawlerInfoHandler.java
    incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java
    incubator/oodt/trunk/filemgr/   (props changed)
    incubator/oodt/trunk/filemgr/pom.xml
    incubator/oodt/trunk/filemgr/src/main/bin/filemgr
    incubator/oodt/trunk/filemgr/src/main/bin/filemgr-client
    incubator/oodt/trunk/filemgr/src/main/bin/query_tool
    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/datatransfer/LocalDataTransferer.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/metadata/extractors/CoreMetExtractor.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/structs/BooleanQueryCriteria.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/exceptions/CacheException.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/QueryFormulationException.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/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/MetadataDumper.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/util/XmlStructFactory.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/versioning/DateTimeVersioner.java
    incubator/oodt/trunk/filemgr/src/main/php/Metadata.class.php
    incubator/oodt/trunk/filemgr/src/main/php/Product.class.php
    incubator/oodt/trunk/filemgr/src/main/php/ProductType.class.php
    incubator/oodt/trunk/filemgr/src/main/php/XmlRpcFilemgrClient.class.php
    incubator/oodt/trunk/filemgr/src/main/php/package.xml
    incubator/oodt/trunk/filemgr/src/main/python/fm.conf
    incubator/oodt/trunk/filemgr/src/main/python/fm.py
    incubator/oodt/trunk/filemgr/src/main/python/setclasspath.sh
    incubator/oodt/trunk/filemgr/src/main/resources/cas_filemgr_create_oracle_sequences.sql
    incubator/oodt/trunk/filemgr/src/main/resources/examples/product-types.xml
    incubator/oodt/trunk/filemgr/src/main/resources/filemgr.properties
    incubator/oodt/trunk/filemgr/src/main/resources/ingestcache.properties
    incubator/oodt/trunk/filemgr/src/main/resources/logging.properties
    incubator/oodt/trunk/filemgr/src/main/resources/product-type-element-map.xsl
    incubator/oodt/trunk/filemgr/src/site/resources/css/guides.css
    incubator/oodt/trunk/filemgr/src/site/resources/images/cas-filemgr.jpg
    incubator/oodt/trunk/filemgr/src/site/resources/images/cas-filemgr.psd
    incubator/oodt/trunk/filemgr/src/site/resources/images/error.png
    incubator/oodt/trunk/filemgr/src/site/resources/images/fm_arch.jpg
    incubator/oodt/trunk/filemgr/src/site/resources/images/fm_extension_points.png
    incubator/oodt/trunk/filemgr/src/site/resources/images/fm_object_model.png
    incubator/oodt/trunk/filemgr/src/site/resources/images/fm_use_case1.png
    incubator/oodt/trunk/filemgr/src/site/resources/images/info.png
    incubator/oodt/trunk/filemgr/src/site/resources/images/success.png
    incubator/oodt/trunk/filemgr/src/site/resources/images/warning.png
    incubator/oodt/trunk/filemgr/src/site/xdoc/development/developer.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/development/maven.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/development/subversion.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/user/advanced.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/user/basic.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/user/index.xml
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestMappedDataSourceCatalog.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/datatransfer/TestInPlaceDataTransferer.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/datatransfer/TestLocalDataTransferer.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/metadata/extractors/TestAbstractFilemgrMetExtractor.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/metadata/extractors/TestCoreMetExtractor.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/structs/TestProduct.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.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
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestGenericFileManagerObjectStructFactory.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java
    incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java
    incubator/oodt/trunk/filemgr/src/testdata/ingest/fmpolicy/product-types.xml
    incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt
    incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt.met
    incubator/oodt/trunk/filemgr/src/testdata/repomgr/product-types.xml
    incubator/oodt/trunk/filemgr/src/testdata/test.logging.properties
    incubator/oodt/trunk/filemgr/src/testdata/test.txt
    incubator/oodt/trunk/filemgr/src/testdata/vallayer/product-types.xml
    incubator/oodt/trunk/filemgr/src/testdata/xmlrpc-struct-factory/product-types.xml
    incubator/oodt/trunk/metadata/   (props changed)
    incubator/oodt/trunk/metadata/pom.xml
    incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp
    incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
    incubator/oodt/trunk/metadata/src/main/resources/examples/extern-config.xml
    incubator/oodt/trunk/metadata/src/main/resources/examples/met_extr_preconditions.xml
    incubator/oodt/trunk/metadata/src/main/resources/examples/samplemet.xml
    incubator/oodt/trunk/metadata/src/main/resources/logging.properties
    incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml
    incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestMetadata.java
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/samplemet.xml
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testExtractor
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testfile2.txt.met
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
    incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestPathUtils.java
    incubator/oodt/trunk/mvn/skin/pom.xml
    incubator/oodt/trunk/mvn/skin/src/main/resources/META-INF/maven/site.vm
    incubator/oodt/trunk/mvn/skin/src/main/resources/css/maven-theme.css
    incubator/oodt/trunk/pge/   (props changed)
    incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
    incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
    incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/query/conv/DateVersionConverter.java
    incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java
    incubator/oodt/trunk/pom.xml
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
    incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java
    incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
    incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
    incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
    incubator/oodt/trunk/sso/   (props changed)
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReader.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReader.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java

Modified: incubator/oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/CHANGES.txt?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/CHANGES.txt (original)
+++ incubator/oodt/trunk/CHANGES.txt Fri Jul 16 03:00:26 2010
@@ -3,7 +3,7 @@ Apache OODT Change Log
 
 
 Release 0.1-incubating - Current Development
------------------------------------
+--------------------------------------------
 
 * OODT-14 User guide pre-requisite to checkout and install oodt-core before attempting to 
    build cas-filemgr (Cameron Goodale via mattmann)
@@ -14,4 +14,4 @@ Release 0.1-incubating - Current Develop
 
 * OODT-2 - Import CAS components into OODT SVN (mattmann, joes)
 
-* OODT-1 - Import grid product, profile, and query services into OODT SVN (mattmann, joes)
+* OODT-16 - Remove JPL look+feel and web references, as well as dependency on private JPL M2 repository; add relocation tags and disclaimer of Apache Incubation status; 

Modified: incubator/oodt/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/README.txt?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/README.txt (original)
+++ incubator/oodt/trunk/README.txt Fri Jul 16 03:00:26 2010
@@ -1,32 +1,35 @@
-========================================================
-Welcome to Apache OODT  <http://incubator.apache.org/oodt/>
-========================================================
+=============================================================
+ Welcome to Apache OODT  <http://incubator.apache.org/oodt/>
+=============================================================
 
-OODT is a grid middleware framework used on a number of successful projects 
-at NASA's Jet Propulsion Laboratory/California Institute of Technology, and many 
+OODT is a grid middleware framework used on a number of successful projects at
+NASA's Jet Propulsion Laboratory/California Institute of Technology, and many
 other research institutions and universities, specifically those part of the:
 
-    *National Cancer Institute's (NCI's) Early Detection Research Network (EDRN) 
-     project - over 40+ institutions all performing research into discovering biomarkers 
-     which are early indicators of disease.
-    *NASA's Planetary Data System (PDS) - NASA's planetary data archive, a repository and 
-    registry for all planetary data collected over the past 30+ years.
-    *various Earth Science data processing missions, including Seawinds/QuickSCAT, the 
-    Orbiting Carbon Observatory, the NPP Sounder PEATE project, and the Soil Moisture 
-    Active Passive (SMAP) mission. 
+* National Cancer Institute's (NCI's) Early Detection Research Network (EDRN)
+  project - over 40+ institutions all performing research into discovering
+  biomarkers which are early indicators of disease.
+* NASA's Planetary Data System (PDS) - NASA's planetary data archive, a
+  repository and registry for all planetary data collected over the past 30+
+  years.
+* Various Earth Science data processing missions, including
+  Seawinds/QuickSCAT, the Orbiting Carbon Observatory, the NPP Sounder PEATE
+  project, and the Soil Moisture Active Passive (SMAP) mission.
     
-OODT is a podling in the Apache Incubator <http://incubator.apache.org/>,
-a project of the Apache Software Foundation <http://www.apache.org/>.
+OODT is a podling in the Apache Incubator <http://incubator.apache.org/>, a
+project of the Apache Software Foundation <http://www.apache.org/>.
 
 Getting Started
 ===============
 
-OODT is based on Java 5 and uses the Maven 2 <http://maven.apache.org/>
-build system. To build OODT, use the following command in this directory:
+OODT is primarily written in Java, with some components available in Python.
+It requires Java 5 and uses the Maven 2 <http://maven.apache.org/> build
+system.  To build the Java components of OODT, use the following command in
+this directory:
 
     mvn install
 
-The build consists of a number of components.
+For the Python components, see the "agility" subdirectory.
 
 License (see also LICENSE.txt)
 ==============================
@@ -55,34 +58,35 @@ the terms and conditions of the licenses
 Export control
 ==============
 
-This distribution includes cryptographic software.  The country in  which
-you currently reside may have restrictions on the import,  possession, use,
-and/or re-export to another country, of encryption software.  BEFORE using
-any encryption software, please  check your country's laws, regulations and
+This distribution includes cryptographic software.  The country in which you
+currently reside may have restrictions on the import, possession, use, and/or
+re-export to another country, of encryption software.  BEFORE using any
+encryption software, please check your country's laws, regulations and
 policies concerning the import, possession, or use, and re-export of
-encryption software, to  see if this is permitted.  See
+encryption software, to see if this is permitted.  See
 <http://www.wassenaar.org/> for more information.
 
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity Control
-Number (ECCN) 5D002.C.1, which includes information security software using
-or performing cryptographic functions with asymmetric algorithms.  The form
-and manner of this Apache Software Foundation distribution makes it eligible
-for export under the License Exception ENC Technology Software Unrestricted
-(TSU) exception (see the BIS Export Administration Regulations, Section
-740.13) for both object code and source code.
+The U.S.  Government Department of Commerce, Bureau of Industry and Security
+(BIS), has classified this software as Export Commodity Control Number (ECCN)
+5D002.C.1, which includes information security software using or performing
+cryptographic functions with asymmetric algorithms.  The form and manner of
+this Apache Software Foundation distribution makes it eligible for export
+under the License Exception ENC Technology Software Unrestricted (TSU)
+exception (see the BIS Export Administration Regulations, Section 740.13) for
+both object code and source code.
 
 The following provides more details on the included cryptographic software:
 
-    Apache OODT uses Apache Tika which uses the Bouncy Castle generic encryption 
-    libraries for extracting text content and metadata from encrypted PDF files.
-    See http://www.bouncycastle.org/ for more details on Bouncy Castle.
+    Apache OODT uses Apache Tika which uses the Bouncy Castle generic
+    encryption libraries for extracting text content and metadata from
+    encrypted PDF files.  See http://www.bouncycastle.org/ for more details on
+    Bouncy Castle.
 
 Documentation
 =============
 
-You can build a local copy of the OODT documentation including JavaDocs
-using the following Maven 2 command in the OODT source directory: 
+You can build a local copy of the OODT documentation including JavaDocs using
+the following Maven 2 command in the OODT source directory:
 
     mvn site 
 
@@ -90,6 +94,11 @@ You can then open the OODT Documentation
 
     ./target/site/index.html
 
+Note: generating the documentation requires enormous amounts of memory.  More
+than likely you'll need to set the MAVEN_OPTS environment variable to
+"-Xmx512m" or larger before attempting to run "mvn site".
+
+
 Mailing Lists
 =============
 
@@ -104,15 +113,15 @@ Notification on all code changes are sen
 The mailing lists are open to anyone and publicly archived.
 
 You can subscribe the mailing lists by sending a message to
-oodt-<LIST>-subscribe@incubator.apache.org (for example oodt-dev-subscribe@...).
-To unsubscribe, send a message to oodt-<LIST>-unsubscribe@incubator.apache.org.
-For more instructions, send a message to oodt-<LIST>-help@incubator.apache.org.
+oodt-<LIST>-subscribe@incubator.apache.org (for example
+oodt-dev-subscribe@...).  To unsubscribe, send a message to
+oodt-<LIST>-unsubscribe@incubator.apache.org.  For more instructions, send a
+message to oodt-<LIST>-help@incubator.apache.org.
 
 Issue Tracker
 =============
 
-If you encounter errors in OODT or want to suggest an improvement or
-a new feature, please visit the OODT issue tracker at
-https://issues.apache.org/jira/browse/OODT. There you can also find the
+If you encounter errors in OODT or want to suggest an improvement or a new
+feature, please visit the OODT issue tracker at
+https://issues.apache.org/jira/browse/OODT.  There you can also find the
 latest information on known issues and recent bug fixes and enhancements.
-

Modified: incubator/oodt/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/pom.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/pom.xml (original)
+++ incubator/oodt/trunk/commons/pom.xml Fri Jul 16 03:00:26 2010
@@ -5,15 +5,15 @@
   
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>gov.nasa.jpl.oodt</groupId>
+    <groupId>org.apache.oodt</groupId>
     <artifactId>oodt-core</artifactId>
     <version>2.0</version>
   </parent>
-  <artifactId>cas-commons</artifactId>
+  <artifactId>commons</artifactId>
   <name>Common Utilities</name>
   <version>1.2.0-dev</version>
   <packaging>jar</packaging>
-  <description>Common Utilities Project</description>
+  <description>Apache OODT Common Utilities Project</description>
   <ciManagement>
     <notifiers>
       <notifier>

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java Fri Jul 16 03:00:26 2010
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.oodt.commons.data;
+package org.apache.oodt.commons.date;
 
 //JDK imports
 import java.text.DecimalFormat;

Modified: incubator/oodt/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/core/pom.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/core/pom.xml (original)
+++ incubator/oodt/trunk/core/pom.xml Fri Jul 16 03:00:26 2010
@@ -17,7 +17,7 @@ the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>gov.nasa.jpl.oodt</groupId>
+    <groupId>org.apache.oodt</groupId>
     <artifactId>oodt-core</artifactId>
     <version>2.0</version>
     <name>OODT Core</name>

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java Fri Jul 16 03:00:26 2010
@@ -25,8 +25,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 //OODT imports
-import org.apache.oodt.cas.commons.option.CmdLineOptionInstance;
-import org.apache.oodt.cas.commons.option.util.CmdLineOptionUtils;
+import org.apache.oodt.commons.option.CmdLineOptionInstance;
+import org.apache.oodt.commons.option.util.CmdLineOptionUtils;
 import org.apache.oodt.cas.crawl.daemon.CrawlDaemon;
 
 //Spring import

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerAction.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerAction.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerAction.java Fri Jul 16 03:00:26 2010
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.logging.Logger;
 
 //OODT imports
-import org.apache.oodt.cas.commons.spring.SpringSetIdInjectionType;
+import org.apache.oodt.commons.spring.SpringSetIdInjectionType;
 import org.apache.oodt.cas.crawl.structs.exceptions.CrawlerActionException;
 import org.apache.oodt.cas.metadata.Metadata;
 

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java Fri Jul 16 03:00:26 2010
@@ -25,7 +25,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 //OODT imports
-import org.apache.oodt.cas.commons.spring.SpringSetIdInjectionType;
+import org.apache.oodt.commons.spring.SpringSetIdInjectionType;
 import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
 import org.apache.oodt.cas.metadata.Metadata;
 

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionCrawlerActionInfoHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionCrawlerActionInfoHandler.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionCrawlerActionInfoHandler.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionCrawlerActionInfoHandler.java Fri Jul 16 03:00:26 2010
@@ -23,7 +23,7 @@ import java.io.PrintStream;
 import java.util.List;
 
 //OODT imports
-import org.apache.oodt.cas.commons.option.CmdLineOption;
+import org.apache.oodt.commons.option.CmdLineOption;
 import org.apache.oodt.cas.crawl.action.CrawlerAction;
 import org.apache.oodt.cas.crawl.action.MimeTypeCrawlerAction;
 

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionInfoHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionInfoHandler.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionInfoHandler.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionInfoHandler.java Fri Jul 16 03:00:26 2010
@@ -21,7 +21,7 @@ package org.apache.oodt.cas.crawl.option
 //JDK imports
 import java.io.OutputStream;
 
-import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+import org.apache.oodt.commons.option.handler.CmdLineOptionHandler;
 
 //Spring imports
 import org.springframework.context.ApplicationContext;

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionJavaPropHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionJavaPropHandler.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionJavaPropHandler.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionJavaPropHandler.java Fri Jul 16 03:00:26 2010
@@ -21,8 +21,8 @@ package org.apache.oodt.cas.crawl.option
 //JDK imports
 import java.util.List;
 
-import org.apache.oodt.cas.commons.option.CmdLineOption;
-import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+import org.apache.oodt.commons.option.CmdLineOption;
+import org.apache.oodt.commons.option.handler.CmdLineOptionHandler;
 
 //Spring imports
 import org.springframework.util.StringUtils;

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionPreconditionInfoHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionPreconditionInfoHandler.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionPreconditionInfoHandler.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionPreconditionInfoHandler.java Fri Jul 16 03:00:26 2010
@@ -23,7 +23,7 @@ import java.io.PrintStream;
 import java.util.List;
 
 //OODT imports
-import org.apache.oodt.cas.commons.option.CmdLineOption;
+import org.apache.oodt.commons.option.CmdLineOption;
 import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator;
 
 /**

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionProductCrawlerInfoHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionProductCrawlerInfoHandler.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionProductCrawlerInfoHandler.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/option/CmdLineOptionProductCrawlerInfoHandler.java Fri Jul 16 03:00:26 2010
@@ -23,7 +23,7 @@ import java.io.PrintStream;
 import java.util.List;
 
 //OODT imports
-import org.apache.oodt.cas.commons.option.CmdLineOption;
+import org.apache.oodt.commons.option.CmdLineOption;
 import org.apache.oodt.cas.crawl.ProductCrawler;
 
 /**

Modified: incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java (original)
+++ incubator/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/typedetection/MimeExtractorConfigReader.java Fri Jul 16 03:00:26 2010
@@ -20,7 +20,7 @@ package org.apache.oodt.cas.crawl.typede
 
 //OODT imports
 import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
 
 //JDK imports
 import java.io.FileInputStream;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java Fri Jul 16 03:00:26 2010
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 //OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
 import org.apache.oodt.cas.filemgr.structs.ProductType;
 import org.apache.oodt.cas.filemgr.util.XmlStructFactory;
 

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java Fri Jul 16 03:00:26 2010
@@ -42,7 +42,7 @@ import org.apache.oodt.cas.filemgr.struc
 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.commons.pagination.PaginationUtils;
 import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
 import org.apache.oodt.cas.metadata.Metadata;
 

Propchange: incubator/oodt/trunk/filemgr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 03:00:26 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target

Modified: incubator/oodt/trunk/filemgr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/pom.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/pom.xml (original)
+++ incubator/oodt/trunk/filemgr/pom.xml Fri Jul 16 03:00:26 2010
@@ -4,11 +4,11 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>gov.nasa.jpl.oodt</groupId>
+    <groupId>org.apache.oodt</groupId>
     <artifactId>oodt-core</artifactId>
     <version>2.0</version>
   </parent>
-  <artifactId>cas-filemgr</artifactId>
+  <artifactId>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
@@ -56,7 +56,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient</mainClass>
+              <mainClass>org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient</mainClass>
             </manifest>
           </archive>
         </configuration>
@@ -73,19 +73,14 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-commons</artifactId>
-      <version>1.1.1</version>    
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>commons</artifactId>
+      <version>1.2.0-dev</version>    
     </dependency>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-metadata</artifactId>
-      <version>1.6.1</version>
-    </dependency>
-    <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>edm-commons</artifactId>
-      <version>2.2.11-dev</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>metadata</artifactId>
+      <version>1.7.0-dev</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -155,4 +150,4 @@
       <scope>runtime</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/oodt/trunk/filemgr/src/main/bin/filemgr
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/bin/filemgr?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/bin/filemgr (original)
+++ incubator/oodt/trunk/filemgr/src/main/bin/filemgr Fri Jul 16 03:00:26 2010
@@ -55,8 +55,8 @@ case "$1" in
         $JAVA_HOME/bin/java \
         	-Djava.ext.dirs=${CAS_FILEMGR_HOME}/lib \
         	-Djava.util.logging.config.file=${CAS_FILEMGR_HOME}/etc/logging.properties \
-    	    -Dgov.nasa.jpl.oodt.cas.filemgr.properties=${CAS_FILEMGR_PROPS} \
-        	gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManager \
+    	    -Dorg.apache.oodt.cas.filemgr.properties=${CAS_FILEMGR_PROPS} \
+        	org.apache.oodt.cas.filemgr.system.XmlRpcFileManager \
         	--portNum $SERVER_PORT &       
         echo $! > ${RUN_HOME}/cas.filemgr.pid 
         echo "OK"

Modified: incubator/oodt/trunk/filemgr/src/main/bin/filemgr-client
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/bin/filemgr-client?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/bin/filemgr-client (original)
+++ incubator/oodt/trunk/filemgr/src/main/bin/filemgr-client Fri Jul 16 03:00:26 2010
@@ -26,6 +26,6 @@ export JAVA_HOME
 
 $JAVA_HOME/bin/java \
 	-Djava.ext.dirs=../lib \
-	-Dgov.nasa.jpl.oodt.cas.filemgr.properties=../etc/filemgr.properties \
+	-Dorg.apache.oodt.cas.filemgr.properties=../etc/filemgr.properties \
 	-Djava.util.logging.config.file=../etc/logging.properties \
-	gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient $*
+	org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient $*

Modified: incubator/oodt/trunk/filemgr/src/main/bin/query_tool
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/bin/query_tool?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/bin/query_tool (original)
+++ incubator/oodt/trunk/filemgr/src/main/bin/query_tool Fri Jul 16 03:00:26 2010
@@ -16,4 +16,4 @@
 # * limitations under the License.
 # */
 #
-$JAVA_HOME/bin/java -Djava.ext.dirs=../lib gov.nasa.jpl.oodt.cas.filemgr.tools.QueryTool $*
+$JAVA_HOME/bin/java -Djava.ext.dirs=../lib org.apache.oodt.cas.filemgr.tools.QueryTool $*

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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -31,10 +31,10 @@ import org.apache.oodt.cas.filemgr.struc
 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.commons.pagination.PaginationUtils;
 import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
 import org.apache.oodt.cas.metadata.Metadata;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.sql.Connection;

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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -18,7 +18,7 @@
 package org.apache.oodt.cas.filemgr.catalog;
 
 //OODT imports
-import org.apache.oodt.cas.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.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;

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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -40,7 +40,7 @@ import org.apache.oodt.cas.filemgr.struc
 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.commons.pagination.PaginationUtils;
 import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
 import org.apache.oodt.cas.metadata.Metadata;
 

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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -315,4 +315,4 @@ public class LocalDataTransferer impleme
         }
     }
 
-}
\ No newline at end of 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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -313,4 +313,4 @@ public class LocalCache implements Cache
         }
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java Fri Jul 16 03:00:26 2010
@@ -22,7 +22,7 @@ import org.apache.oodt.cas.filemgr.metad
 import org.apache.oodt.cas.filemgr.structs.Product;
 import org.apache.oodt.cas.metadata.Metadata;
 import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/DataSourceRepositoryManagerFactory.java Fri Jul 16 03:00:26 2010
@@ -18,7 +18,7 @@
 package org.apache.oodt.cas.filemgr.repository;
 
 //OODT imports
-import org.apache.oodt.cas.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
 
 //JDK imports
 import javax.sql.DataSource;

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java Fri Jul 16 03:00:26 2010
@@ -175,4 +175,4 @@ public class BooleanQueryCriteria extend
         query += ")";
         return query;
     }
-}
\ No newline at end of file
+}

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java Fri Jul 16 03:00:26 2010
@@ -37,7 +37,7 @@ import org.xml.sax.InputSource;
 
 //OODT imports
 import org.apache.oodt.cas.filemgr.catalog.Catalog; //for javadoc
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/CacheException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/CacheException.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/CacheException.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/CacheException.java Fri Jul 16 03:00:26 2010
@@ -33,4 +33,4 @@ public class CacheException extends Exce
     public CacheException(String msg) {
         super(msg);
     }
-}
\ No newline at end of file
+}

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/ConnectionException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/ConnectionException.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/ConnectionException.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/ConnectionException.java Fri Jul 16 03:00:26 2010
@@ -44,4 +44,4 @@ public class ConnectionException extends
     }
 
 
-}
\ No newline at end of file
+}

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/QueryFormulationException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/QueryFormulationException.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/QueryFormulationException.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/QueryFormulationException.java Fri Jul 16 03:00:26 2010
@@ -44,4 +44,4 @@ public class QueryFormulationException e
     }
 
 
-}
\ No newline at end of file
+}

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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -23,7 +23,7 @@ import org.apache.xmlrpc.WebServer;
 //OODT imports
 import org.apache.oodt.cas.metadata.Metadata;
 import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
-import org.apache.oodt.cas.commons.date.DateUtils;
+import org.apache.oodt.commons.date.DateUtils;
 import org.apache.oodt.cas.filemgr.catalog.Catalog;
 import org.apache.oodt.cas.filemgr.metadata.extractors.FilemgrMetExtractor;
 import org.apache.oodt.cas.filemgr.repository.RepositoryManager;

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/auth/SecureWebServer.java Fri Jul 16 03:00:26 2010
@@ -88,4 +88,4 @@ public final class SecureWebServer exten
     }
 
     private List dispatchers = new ArrayList();
-}
\ No newline at end of file
+}

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CASAnalyzer.java Fri Jul 16 03:00:26 2010
@@ -68,4 +68,4 @@ public class CASAnalyzer extends Analyze
         result = new StopFilter(result, stopSet);
         return result;
     }
-}
\ No newline at end of file
+}

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java Fri Jul 16 03:00:26 2010
@@ -397,4 +397,4 @@ public class CatalogSearch {
         }
     }
 
-}
\ No newline at end of file
+}

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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -22,7 +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.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ProductDumper.java Fri Jul 16 03:00:26 2010
@@ -23,7 +23,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.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
 
 //JDK imports
 import java.io.File;

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=964663&r1=964662&r2=964663&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 Fri Jul 16 03:00:26 2010
@@ -40,7 +40,7 @@ import org.apache.oodt.cas.filemgr.struc
 import org.apache.oodt.cas.filemgr.structs.type.TypeHandler;
 import org.apache.oodt.cas.metadata.Metadata;
 import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java Fri Jul 16 03:00:26 2010
@@ -18,7 +18,7 @@
 package org.apache.oodt.cas.filemgr.validation;
 
 //OODT imports
-import org.apache.oodt.cas.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
 
 //JDK imports
 import javax.sql.DataSource;

Modified: incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java (original)
+++ incubator/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java Fri Jul 16 03:00:26 2010
@@ -1,210 +1,210 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.oodt.cas.filemgr.versioning;
-
-//OODT imports
-import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
-import org.apache.oodt.cas.filemgr.structs.Product;
-import org.apache.oodt.cas.filemgr.structs.Reference;
-import org.apache.oodt.cas.metadata.Metadata;
-import jpl.eda.util.DateConvert;
-
-//JDK imports
-import java.text.SimpleDateFormat;
-import java.text.ParseException;
-import java.util.Iterator;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.MalformedURLException;
-import java.net.URLEncoder;
-
-/**
- * @author mattmann
- * @author bfoster
- * @version $Revision$
- * 
- * <p>
- * A simple versioning scheme that versions {@link Product}s with their
- * production date time.
- * </p>
- * 
- */
-public class DateTimeVersioner implements Versioner {
-
-    /* our log stream */
-    private Logger LOG = Logger.getLogger(DateTimeVersioner.class.getName());
-
-    /**
-     * <p>
-     * Default Constructor
-     * </p>
-     */
-    public DateTimeVersioner() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.oodt.cas.versioning.Versioner#createDataStoreReferences(org.apache.
-     *      oodt.cas.data.structs.Product)
-     */
-    public void createDataStoreReferences(Product product, Metadata metadata)
-            throws VersioningException {
-        // first, we need to know if its heirarchical, or flat
-        if (product.getProductStructure() == null) {
-            LOG
-                    .log(Level.WARNING,
-                            "DateTimeVersioner: Product Structure must be defined in order to version!");
-            return;
-        }
-
-        SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyyddMM.HHmmss");
-        String productionDateTime = metadata
-                .getMetadata("CAS.ProductReceivedTime");
-        if (productionDateTime == null) { // generate it ourselves then
-            productionDateTime = dateFormatter.format(new Date());
-        } else {
-            Date prodDateTime = null;
-            try {
-                prodDateTime = DateConvert.isoParse(productionDateTime);
-            } catch (ParseException e) {
-                LOG.log(Level.WARNING,
-                        "Unable to parse production date time CAS.ProductReceivedTime: "
-                                + productionDateTime
-                                + ": generating it ourselves");
-                prodDateTime = new Date();
-            }
-            productionDateTime = dateFormatter.format(prodDateTime);
-        }
-
-        if (product.getProductStructure().equals(Product.STRUCTURE_FLAT)) {
-            // if its flat, just return references that include
-            // productTypeRepo/productName/fileName.productionDateTime
-            // we'll use the format: yyyy.dd.MM.HH.mm.ss
-
-            for (Iterator<Reference> i = product.getProductReferences().iterator(); i
-                    .hasNext();) {
-                Reference r = i.next();
-                String dataStoreRef = null;
-
-                try {
-                    dataStoreRef = new File(new URI(product.getProductType()
-                            .getProductRepositoryPath())).toURL()
-                            .toExternalForm()
-                            + "/"
-                            + product.getProductName()
-                            + "/"
-                            + new File(new URI(r.getOrigReference())).getName()
-                            + "." + productionDateTime;
-                    LOG.log(Level.FINER,
-                            "DateTimeVersioner: Generated dataStoreRef: "
-                                    + dataStoreRef + " from original ref: "
-                                    + r.getOrigReference());
-                    r.setDataStoreReference(dataStoreRef);
-                } catch (URISyntaxException e) {
-                    LOG
-                            .log(
-                                    Level.WARNING,
-                                    "DateTimeVersioner: Error generating URI to get name "
-                                            + "of original ref while generating data store ref for orig ref: "
-                                            + r.getOrigReference()
-                                            + ": Message: " + e.getMessage());
-                    // try and keep generating
-                } catch (MalformedURLException e) {
-                    LOG.log(Level.WARNING,
-                            "DateTimeVersioner: Error getting URL for product repository path "
-                                    + product.getProductType()
-                                            .getProductRepositoryPath()
-                                    + ": Message: " + e.getMessage());
-                    // try and keep generating
-                }
-
-            }
-        } else if (product.getProductStructure().equals(
-                Product.STRUCTURE_HIERARCHICAL)) {
-            // if its heirarchical, then we'll version the files within the
-            // directory
-            // first, we need to get a list of all the references from the
-            // original dir
-            Reference origDirRef = (Reference) product.getProductReferences()
-                    .get(0);
-
-            try {
-                String dataStoreRef = new File(new URI(product.getProductType()
-                        .getProductRepositoryPath())).toURL().toExternalForm()
-                        + URLEncoder.encode(product.getProductName(), "UTF-8")
-                        + "/";
-                LOG.log(Level.INFO,
-                        "DateTimeVersioner: generated DataStore ref: "
-                                + dataStoreRef + " from origDirRef: "
-                                + origDirRef.getOrigReference());
-                origDirRef.setDataStoreReference(dataStoreRef);
-            } catch (MalformedURLException e) {
-                LOG.log(Level.WARNING,
-                        "DateTimeVersioner: MalformedURLException while generating "
-                                + "initial data store ref for origRef: "
-                                + origDirRef.getOrigReference());
-                throw new VersioningException(e);
-            } catch (URISyntaxException e) {
-                LOG.log(Level.WARNING,
-                        "DateTimeVersioner: Error creating File reference from original dir URI: "
-                                + origDirRef.getOrigReference() + ": Message: "
-                                + e.getMessage());
-                throw new VersioningException(
-                        "Unable to generate references from original dir reference for product: "
-                                + product.getProductName() + ": Message: "
-                                + e.getMessage());
-            } catch (UnsupportedEncodingException e) {
-                LOG.log(Level.WARNING,
-                        "DateTimeVersioner: UnsupportedEncodingException while generating "
-                                + "initial data store ref for origRef: "
-                                + origDirRef.getOrigReference());
-                throw new VersioningException(e);
-            }
-
-            // create the basic data store refs
-            VersioningUtils.createBasicDataStoreRefsHierarchical(product
-                    .getProductReferences());
-
-            // add the production date time
-            addProductDateTimeToReferences(product.getProductReferences(),
-                    productionDateTime);
-
-        }
-    }
-
-    private void addProductDateTimeToReferences(List<Reference> references,
-            String productionDateTime) {
-        for (Iterator<Reference> i = references.iterator(); i.hasNext();) {
-            Reference r = i.next();
-            if (!r.getOrigReference().endsWith("/")) {
-                r.setDataStoreReference(r.getDataStoreReference() + "."
-                        + productionDateTime);
-            }
-        }
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.oodt.cas.filemgr.versioning;
+
+//OODT imports
+import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.commons.util.DateConvert;
+
+//JDK imports
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.Iterator;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.MalformedURLException;
+import java.net.URLEncoder;
+
+/**
+ * @author mattmann
+ * @author bfoster
+ * @version $Revision$
+ * 
+ * <p>
+ * A simple versioning scheme that versions {@link Product}s with their
+ * production date time.
+ * </p>
+ * 
+ */
+public class DateTimeVersioner implements Versioner {
+
+    /* our log stream */
+    private Logger LOG = Logger.getLogger(DateTimeVersioner.class.getName());
+
+    /**
+     * <p>
+     * Default Constructor
+     * </p>
+     */
+    public DateTimeVersioner() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.oodt.cas.versioning.Versioner#createDataStoreReferences(org.apache.
+     *      oodt.cas.data.structs.Product)
+     */
+    public void createDataStoreReferences(Product product, Metadata metadata)
+            throws VersioningException {
+        // first, we need to know if its heirarchical, or flat
+        if (product.getProductStructure() == null) {
+            LOG
+                    .log(Level.WARNING,
+                            "DateTimeVersioner: Product Structure must be defined in order to version!");
+            return;
+        }
+
+        SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyyddMM.HHmmss");
+        String productionDateTime = metadata
+                .getMetadata("CAS.ProductReceivedTime");
+        if (productionDateTime == null) { // generate it ourselves then
+            productionDateTime = dateFormatter.format(new Date());
+        } else {
+            Date prodDateTime = null;
+            try {
+                prodDateTime = DateConvert.isoParse(productionDateTime);
+            } catch (ParseException e) {
+                LOG.log(Level.WARNING,
+                        "Unable to parse production date time CAS.ProductReceivedTime: "
+                                + productionDateTime
+                                + ": generating it ourselves");
+                prodDateTime = new Date();
+            }
+            productionDateTime = dateFormatter.format(prodDateTime);
+        }
+
+        if (product.getProductStructure().equals(Product.STRUCTURE_FLAT)) {
+            // if its flat, just return references that include
+            // productTypeRepo/productName/fileName.productionDateTime
+            // we'll use the format: yyyy.dd.MM.HH.mm.ss
+
+            for (Iterator<Reference> i = product.getProductReferences().iterator(); i
+                    .hasNext();) {
+                Reference r = i.next();
+                String dataStoreRef = null;
+
+                try {
+                    dataStoreRef = new File(new URI(product.getProductType()
+                            .getProductRepositoryPath())).toURL()
+                            .toExternalForm()
+                            + "/"
+                            + product.getProductName()
+                            + "/"
+                            + new File(new URI(r.getOrigReference())).getName()
+                            + "." + productionDateTime;
+                    LOG.log(Level.FINER,
+                            "DateTimeVersioner: Generated dataStoreRef: "
+                                    + dataStoreRef + " from original ref: "
+                                    + r.getOrigReference());
+                    r.setDataStoreReference(dataStoreRef);
+                } catch (URISyntaxException e) {
+                    LOG
+                            .log(
+                                    Level.WARNING,
+                                    "DateTimeVersioner: Error generating URI to get name "
+                                            + "of original ref while generating data store ref for orig ref: "
+                                            + r.getOrigReference()
+                                            + ": Message: " + e.getMessage());
+                    // try and keep generating
+                } catch (MalformedURLException e) {
+                    LOG.log(Level.WARNING,
+                            "DateTimeVersioner: Error getting URL for product repository path "
+                                    + product.getProductType()
+                                            .getProductRepositoryPath()
+                                    + ": Message: " + e.getMessage());
+                    // try and keep generating
+                }
+
+            }
+        } else if (product.getProductStructure().equals(
+                Product.STRUCTURE_HIERARCHICAL)) {
+            // if its heirarchical, then we'll version the files within the
+            // directory
+            // first, we need to get a list of all the references from the
+            // original dir
+            Reference origDirRef = (Reference) product.getProductReferences()
+                    .get(0);
+
+            try {
+                String dataStoreRef = new File(new URI(product.getProductType()
+                        .getProductRepositoryPath())).toURL().toExternalForm()
+                        + URLEncoder.encode(product.getProductName(), "UTF-8")
+                        + "/";
+                LOG.log(Level.INFO,
+                        "DateTimeVersioner: generated DataStore ref: "
+                                + dataStoreRef + " from origDirRef: "
+                                + origDirRef.getOrigReference());
+                origDirRef.setDataStoreReference(dataStoreRef);
+            } catch (MalformedURLException e) {
+                LOG.log(Level.WARNING,
+                        "DateTimeVersioner: MalformedURLException while generating "
+                                + "initial data store ref for origRef: "
+                                + origDirRef.getOrigReference());
+                throw new VersioningException(e);
+            } catch (URISyntaxException e) {
+                LOG.log(Level.WARNING,
+                        "DateTimeVersioner: Error creating File reference from original dir URI: "
+                                + origDirRef.getOrigReference() + ": Message: "
+                                + e.getMessage());
+                throw new VersioningException(
+                        "Unable to generate references from original dir reference for product: "
+                                + product.getProductName() + ": Message: "
+                                + e.getMessage());
+            } catch (UnsupportedEncodingException e) {
+                LOG.log(Level.WARNING,
+                        "DateTimeVersioner: UnsupportedEncodingException while generating "
+                                + "initial data store ref for origRef: "
+                                + origDirRef.getOrigReference());
+                throw new VersioningException(e);
+            }
+
+            // create the basic data store refs
+            VersioningUtils.createBasicDataStoreRefsHierarchical(product
+                    .getProductReferences());
+
+            // add the production date time
+            addProductDateTimeToReferences(product.getProductReferences(),
+                    productionDateTime);
+
+        }
+    }
+
+    private void addProductDateTimeToReferences(List<Reference> references,
+            String productionDateTime) {
+        for (Iterator<Reference> i = references.iterator(); i.hasNext();) {
+            Reference r = i.next();
+            if (!r.getOrigReference().endsWith("/")) {
+                r.setDataStoreReference(r.getDataStoreReference() + "."
+                        + productionDateTime);
+            }
+        }
+    }
+
+}

Modified: incubator/oodt/trunk/filemgr/src/main/php/Metadata.class.php
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/php/Metadata.class.php?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/php/Metadata.class.php (original)
+++ incubator/oodt/trunk/filemgr/src/main/php/Metadata.class.php Fri Jul 16 03:00:26 2010
@@ -81,4 +81,4 @@ class CAS_Filemgr_Metadata {
 		return array_count_values($this->elemMap[$key]) > 1;
 	}
 }
-?>
\ No newline at end of file
+?>

Modified: incubator/oodt/trunk/filemgr/src/main/php/Product.class.php
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/php/Product.class.php?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/php/Product.class.php (original)
+++ incubator/oodt/trunk/filemgr/src/main/php/Product.class.php Fri Jul 16 03:00:26 2010
@@ -98,4 +98,4 @@ class CAS_Filemgr_Product {
 	
 }
 
-?>
\ No newline at end of file
+?>

Modified: incubator/oodt/trunk/filemgr/src/main/php/ProductType.class.php
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/php/ProductType.class.php?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/php/ProductType.class.php (original)
+++ incubator/oodt/trunk/filemgr/src/main/php/ProductType.class.php Fri Jul 16 03:00:26 2010
@@ -100,4 +100,4 @@ class CAS_Filemgr_ProductType {
 	
 }
 
-?>
\ No newline at end of file
+?>

Modified: incubator/oodt/trunk/filemgr/src/main/php/XmlRpcFilemgrClient.class.php
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/php/XmlRpcFilemgrClient.class.php?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/php/XmlRpcFilemgrClient.class.php (original)
+++ incubator/oodt/trunk/filemgr/src/main/php/XmlRpcFilemgrClient.class.php Fri Jul 16 03:00:26 2010
@@ -173,4 +173,4 @@ class CAS_Filemgr_XmlRpcFilemgrClient {
 		
 	}
 }
-?>
\ No newline at end of file
+?>

Modified: incubator/oodt/trunk/filemgr/src/main/php/package.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/php/package.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/php/package.xml (original)
+++ incubator/oodt/trunk/filemgr/src/main/php/package.xml Fri Jul 16 03:00:26 2010
@@ -104,4 +104,4 @@
       </notes>
     </release>
   </changelog>
-</package>
\ No newline at end of file
+</package>

Modified: incubator/oodt/trunk/filemgr/src/main/python/fm.conf
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/main/python/fm.conf?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/main/python/fm.conf (original)
+++ incubator/oodt/trunk/filemgr/src/main/python/fm.conf Fri Jul 16 03:00:26 2010
@@ -37,7 +37,7 @@ user = @USER_DB_PATH@
 [factories]
 # There's no need to change anything here unless you really know what you're doing,
 # and trust me, you don't.  Don't take it personally.  It's just a fact.
-catalog = gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory
-repository = gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory
-datatransfer = gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
-validation =gov.nasa.jpl.oodt.cas.filemgr.validation.XMLValidationLayerFactory
+catalog = org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory
+repository = org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory
+datatransfer = org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
+validation =org.apache.oodt.cas.filemgr.validation.XMLValidationLayerFactory



Mime
View raw message