oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfos...@apache.org
Subject svn commit: r1002752 [1/9] - in /incubator/oodt/trunk/catalog: ./ .externalToolBuilders/ .settings/ src/ src/main/ src/main/assembly/ src/main/bin/ src/main/java/ src/main/java/gov/ src/main/java/gov/nasa/ src/main/java/gov/nasa/jpl/ src/main/java/gov/...
Date Wed, 29 Sep 2010 17:19:15 GMT
Author: bfoster
Date: Wed Sep 29 17:19:09 2010
New Revision: 1002752

URL: http://svn.apache.org/viewvc?rev=1002752&view=rev
Log:
readd of catalog per OODT-42

Added:
    incubator/oodt/trunk/catalog/
    incubator/oodt/trunk/catalog/.classpath
    incubator/oodt/trunk/catalog/.externalToolBuilders/
    incubator/oodt/trunk/catalog/.externalToolBuilders/Maven_Ant_Builder.launch
    incubator/oodt/trunk/catalog/.project
    incubator/oodt/trunk/catalog/.settings/
    incubator/oodt/trunk/catalog/.settings/org.eclipse.jdt.core.prefs
    incubator/oodt/trunk/catalog/pom.xml
    incubator/oodt/trunk/catalog/src/
    incubator/oodt/trunk/catalog/src/main/
    incubator/oodt/trunk/catalog/src/main/assembly/
    incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml
    incubator/oodt/trunk/catalog/src/main/bin/
    incubator/oodt/trunk/catalog/src/main/bin/catserv-client
    incubator/oodt/trunk/catalog/src/main/bin/catserv-server
    incubator/oodt/trunk/catalog/src/main/java/
    incubator/oodt/trunk/catalog/src/main/java/gov/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/exception/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/mapping/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/metadata/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/page/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/query/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/query/filter/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/query/filter/time/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/query/filter/time/conv/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/query/parser/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/repository/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/server/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/server/action/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/server/channel/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/server/channel/rmi/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/server/channel/xmlrpc/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/server/option/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/struct/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/struct/impl/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/struct/impl/dictionary/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/struct/impl/index/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/struct/impl/transaction/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/system/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/system/impl/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/term/
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/cas/catalog/util/
    incubator/oodt/trunk/catalog/src/main/java/org/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogDictionaryException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogIndexException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogRepositoryException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogServiceException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/IngestServiceException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/QueryServiceException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapper.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapperFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapper.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapperFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapperFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/metadata/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/metadata/TransactionalMetadata.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/CatalogReceipt.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IndexPager.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IngestReceipt.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/Page.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/PageInfo.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/ProcessedPageInfo.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/QueryPager.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/TransactionReceipt.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomWrapperQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/NotQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/StdQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/TermQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/WrapperQueryExpression.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/FilterAlgorithm.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/QueryFilter.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEvent.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventFilterAlgorithm.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventQueryFilter.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/JJTQueryParserState.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.jj
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.jjt
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserConstants.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Token.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepositoryFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepositoryFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepositoryFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceCommandLineClient.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/CatalogServiceServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/GetSupportedCatalogIds.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogRepositoryServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogsServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/PagedQueryServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/QueryServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedPagedQueryServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedQueryServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ShutdownServerAction.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelClient.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedActionsHandler.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedClientsHandler.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedServersHandler.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionId.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionaryFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndexFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndex.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndexFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndexFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/LongTransactionIdFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/StringTransactionIdFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/UuidTransactionIdFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClientFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocalFactory.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Bucket.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/TermBucket.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/CasPropertyPlaceholderConfigurer.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginClassLoader.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginURL.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/Serializer.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java
    incubator/oodt/trunk/catalog/src/main/resources/
    incubator/oodt/trunk/catalog/src/main/resources/REMOVE.log
    incubator/oodt/trunk/catalog/src/main/resources/catalog-service.properties
    incubator/oodt/trunk/catalog/src/main/resources/logging.properties
    incubator/oodt/trunk/catalog/src/main/resources/oracle/
    incubator/oodt/trunk/catalog/src/main/resources/oracle/create-transaction-id-map-table.sql
    incubator/oodt/trunk/catalog/src/main/resources/oracle/create-transaction-index-table.sql
    incubator/oodt/trunk/catalog/src/main/resources/policy/
    incubator/oodt/trunk/catalog/src/main/resources/policy/catserv-beans.xml
    incubator/oodt/trunk/catalog/src/main/resources/policy/catserv-client-action-beans.xml
    incubator/oodt/trunk/catalog/src/main/resources/policy/catserv-client-cmd-line-beans.xml
    incubator/oodt/trunk/catalog/src/main/resources/policy/catserv-client-config.xml
    incubator/oodt/trunk/catalog/src/main/resources/policy/catserv-properties.xml
    incubator/oodt/trunk/catalog/src/main/resources/policy/catserv-server-cmd-line-beans.xml
    incubator/oodt/trunk/catalog/src/main/resources/policy/catserv-server-config.xml
    incubator/oodt/trunk/catalog/src/main/resources/policy/in-memory-index-cat.sql
    incubator/oodt/trunk/catalog/src/main/resources/policy/in-memory-ingest-mapper.sql
    incubator/oodt/trunk/catalog/src/main/resources/policy/workflow-catalog-beans.xml
    incubator/oodt/trunk/catalog/src/test/
    incubator/oodt/trunk/catalog/src/test/gov/
    incubator/oodt/trunk/catalog/src/test/gov/nasa/
    incubator/oodt/trunk/catalog/src/test/gov/nasa/jpl/
    incubator/oodt/trunk/catalog/src/test/gov/nasa/jpl/oodt/
    incubator/oodt/trunk/catalog/src/test/gov/nasa/jpl/oodt/cas/
    incubator/oodt/trunk/catalog/src/test/gov/nasa/jpl/oodt/cas/catalog/
    incubator/oodt/trunk/catalog/src/test/gov/nasa/jpl/oodt/cas/catalog/system/
    incubator/oodt/trunk/catalog/src/test/gov/nasa/jpl/oodt/cas/catalog/system/impl/
    incubator/oodt/trunk/catalog/src/test/org/
    incubator/oodt/trunk/catalog/src/test/org/apache/
    incubator/oodt/trunk/catalog/src/test/org/apache/oodt/
    incubator/oodt/trunk/catalog/src/test/org/apache/oodt/cas/
    incubator/oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/
    incubator/oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/
    incubator/oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/impl/
    incubator/oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
    incubator/oodt/trunk/catalog/src/testdata/
    incubator/oodt/trunk/catalog/src/testdata/test-index-cat.sql
    incubator/oodt/trunk/catalog/src/testdata/test-mapper-cat.sql

Added: incubator/oodt/trunk/catalog/.classpath
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/.classpath?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/.classpath (added)
+++ incubator/oodt/trunk/catalog/.classpath Wed Sep 29 17:19:09 2010
@@ -0,0 +1,56 @@
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources/policy" including="catserv-properties.xml|catserv-beans.xml|catserv-server-config.xml|catserv-server-cmd-line-beans.xml|catserv-client-config.xml|catserv-client-action-beans.xml|catserv-client-cmd-line-beans.xml" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/136/bcmail-jdk14-136.jar"/>
+  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/136/bcprov-jdk14-136.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/oodt/cas-metadata/0.1-incubating/cas-metadata-0.1-incubating.jar"/>
+  <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/fontbox/fontbox/0.1.0/fontbox-0.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0/geronimo-stax-api_1.0_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga.jar"/>
+  <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.8/icu4j-3.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jempbox/jempbox/0.2.0/jempbox-0.2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.9/nekohtml-1.9.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/oodt/oodt-commons/0.1-incubating/oodt-commons-0.1-incubating.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/ooxml-schemas/1.0/ooxml-schemas-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/oodt/pcs-input/0.1-incubating/pcs-input-0.1-incubating.jar"/>
+  <classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.7.3/pdfbox-0.7.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.5-beta5/poi-3.5-beta5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml/3.5-beta5/poi-ooxml-3.5-beta5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-scratchpad/3.5-beta5/poi-scratchpad-3.5-beta5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.8/spring-beans-2.0.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.8/spring-context-2.0.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.4/spring-core-2.5.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0.8/spring-dao-2.0.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0.8/spring-hibernate3-2.0.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.0.8/spring-jdbc-2.0.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/tika/tika/0.3/tika-0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xmlrpc/xmlrpc/2.1-dev/xmlrpc-2.1-dev.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
+</classpath>
\ No newline at end of file

Added: incubator/oodt/trunk/catalog/.externalToolBuilders/Maven_Ant_Builder.launch
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/.externalToolBuilders/Maven_Ant_Builder.launch?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/.externalToolBuilders/Maven_Ant_Builder.launch (added)
+++ incubator/oodt/trunk/catalog/.externalToolBuilders/Maven_Ant_Builder.launch Wed Sep 29 17:19:09 2010
@@ -0,0 +1,24 @@
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+  <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
+  <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+  <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cas-catalog"/>
+  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/maven-eclipse.xml"/>
+  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/>
+  <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+  <booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&apos;1.0&apos;?&gt;&lt;launchConfigurationWorkingSet editPageId=&apos;org.eclipse.ui.resourceWorkingSetPage&apos; factoryID=&apos;org.eclipse.ui.internal.WorkingSetFactory&apos; label=&apos;workingSet&apos; name=&apos;workingSet&apos;&gt;&lt;item factoryID=&apos;org.eclipse.ui.internal.model.ResourceFactory&apos; path=&apos;cas-catalog&apos; type=&apos;4&apos;/&gt;&lt;/launchConfigurationWorkingSet&gt;}"/>
+  <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+  <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+  <booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+  <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+  <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+  <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+    <listEntry value="1"/>
+  </listAttribute>
+  <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+    <listEntry value="/cas-catalog/maven-eclipse.xml"/>
+  </listAttribute>
+</launchConfiguration>
\ No newline at end of file

Added: incubator/oodt/trunk/catalog/.project
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/.project?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/.project (added)
+++ incubator/oodt/trunk/catalog/.project Wed Sep 29 17:19:09 2010
@@ -0,0 +1,22 @@
+<projectDescription>
+  <name>cas-catalog</name>
+  <comment></comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+      <arguments>
+        <dictionary>
+          <key>LaunchConfigHandle</key>
+          <value>&lt;project&gt;/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+        </dictionary>
+      </arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Added: incubator/oodt/trunk/catalog/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/.settings/org.eclipse.jdt.core.prefs?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/.settings/org.eclipse.jdt.core.prefs (added)
+++ incubator/oodt/trunk/catalog/.settings/org.eclipse.jdt.core.prefs Wed Sep 29 17:19:09 2010
@@ -0,0 +1,5 @@
+#Tue Sep 28 19:09:28 PDT 2010
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5

Added: incubator/oodt/trunk/catalog/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/pom.xml?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/pom.xml (added)
+++ incubator/oodt/trunk/catalog/pom.xml Wed Sep 29 17:19:09 2010
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<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>
+  <parent>
+    <groupId>org.apache.oodt</groupId>
+    <artifactId>oodt-core</artifactId>
+    <version>${oodt.version}</version>
+    <relativePath>../core/pom.xml</relativePath>
+  </parent>
+  <artifactId>cas-catalog</artifactId>
+  <name>Catalog Component</name>
+  <version>${oodt.version}</version>
+  <description></description>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/assembly.xml</descriptor>
+          </descriptors>
+          <archive/>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <targetPath>org/apache/oodt/cas/catalog/config</targetPath>
+        <directory>${basedir}/src/main/resources/policy</directory>
+        <includes>
+          <include>catserv-properties.xml</include>          
+          <include>catserv-beans.xml</include>    
+          <include>catserv-server-config.xml</include>
+          <include>catserv-server-cmd-line-beans.xml</include>          
+          <include>catserv-client-config.xml</include>                          
+          <include>catserv-client-action-beans.xml</include>          
+          <include>catserv-client-cmd-line-beans.xml</include>          
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <ciManagement>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>chris.mattmann@jpl.nasa.gov</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-commons</artifactId>
+      <version>${oodt.version}</version>    
+    </dependency>
+    <dependency>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>cas-metadata</artifactId>
+      <version>${oodt.version}</version>
+    </dependency>  
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>2.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>xmlrpc</groupId>
+      <artifactId>xmlrpc</artifactId>
+      <version>2.1-dev</version>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>1.3.1</version>
+      <exclusions>
+        <exclusion>
+          <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license -->
+          <groupId>xom</groupId>
+          <artifactId>xom</artifactId>
+        </exclusion> 
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Added: incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml (added)
+++ incubator/oodt/trunk/catalog/src/main/assembly/assembly.xml Wed Sep 29 17:19:09 2010
@@ -0,0 +1,77 @@
+<!-- 
+  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.
+-->
+<assembly>
+  <id>dist</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>  
+  <includeSiteDirectory>false</includeSiteDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE.txt</include>
+        <include>CHANGES.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes/>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/resources</directory>
+      <outputDirectory>etc</outputDirectory>
+      <includes>
+        <include>**.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/resources</directory>
+      <outputDirectory>logs</outputDirectory>
+      <includes>
+        <include>REMOVE.log</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/resources</directory>
+      <outputDirectory>etc</outputDirectory>
+      <includes>
+        <include>**.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/resources/policy</directory>
+      <outputDirectory>policy</outputDirectory>
+      <includes/>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <unpack>false</unpack>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <unpackOptions/>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Added: incubator/oodt/trunk/catalog/src/main/bin/catserv-client
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/bin/catserv-client?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/bin/catserv-client (added)
+++ incubator/oodt/trunk/catalog/src/main/bin/catserv-client Wed Sep 29 17:19:09 2010
@@ -0,0 +1,33 @@
+#!/bin/csh
+
+###########################################################################
+# 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.
+###########################################################################
+
+set args
+
+if ( $#args > 0 ) then
+	set args = "$*"
+endif
+
+setenv CATALOG_HOME `pwd`/..
+
+${JAVA_HOME}/bin/java \
+	-Djava.ext.dirs=../lib \
+	-Djava.util.logging.config.file=../etc/logging.properties \
+	-Dorg.apache.oodt.cas.catalog.properties.file=../etc/catalog-service.properties \
+	org.apache.oodt.cas.catalog.server.CatalogServiceCommandLineClient ${args}
+

Added: incubator/oodt/trunk/catalog/src/main/bin/catserv-server
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/bin/catserv-server?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/bin/catserv-server (added)
+++ incubator/oodt/trunk/catalog/src/main/bin/catserv-server Wed Sep 29 17:19:09 2010
@@ -0,0 +1,33 @@
+#!/bin/csh
+
+###########################################################################
+# 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.
+###########################################################################
+
+set args
+
+if ( $#args > 0 ) then
+	set args = "$*"
+endif
+
+setenv CATALOG_HOME `pwd`/..
+
+${JAVA_HOME}/bin/java \
+   -Djava.ext.dirs=../lib \
+   -Djava.util.logging.config.file=../etc/logging.properties \
+   -Dorg.apache.oodt.cas.catalog.properties.file=../etc/catalog-service.properties \
+   org.apache.oodt.cas.catalog.server.CatalogServiceServerLauncher ${args}
+   
\ No newline at end of file

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogDictionaryException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogDictionaryException.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogDictionaryException.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogDictionaryException.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,41 @@
+/*
+ * 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.catalog.exception;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class CatalogDictionaryException extends Exception {
+
+	private static final long serialVersionUID = 7734987410778199955L;
+
+	public CatalogDictionaryException() {
+		super();
+	}
+	
+	public CatalogDictionaryException(String msg) {
+		super(msg);
+	}
+	
+	public CatalogDictionaryException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogException.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogException.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogException.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.catalog.exception;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class CatalogException extends Exception {
+
+	private static final long serialVersionUID = 7734987410778199955L;
+
+	public CatalogException() {
+		super();
+	}
+	
+	public CatalogException(String msg) {
+		super(msg);
+	}
+	
+	public CatalogException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogIndexException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogIndexException.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogIndexException.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogIndexException.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.catalog.exception;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class CatalogIndexException extends Exception {
+
+	private static final long serialVersionUID = 7734987410778199955L;
+
+	public CatalogIndexException() {
+		super();
+	}
+	
+	public CatalogIndexException(String msg) {
+		super(msg);
+	}
+	
+	public CatalogIndexException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogRepositoryException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogRepositoryException.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogRepositoryException.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogRepositoryException.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.catalog.exception;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class CatalogRepositoryException extends Exception {
+
+	private static final long serialVersionUID = 7734987410778199955L;
+
+	public CatalogRepositoryException() {
+		super();
+	}
+	
+	public CatalogRepositoryException(String msg) {
+		super(msg);
+	}
+	
+	public CatalogRepositoryException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogServiceException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogServiceException.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogServiceException.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogServiceException.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.catalog.exception;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class CatalogServiceException extends Exception {
+
+	private static final long serialVersionUID = 7734987410778199955L;
+
+	public CatalogServiceException() {
+		super();
+	}
+	
+	public CatalogServiceException(String msg) {
+		super(msg);
+	}
+	
+	public CatalogServiceException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/IngestServiceException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/IngestServiceException.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/IngestServiceException.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/IngestServiceException.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.catalog.exception;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class IngestServiceException extends Exception {
+
+	private static final long serialVersionUID = 7734987410778199955L;
+
+	public IngestServiceException() {
+		super();
+	}
+	
+	public IngestServiceException(String msg) {
+		super(msg);
+	}
+	
+	public IngestServiceException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/QueryServiceException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/QueryServiceException.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/QueryServiceException.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/QueryServiceException.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.catalog.exception;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class QueryServiceException extends Exception {
+
+	private static final long serialVersionUID = 7734987410778199955L;
+
+	public QueryServiceException() {
+		super();
+	}
+	
+	public QueryServiceException(String msg) {
+		super(msg);
+	}
+	
+	public QueryServiceException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,342 @@
+/*
+ * 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.catalog.mapping;
+
+//JDK imports
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+//SQL imports
+import javax.sql.DataSource;
+
+//OODT imports
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.page.CatalogReceipt;
+import org.apache.oodt.cas.catalog.page.IndexPager;
+import org.apache.oodt.cas.catalog.page.IngestReceipt;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.commons.date.DateUtils;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ *
+ * <p>
+ * A Ingest Mapper that indexes to an DataSource Database
+ * <p>
+ */
+public class DataSourceIngestMapper implements IngestMapper {
+
+	protected DataSource dataSource;
+	
+	public DataSourceIngestMapper(String user, String pass, String driver,
+			String jdbcUrl) throws InstantiationException {
+		this.dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass,
+                driver, jdbcUrl);
+	}
+	
+	public synchronized void deleteAllMappingsForCatalog(String catalogId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			stmt.execute("DELETE FROM CatalogServiceMapper WHERE CATALOG_ID = '" + catalogId + "'");
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public synchronized void deleteAllMappingsForCatalogServiceTransactionId(
+			TransactionId<?> catalogServiceTransactionId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			stmt.execute("DELETE FROM CatalogServiceMapper WHERE CAT_SERV_TRANS_ID = '" + catalogServiceTransactionId + "'");
+			conn.commit();
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public synchronized void deleteTransactionIdMapping(
+			TransactionId<?> catalogTransactionId, String catalogId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			stmt.execute("DELETE FROM CatalogServiceMapper WHERE CAT_TRANS_ID = '" + catalogTransactionId + "' AND CATALOG_ID = '" + catalogId + "'");
+			conn.commit();
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public synchronized TransactionId<?> getCatalogServiceTransactionId(
+			TransactionId<?> catalogTransactionId, String catalogId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet rs = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			rs = stmt.executeQuery("SELECT CAT_SERV_TRANS_ID,CAT_SERV_TRANS_FACTORY FROM CatalogServiceMapper WHERE CAT_TRANS_ID = '"+ catalogTransactionId + "' AND CATALOG_ID = '" + catalogId + "'");
+			
+			while(rs.next())
+				return ((TransactionIdFactory) Class.forName(rs.getString("CAT_SERV_TRANS_FACTORY")).newInstance()).createTransactionId(rs.getString("CAT_SERV_TRANS_ID"));
+
+			return null;
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+			try {
+				rs.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public synchronized TransactionId<?> getCatalogTransactionId(
+			TransactionId<?> catalogServiceTransactionId, String catalogId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet rs = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			rs = stmt.executeQuery("SELECT CAT_TRANS_ID,CAT_TRANS_FACTORY FROM CatalogServiceMapper WHERE CAT_SERV_TRANS_ID = '"+ catalogServiceTransactionId + "' AND CATALOG_ID = '" + catalogId + "'");
+			
+			while(rs.next())
+				return ((TransactionIdFactory) Class.forName(rs.getString("CAT_TRANS_FACTORY")).newInstance()).createTransactionId(rs.getString("CAT_TRANS_ID"));
+
+			return null;
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+			try {
+				rs.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public synchronized Set<String> getCatalogIds(
+			TransactionId<?> catalogServiceTransactionId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet rs = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			rs = stmt.executeQuery("SELECT CATALOG_ID FROM CatalogServiceMapper WHERE CAT_SERV_TRANS_ID = '"+ catalogServiceTransactionId + "'");
+			
+			Set<String> catalogIds = new HashSet<String>();
+			while(rs.next())
+				catalogIds.add(rs.getString("CATALOG_ID"));
+
+			return catalogIds;
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+			try {
+				rs.close();
+			}catch(Exception e) {}
+		}	
+	}
+
+	public synchronized Set<TransactionId<?>> getPageOfCatalogTransactionIds(
+			IndexPager indexPager, String catalogId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet rs = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			rs = stmt.executeQuery(
+				"SELECT * FROM "
+					+"( SELECT a.*, ROWNUM r FROM " 
+						+ "( SELECT CAT_TRANS_FACTORY,CAT_TRANS_ID FROM CatalogServiceMapper WHERE CatalogServiceMapper.CATALOG_ID = '" + catalogId + "' ORDER BY CatalogServiceMapper.CAT_SERV_TRANS_ID DESC ) a "
+					+ "WHERE ROWNUM <= " + (indexPager.getPageSize() * (indexPager.getPageNum() + 1)) + " ) "
+				+ "WHERE r >= " + ((indexPager.getPageSize() * indexPager.getPageNum()) + 1));
+			
+			Set<TransactionId<?>> transactionIds = new HashSet<TransactionId<?>>();
+			while(rs.next())
+				transactionIds.add(((TransactionIdFactory) Class.forName(rs.getString("CAT_TRANS_FACTORY")).newInstance()).createTransactionId(rs.getString("CAT_TRANS_ID")));
+				
+			return transactionIds;
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+			try {
+				rs.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public synchronized boolean hasCatalogServiceTransactionId(
+			TransactionId<?> catalogServiceTransactionId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet rs = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			rs = stmt.executeQuery("SELECT CAT_SERV_TRANS_ID FROM CatalogServiceMapper WHERE CAT_SERV_TRANS_ID = '"+ catalogServiceTransactionId + "'");
+			return rs.next();
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+			try {
+				rs.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public synchronized void storeTransactionIdMapping(
+			TransactionId<?> catalogServiceTransactionId,
+			TransactionIdFactory catalogServiceTransactionIdFactory,
+			CatalogReceipt catalogReceipt,
+			TransactionIdFactory catalogTransactionIdFactory)
+			throws CatalogRepositoryException { 
+		Connection conn = null;
+		Statement stmt = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			Calendar calTime = DateUtils.getCurrentUtcTime();
+			calTime.setTime(catalogReceipt.getTransactionDate());
+			stmt.execute("INSERT INTO CatalogServiceMapper (CAT_SERV_TRANS_ID, CAT_SERV_TRANS_FACTORY, CAT_TRANS_ID, CAT_TRANS_FACTORY, CAT_TRANS_DATE, CATALOG_ID) VALUES ('" 
+					+ catalogServiceTransactionId + "', '" 
+					+ catalogServiceTransactionIdFactory.getClass().getName() + "', '" 
+					+ catalogReceipt.getTransactionId() + "', '" 
+					+ catalogTransactionIdFactory.getClass().getName() + "', '" 
+					+ DateUtils.toString(calTime) + "', '"
+					+ catalogReceipt.getCatalogId() + "')");
+			conn.commit();
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+		}
+	}
+
+	public CatalogReceipt getCatalogReceipt(
+			TransactionId<?> catalogServiceTransactionId, String catalogId)
+			throws CatalogRepositoryException {
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet rs = null;
+		try {
+			conn = this.dataSource.getConnection();
+			stmt = conn.createStatement();
+			rs = stmt.executeQuery("SELECT CAT_TRANS_ID, CAT_TRANS_FACTORY, CAT_TRANS_DATE FROM CatalogServiceMapper WHERE CAT_SERV_TRANS_ID = '"+ catalogServiceTransactionId + "' AND CATALOG_ID = '" + catalogId + "'");
+			
+			if(rs.next()) {
+				TransactionId<?> catalogTransactionId =  ((TransactionIdFactory) Class.forName(rs.getString("CAT_TRANS_FACTORY")).newInstance()).createTransactionId(rs.getString("CAT_TRANS_ID"));
+				Date transactionDate = DateUtils.toCalendar(rs.getString("CAT_TRANS_DATE"), DateUtils.FormatType.UTC_FORMAT).getTime();
+				return new CatalogReceipt(new IngestReceipt(catalogTransactionId, transactionDate), catalogId);
+			}else {
+				return null;
+			}
+		}catch (Exception e) {
+			throw new CatalogRepositoryException("", e);
+		}finally {
+			try {
+				conn.close();
+			}catch(Exception e) {}
+			try {
+				stmt.close();
+			}catch(Exception e) {}
+			try {
+				rs.close();
+			}catch(Exception e) {}
+		}
+	}
+
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapperFactory.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,88 @@
+/*
+ * 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.catalog.mapping;
+
+//Spring imports
+import org.springframework.beans.factory.annotation.Required;
+
+//OODT imports
+import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ *
+ * <p>
+ * A Factory for creating DataSourceIngestMapper
+ * <p>
+ */
+public class DataSourceIngestMapperFactory implements IngestMapperFactory {
+
+    protected String jdbcUrl;
+    protected String user;
+    protected String pass;
+    protected String driver;
+	
+	public DataSourceIngestMapperFactory() {}
+
+	public String getJdbcUrl() {
+		return jdbcUrl;
+	}
+
+	@Required
+	public void setJdbcUrl(String jdbcUrl) {
+		this.jdbcUrl = jdbcUrl;
+	}
+
+	public String getUser() {
+		return user;
+	}
+	
+	@Required
+	public void setUser(String user) {
+		this.user = user;
+	}
+
+	public String getPass() {
+		return pass;
+	}
+
+	@Required
+	public void setPass(String pass) {
+		this.pass = pass;
+	}
+
+	public String getDriver() {
+		return driver;
+	}
+
+	@Required
+	public void setDriver(String driver) {
+		this.driver = driver;
+	}
+	
+	public IngestMapper createMapper() {
+		try {
+			return new DataSourceIngestMapper(user, pass,
+	                driver, jdbcUrl);
+		}catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapper.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapper.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapper.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapper.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.catalog.mapping;
+
+//OODT imports
+import org.apache.oodt.commons.database.SqlScript;
+
+//JDK imports
+import java.io.File;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class InMemoryIngestMapper extends DataSourceIngestMapper {
+
+	public InMemoryIngestMapper(String user, String pass, String driver,
+			String jdbcUrl, String tablesFile) throws Exception {
+		super(user, pass, driver, jdbcUrl);
+        SqlScript coreSchemaScript = new SqlScript(new File(tablesFile).getAbsolutePath(), this.dataSource);
+        coreSchemaScript.loadScript();
+        coreSchemaScript.execute();
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapperFactory.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapperFactory.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/InMemoryIngestMapperFactory.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,52 @@
+/*
+ * 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.catalog.mapping;
+
+//JDK imports
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+//OODT imports
+import org.apache.oodt.cas.catalog.struct.impl.index.InMemoryIndexFactory;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ * 
+ */
+public class InMemoryIngestMapperFactory extends DataSourceIngestMapperFactory {
+
+	private static final Logger LOG = Logger.getLogger(InMemoryIndexFactory.class.getName());
+	
+	protected String tablesFile;
+	
+	@Override
+	public InMemoryIngestMapper createMapper() {
+		try {
+			return new InMemoryIngestMapper(user, pass,
+	                driver, jdbcUrl, this.tablesFile);
+		}catch (Exception e) {
+			LOG.log(Level.SEVERE, "Failed to create InMemoryIndex : " + e.getMessage(), e);
+			return null;
+		}
+	}
+	
+	public void setTablesFile(String tablesFile) {
+		this.tablesFile = tablesFile;
+	}
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,144 @@
+/*
+ * 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.catalog.mapping;
+
+//JDK imports
+import java.util.Set;
+
+//OODT imports
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.page.CatalogReceipt;
+import org.apache.oodt.cas.catalog.page.IndexPager;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ *
+ * <p>
+ * An Interface Ingest Mapper that indexes transaction ids to catalog transaction ids and catlaog ids
+ * <p>
+ */
+public interface IngestMapper {
+
+	/**
+	 * Maps the three arguments to each other so any of the others can be
+	 * retrieved via one of the other arguments
+	 * 
+	 * @param catalogId
+	 *            The ID that uniquely represents a catalog
+	 * @param catalogServiceTransactionId
+	 *            TransactionId generated by the CatalogService
+	 * @param catalogTransactionId
+	 *            The TransactionId used by the Catalog given (maybe the same as
+	 *            catalogServiceTransactionId, maybe different)
+	 * @throws CatalogRepositoryException
+	 *             Any error
+	 */
+	public void storeTransactionIdMapping(
+			TransactionId<?> catalogServiceTransactionId, TransactionIdFactory catalogServiceTransactionIdFactory,
+			CatalogReceipt catalogReceipt, TransactionIdFactory catalogTransactionIdFactory)
+			throws CatalogRepositoryException;
+
+	public Set<TransactionId<?>> getPageOfCatalogTransactionIds(IndexPager indexPager,
+			String catalogId) throws CatalogRepositoryException;
+	
+	public void deleteTransactionIdMapping(TransactionId<?> catalogTransactionId, 
+			String catalogId) throws CatalogRepositoryException;
+	
+	public void deleteAllMappingsForCatalogServiceTransactionId(
+			TransactionId<?> catalogServiceTransactionId)
+			throws CatalogRepositoryException;
+	
+	public void deleteAllMappingsForCatalog(String catalogId)
+			throws CatalogRepositoryException;
+	
+	/**
+	 * Verify if the given CatalogService TransactionId has been stored in a
+	 * mapping {@link storeTransactionIdMapping(String, TransactionId<?>,
+	 * TransactionId<?>)}
+	 * 
+	 * @param catalogServiceTransactionId
+	 *            The CatalogService TransactionId in question
+	 * @return True is the catalogServiceTransactionId has been used in a used in a mapping
+	 * @throws CatalogRepositoryException
+	 *             Any error
+	 */
+	public boolean hasCatalogServiceTransactionId(
+			TransactionId<?> catalogServiceTransactionId)
+			throws CatalogRepositoryException;
+
+	/**
+	 * Get the CatalogService TransactionId that was mapped to the given Catalog
+	 * URN and Catalog TransactionId
+	 * 
+	 * @param catalogTransactionId
+	 *            A Catalog TransactionId
+	 * @param catalogId
+	 *            A unique Catalog ID when the Catalog TransactionId was used
+	 * @return The CatalogService TransactionId which was mapped to the given
+	 *         Catalog TransactionId and Catalog ID
+	 * @throws CatalogRepositoryException
+	 *             Any Error
+	 */
+	public TransactionId<?> getCatalogServiceTransactionId(
+			TransactionId<?> catalogTransactionId, String catalogId)
+			throws CatalogRepositoryException;
+
+	/**
+	 * Get the Catalog TransactionId that was mapped to the given Catalog ID
+	 * and CatalogService TransactionId
+	 * 
+	 * @param catalogServiceTransactionId
+	 *            A Catalog TransactionId
+	 * @param catalogId
+	 *            A unique Catalog ID when the Catalog TransactionId was used
+	 * @return The CatalogService TransactionId which was mapped to the given
+	 *         Catalog TransactionId and Catalog ID
+	 * @throws CatalogRepositoryException
+	 *             Any Error
+	 */
+	public TransactionId<?> getCatalogTransactionId(
+			TransactionId<?> catalogServiceTransactionId, String catalogId)
+			throws CatalogRepositoryException;
+
+	/**
+	 * Get all the Catalog URNs for which the given TransactionId was mapped
+	 * 
+	 * @param catalogServiceTransactionId
+	 *            A CatalogService TransactionId
+	 * @return Catalog IDs for which the given TransactionId was mapped
+	 * @throws CatalogRepositoryException
+	 *             Any Error
+	 */
+	public Set<String> getCatalogIds(
+			TransactionId<?> catalogServiceTransactionId)
+			throws CatalogRepositoryException;
+	
+	/**
+	 * 
+	 * @param catalogServiceTransactionId
+	 * @param catalogId
+	 * @return
+	 * @throws CatalogRepositoryException
+	 */
+	public CatalogReceipt getCatalogReceipt(
+			TransactionId<?> catalogServiceTransactionId, String catalogId)
+			throws CatalogRepositoryException;
+	
+}

Added: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java?rev=1002752&view=auto
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java (added)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java Wed Sep 29 17:19:09 2010
@@ -0,0 +1,31 @@
+/*
+ * 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.catalog.mapping;
+
+/**
+ * @author bfoster
+ * @version $Revision$
+ *
+ * <p>
+ * A Factory for creating IngestMapper
+ * <p>
+ */
+public interface IngestMapperFactory {
+
+	public IngestMapper createMapper();
+	
+}



Mime
View raw message