oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ah...@apache.org
Subject svn commit: r961279 [1/3] - in /incubator/oodt/trunk/catalog/src/main/java: gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/ org/apache/oodt/cas/catalog/exception/ org/apache/oodt/cas/catalog/mapping/ org/apache/oodt/cas/catalog/metadata/ org/apach...
Date Wed, 07 Jul 2010 07:51:54 GMT
Author: ahart
Date: Wed Jul  7 07:51:51 2010
New Revision: 961279

URL: http://svn.apache.org/viewvc?rev=961279&view=rev
Log:
progress towards OODT-15: rename packages and imports to 'org.apache.*' (cas-catalog)

Added:
    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/   (props changed)
      - copied from r961256, incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/
Removed:
    incubator/oodt/trunk/catalog/src/main/java/gov/nasa/jpl/oodt/
Modified:
    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/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/mapping/OracleIngestMapper.java
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapperFactory.java
    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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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

Propchange: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogDictionaryException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogDictionaryException.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.exception;
+package org.apache.oodt.cas.catalog.exception;
 
 /**
  * @author bfoster

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogException.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.exception;
+package org.apache.oodt.cas.catalog.exception;
 
 /**
  * @author bfoster

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogIndexException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogIndexException.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.exception;
+package org.apache.oodt.cas.catalog.exception;
 
 /**
  * @author bfoster

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogRepositoryException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogRepositoryException.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.exception;
+package org.apache.oodt.cas.catalog.exception;
 
 /**
  * @author bfoster

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogServiceException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/CatalogServiceException.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.exception;
+package org.apache.oodt.cas.catalog.exception;
 
 /**
  * @author bfoster

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/IngestServiceException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/IngestServiceException.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.exception;
+package org.apache.oodt.cas.catalog.exception;
 
 /**
  * @author bfoster

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/QueryServiceException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/exception/QueryServiceException.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.exception;
+package org.apache.oodt.cas.catalog.exception;
 
 /**
  * @author bfoster

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapper.java Wed Jul  7 07:51:51 2010
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.page.CatalogReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
+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;
 
 //JDK imports
 import java.util.Date;

Modified: 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=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/IngestMapperFactory.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapper.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapper.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapper.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapper.java Wed Jul  7 07:51:51 2010
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.page.CatalogReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
+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;
 
 //JDK imports
 import java.util.Set;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapperFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapperFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/LuceneIngestMapperFactory.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapper.java Wed Jul  7 07:51:51 2010
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.page.CatalogReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
+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;
 
 //JDK imports
 import java.util.HashMap;
@@ -58,9 +58,9 @@ public class MemoryBasedIngestMapper imp
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @seegov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#
+	 * @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository#
 	 * getCatalogServiceTransactionId
-	 * (gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId, java.lang.String)
+	 * (org.apache.oodt.cas.catalog.struct.TransactionId, java.lang.String)
 	 */
 	public synchronized TransactionId<?> getCatalogServiceTransactionId(
 			TransactionId<?> catalogTransactionId, String catalogId)
@@ -79,9 +79,9 @@ public class MemoryBasedIngestMapper imp
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @seegov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#
+	 * @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository#
 	 * getCatalogTransactionId
-	 * (gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId, java.lang.String)
+	 * (org.apache.oodt.cas.catalog.struct.TransactionId, java.lang.String)
 	 */
 	public synchronized TransactionId<?> getCatalogTransactionId(
 			TransactionId<?> catalogServiceTransactionId, String catalogId)
@@ -99,7 +99,7 @@ public class MemoryBasedIngestMapper imp
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * gov.nasa.jpl.oodt.cas.catalog.mapping.IngestMapper#getPage(gov.nasa.jpl
+	 * org.apache.oodt.cas.catalog.mapping.IngestMapper#getPage(org.apache
 	 * .oodt.cas.catalog.page.IndexPager, java.lang.String)
 	 */
 	public synchronized Set<TransactionId<?>> getPageOfCatalogTransactionIds(IndexPager indexPager,
@@ -114,7 +114,7 @@ public class MemoryBasedIngestMapper imp
 
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.mapping.IngestMapper#deleteAllMappingsForCatalog(java.lang.String)
+	 * @see org.apache.oodt.cas.catalog.mapping.IngestMapper#deleteAllMappingsForCatalog(java.lang.String)
 	 */
 	public synchronized void deleteAllMappingsForCatalog(String catalogId)
 			throws CatalogRepositoryException {
@@ -130,7 +130,7 @@ public class MemoryBasedIngestMapper imp
 	
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#deleteAllMappingsForCatalogServiceTransactionId(gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId)
+	 * @see org.apache.oodt.cas.catalog.repository.CatalogRepository#deleteAllMappingsForCatalogServiceTransactionId(org.apache.oodt.cas.catalog.struct.TransactionId)
 	 */
 	public synchronized void deleteAllMappingsForCatalogServiceTransactionId(
 			TransactionId<?> catalogServiceTransactionId)
@@ -145,7 +145,7 @@ public class MemoryBasedIngestMapper imp
 
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#deleteTransactionIdMapping(gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId, gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId, java.lang.String)
+	 * @see org.apache.oodt.cas.catalog.repository.CatalogRepository#deleteTransactionIdMapping(org.apache.oodt.cas.catalog.struct.TransactionId, org.apache.oodt.cas.catalog.struct.TransactionId, java.lang.String)
 	 */
 	public synchronized void deleteTransactionIdMapping(
 			TransactionId<?> catalogTransactionId, String catalogId)
@@ -163,7 +163,7 @@ public class MemoryBasedIngestMapper imp
 
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#hasCatalogServiceTransactionId(gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId)
+	 * @see org.apache.oodt.cas.catalog.repository.CatalogRepository#hasCatalogServiceTransactionId(org.apache.oodt.cas.catalog.struct.TransactionId)
 	 */
 	public synchronized boolean hasCatalogServiceTransactionId(
 			TransactionId<?> catalogServiceTransactionId)
@@ -174,10 +174,10 @@ public class MemoryBasedIngestMapper imp
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @seegov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#
+	 * @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository#
 	 * storeTransactionIdMapping(java.lang.String,
-	 * gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId,
-	 * gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId)
+	 * org.apache.oodt.cas.catalog.struct.TransactionId,
+	 * org.apache.oodt.cas.catalog.struct.TransactionId)
 	 */
 	public synchronized void storeTransactionIdMapping(
 			TransactionId<?> catalogServiceTransactionId,
@@ -204,8 +204,8 @@ public class MemoryBasedIngestMapper imp
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#getCatalogs
-	 * (gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId)
+	 * org.apache.oodt.cas.catalog.repository.CatalogRepository#getCatalogs
+	 * (org.apache.oodt.cas.catalog.struct.TransactionId)
 	 */
 	public synchronized Set<String> getCatalogIds(
 			TransactionId<?> catalogServiceTransactionId)

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapperFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapperFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/MemoryBasedIngestMapperFactory.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapper.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapper.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapper.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapper.java Wed Jul  7 07:51:51 2010
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.page.CatalogReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.page.IngestReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
-import gov.nasa.jpl.oodt.cas.commons.date.DateUtils;
+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.cas.commons.date.DateUtils;
 
 //JDK imports
 import java.sql.Connection;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapperFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapperFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/OracleIngestMapperFactory.java Wed Jul  7 07:51:51 2010
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.mapping;
+package org.apache.oodt.cas.catalog.mapping;
 
 //Spring imports
 import org.springframework.beans.factory.annotation.Required;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.cas.commons.database.DatabaseConnectionBuilder;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/metadata/TransactionalMetadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/metadata/TransactionalMetadata.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/metadata/TransactionalMetadata.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/metadata/TransactionalMetadata.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.metadata;
+package org.apache.oodt.cas.catalog.metadata;
 
 //JDK imports
 import java.util.Date;
@@ -24,10 +24,10 @@ import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.page.TransactionReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.system.CatalogService;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.system.CatalogService;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/CatalogReceipt.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/CatalogReceipt.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/CatalogReceipt.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/CatalogReceipt.java Wed Jul  7 07:51:51 2010
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
 import java.util.Date;
 
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
 
 public class CatalogReceipt {
 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IndexPager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IndexPager.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IndexPager.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IndexPager.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IngestReceipt.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IngestReceipt.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IngestReceipt.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/IngestReceipt.java Wed Jul  7 07:51:51 2010
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
 
 import java.util.Date;
 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/Page.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/Page.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/Page.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/Page.java Wed Jul  7 07:51:51 2010
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
 
 import java.util.List;
 import java.util.Set;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/PageInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/PageInfo.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/PageInfo.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/PageInfo.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
 public class PageInfo {
 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/ProcessedPageInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/ProcessedPageInfo.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/ProcessedPageInfo.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/ProcessedPageInfo.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
 public class ProcessedPageInfo extends PageInfo {
 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/QueryPager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/QueryPager.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/QueryPager.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/QueryPager.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
 //JDK imports
 import java.util.Collections;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/TransactionReceipt.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/TransactionReceipt.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/TransactionReceipt.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/page/TransactionReceipt.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.page;
+package org.apache.oodt.cas.catalog.page;
 
 //JDK imports
 import java.util.Collections;
@@ -26,7 +26,7 @@ import java.util.Set;
 import java.util.Vector;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 //JDK imports
 import java.util.Properties;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomWrapperQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomWrapperQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomWrapperQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/CustomWrapperQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 public class CustomWrapperQueryExpression extends WrapperQueryExpression {
 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/FreeTextQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 //JDK imports
 import java.util.Arrays;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/NotQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/NotQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/NotQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/NotQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 import java.util.HashSet;
 import java.util.Set;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryLogicalGroup.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 //JDK imports
 import java.util.Collections;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/StdQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/StdQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/StdQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/StdQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 //JDK imports
 import java.util.Set;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/TermQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/TermQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/TermQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/TermQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.term.Term;
+import org.apache.oodt.cas.catalog.term.Term;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/WrapperQueryExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/WrapperQueryExpression.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/WrapperQueryExpression.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/WrapperQueryExpression.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query;
+package org.apache.oodt.cas.catalog.query;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/FilterAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/FilterAlgorithm.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/FilterAlgorithm.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/FilterAlgorithm.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.filter;
+package org.apache.oodt.cas.catalog.query.filter;
 
 //JDK imports
 import java.util.List;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/QueryFilter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/QueryFilter.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/QueryFilter.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/QueryFilter.java Wed Jul  7 07:51:51 2010
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.filter;
+package org.apache.oodt.cas.catalog.query.filter;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
 
 //JDK imports
 import java.util.List;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEvent.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEvent.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEvent.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEvent.java Wed Jul  7 07:51:51 2010
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.filter.time;
+package org.apache.oodt.cas.catalog.query.filter.time;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-import gov.nasa.jpl.oodt.cas.commons.filter.ObjectTimeEvent;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.commons.filter.ObjectTimeEvent;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventFilterAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventFilterAlgorithm.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventFilterAlgorithm.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventFilterAlgorithm.java Wed Jul  7 07:51:51 2010
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.filter.time;
+package org.apache.oodt.cas.catalog.query.filter.time;
 
 //JDK imports
 import java.util.Collections;
 import java.util.List;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.query.filter.FilterAlgorithm;
-import gov.nasa.jpl.oodt.cas.commons.filter.TimeEventWeightedHash;
+import org.apache.oodt.cas.catalog.query.filter.FilterAlgorithm;
+import org.apache.oodt.cas.commons.filter.TimeEventWeightedHash;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventQueryFilter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventQueryFilter.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventQueryFilter.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/MetadataTimeEventQueryFilter.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.filter.time;
+package org.apache.oodt.cas.catalog.query.filter.time;
 
 //JDK imports
 import java.util.Collections;
@@ -23,10 +23,10 @@ import java.util.List;
 import java.util.Vector;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-import gov.nasa.jpl.oodt.cas.catalog.query.filter.QueryFilter;
-import gov.nasa.jpl.oodt.cas.catalog.query.filter.time.conv.AsciiSortableVersionConverter;
-import gov.nasa.jpl.oodt.cas.catalog.query.filter.time.conv.VersionConverter;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.query.filter.QueryFilter;
+import org.apache.oodt.cas.catalog.query.filter.time.conv.AsciiSortableVersionConverter;
+import org.apache.oodt.cas.catalog.query.filter.time.conv.VersionConverter;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/AsciiSortableVersionConverter.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.filter.time.conv;
+package org.apache.oodt.cas.catalog.query.filter.time.conv;
 
 /**
  * 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/filter/time/conv/VersionConverter.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.filter.time.conv;
+package org.apache.oodt.cas.catalog.query.filter.time.conv;
 
 /**
  * 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/JJTQueryParserState.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/JJTQueryParserState.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/JJTQueryParserState.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/JJTQueryParserState.java Wed Jul  7 07:51:51 2010
@@ -17,7 +17,7 @@
 
 /* Generated By:JJTree: Do not edit this line. ./JJTQueryParserState.java */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 class JJTQueryParserState {
   private java.util.Stack<Node> nodes;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Node.java Wed Jul  7 07:51:51 2010
@@ -17,7 +17,7 @@
 
 /* Generated By:JJTree: Do not edit this line. Node.java */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 /* All AST nodes must implement this interface.  It provides basic
    machinery for constructing the parent and child relationships

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/ParseException.java Wed Jul  7 07:51:51 2010
@@ -16,7 +16,7 @@
  */
 
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 /**
  * This exception is thrown when parse errors are encountered.

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java Wed Jul  7 07:51:51 2010
@@ -16,19 +16,19 @@
  */
 
 /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParser.java */
-        package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+        package org.apache.oodt.cas.catalog.query.parser;
 
         import java.io.ByteArrayInputStream;
         import java.util.Arrays;
         import java.util.HashSet;
         import java.util.Vector;
         import java.util.Properties;
-        import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-        import gov.nasa.jpl.oodt.cas.catalog.query.QueryLogicalGroup;
-        import gov.nasa.jpl.oodt.cas.catalog.query.StdQueryExpression;
-        import gov.nasa.jpl.oodt.cas.catalog.query.ComparisonQueryExpression;
-        import gov.nasa.jpl.oodt.cas.catalog.query.CustomQueryExpression;
-        import gov.nasa.jpl.oodt.cas.catalog.term.Term;
+        import org.apache.oodt.cas.catalog.query.QueryExpression;
+        import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
+        import org.apache.oodt.cas.catalog.query.StdQueryExpression;
+        import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
+        import org.apache.oodt.cas.catalog.query.CustomQueryExpression;
+        import org.apache.oodt.cas.catalog.term.Term;
 
     public class QueryParser/*@bgen(jjtree)*/implements QueryParserTreeConstants, QueryParserConstants {/*@bgen(jjtree)*/
   protected JJTQueryParserState jjtree = new JJTQueryParserState();

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserConstants.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserConstants.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserConstants.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserConstants.java Wed Jul  7 07:51:51 2010
@@ -16,7 +16,7 @@
  */
 
 /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParserConstants.java */
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 public interface QueryParserConstants {
 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java Wed Jul  7 07:51:51 2010
@@ -16,18 +16,18 @@
  */
 
 /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParserTokenManager.java */
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Vector;
 import java.util.Properties;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryLogicalGroup;
-import gov.nasa.jpl.oodt.cas.catalog.query.StdQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.ComparisonQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.CustomQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.term.Term;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
+import org.apache.oodt.cas.catalog.query.StdQueryExpression;
+import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
+import org.apache.oodt.cas.catalog.query.CustomQueryExpression;
+import org.apache.oodt.cas.catalog.term.Term;
 
 public class QueryParserTokenManager implements QueryParserConstants
 {

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTreeConstants.java Wed Jul  7 07:51:51 2010
@@ -17,7 +17,7 @@
 
 /* Generated By:JJTree: Do not edit this line. ./QueryParserTreeConstants.java */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 public interface QueryParserTreeConstants
 {

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleCharStream.java Wed Jul  7 07:51:51 2010
@@ -16,7 +16,7 @@
  */
 
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/SimpleNode.java Wed Jul  7 07:51:51 2010
@@ -17,7 +17,7 @@
 
 /* Generated By:JJTree: Do not edit this line. SimpleNode.java */
 
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 public class SimpleNode implements Node {
   protected Node parent;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Token.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Token.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Token.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/Token.java Wed Jul  7 07:51:51 2010
@@ -16,7 +16,7 @@
  */
 
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 /**
  * Describes the input token stream.

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/TokenMgrError.java Wed Jul  7 07:51:51 2010
@@ -16,7 +16,7 @@
  */
 
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
-package gov.nasa.jpl.oodt.cas.catalog.query.parser;
+package org.apache.oodt.cas.catalog.query.parser;
 
 public class TokenMgrError extends Error
 {

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepository.java Wed Jul  7 07:51:51 2010
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //JDK imports
 import java.util.List;
 import java.util.Set;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.util.PluginURL;
 
 /**
  * 

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/CatalogRepositoryFactory.java Wed Jul  7 07:51:51 2010
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepository.java Wed Jul  7 07:51:51 2010
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.util.PluginURL;
 
 //JDK imports
 import java.util.HashMap;
@@ -52,7 +52,7 @@ public class MemoryBasedCatalogRepositor
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @seegov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#
+	 * @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository#
 	 * deleteSerializedCatalog(java.lang.String)
 	 */
 	public void deleteSerializedCatalog(String catalogUrn)
@@ -63,7 +63,7 @@ public class MemoryBasedCatalogRepositor
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @seegov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#
+	 * @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository#
 	 * deserializeAllCatalogs()
 	 */
 	public Set<Catalog> deserializeAllCatalogs()
@@ -75,7 +75,7 @@ public class MemoryBasedCatalogRepositor
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#deserializeCatalog
+	 * org.apache.oodt.cas.catalog.repository.CatalogRepository#deserializeCatalog
 	 * (java.lang.String)
 	 */
 	public Catalog deserializeCatalog(String catalogUrn)
@@ -86,7 +86,7 @@ public class MemoryBasedCatalogRepositor
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @seegov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#
+	 * @seeorg.apache.oodt.cas.catalog.repository.CatalogRepository#
 	 * isCatalogSerialized(java.lang.String)
 	 */
 	public boolean isCatalogSerialized(String catalogUrn)
@@ -98,8 +98,8 @@ public class MemoryBasedCatalogRepositor
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository#serializeCatalog
-	 * (gov.nasa.jpl.oodt.cas.catalog.Catalog)
+	 * org.apache.oodt.cas.catalog.repository.CatalogRepository#serializeCatalog
+	 * (org.apache.oodt.cas.catalog.Catalog)
 	 */
 	public void serializeCatalog(Catalog catalog)
 			throws CatalogRepositoryException {

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepositoryFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepositoryFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/MemoryBasedCatalogRepositoryFactory.java Wed Jul  7 07:51:51 2010
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepository.java Wed Jul  7 07:51:51 2010
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.catalog.util.Serializer;
 
 //JDK imports
 import java.io.File;
@@ -63,7 +63,7 @@ public class SerializedCatalogRepository
 
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#deleteSerializedCatalog(java.lang.String)
+	 * @see org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#deleteSerializedCatalog(java.lang.String)
 	 */
 	public void deleteSerializedCatalog(String catalogUrn)
 			throws CatalogRepositoryException {
@@ -77,7 +77,7 @@ public class SerializedCatalogRepository
 
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#deserializeCatalog(java.lang.String)
+	 * @see org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#deserializeCatalog(java.lang.String)
 	 */
 	public Catalog deserializeCatalog(String catalogUrn)
 			throws CatalogRepositoryException {
@@ -96,7 +96,7 @@ public class SerializedCatalogRepository
 	
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#deserializeAllCatalogs()
+	 * @see org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#deserializeAllCatalogs()
 	 */
 	public Set<Catalog> deserializeAllCatalogs()
 			throws CatalogRepositoryException {
@@ -110,7 +110,7 @@ public class SerializedCatalogRepository
 
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#isCatalogSerialized(java.lang.String)
+	 * @see org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#isCatalogSerialized(java.lang.String)
 	 */
 	public boolean isCatalogSerialized(String catalogUrn)
 			throws CatalogRepositoryException {
@@ -119,7 +119,7 @@ public class SerializedCatalogRepository
 
 	/*
 	 * (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#serializeCatalog(gov.nasa.jpl.oodt.cas.catalog.Catalog)
+	 * @see org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepository#serializeCatalog(org.apache.oodt.cas.catalog.Catalog)
 	 */
 	public void serializeCatalog(Catalog catalog)
 			throws CatalogRepositoryException {

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepositoryFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepositoryFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SerializedCatalogRepositoryFactory.java Wed Jul  7 07:51:51 2010
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //Spring imports
 import org.springframework.beans.factory.annotation.Required;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java Wed Jul  7 07:51:51 2010
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.catalog.util.Serializer;
 
 //JDK imports
 import java.util.Collections;

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepositoryFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepositoryFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepositoryFactory.java Wed Jul  7 07:51:51 2010
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.repository;
+package org.apache.oodt.cas.catalog.repository;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogRepositoryException;
+import org.apache.oodt.cas.catalog.exception.CatalogRepositoryException;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceCommandLineClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceCommandLineClient.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceCommandLineClient.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceCommandLineClient.java Wed Jul  7 07:51:51 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.catalog.server;
+package org.apache.oodt.cas.catalog.server;
 
 //JDK imports
 import java.io.FileInputStream;
@@ -25,13 +25,13 @@ import java.util.List;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.server.action.CatalogServiceServerAction;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClientFactory;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
-import gov.nasa.jpl.oodt.cas.commons.option.CmdLineOptionInstance;
-import gov.nasa.jpl.oodt.cas.commons.option.util.CmdLineOptionUtils;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.catalog.server.action.CatalogServiceServerAction;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClientFactory;
+import org.apache.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.commons.option.CmdLineOptionInstance;
+import org.apache.oodt.cas.commons.option.util.CmdLineOptionUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 /**
  * @author bfoster
@@ -44,10 +44,10 @@ import gov.nasa.jpl.oodt.cas.metadata.ut
 public class CatalogServiceCommandLineClient {
 
 	public static void main(String[] args) throws Exception {
-		String propertiesFile = System.getProperty("gov.nasa.jpl.oodt.cas.catalog.properties.file");
+		String propertiesFile = System.getProperty("org.apache.oodt.cas.catalog.properties.file");
 		if (propertiesFile != null)
 			System.getProperties().load(new FileInputStream(propertiesFile));
-		String configFile = PathUtils.doDynamicReplacement(System.getProperty("gov.nasa.jpl.oodt.cas.catalog.client.config.file", "classpath:/gov/nasa/jpl/oodt/cas/catalog/config/catserv-client-config.xml"));
+		String configFile = PathUtils.doDynamicReplacement(System.getProperty("org.apache.oodt.cas.catalog.client.config.file", "classpath:/org.apache/oodt/cas/catalog/config/catserv-client-config.xml"));
 		FileSystemXmlApplicationContext appContext = new FileSystemXmlApplicationContext(new String[] { configFile }, false);
 //		appContext.setClassLoader(new Serializer().getClassLoader());
 		appContext.refresh();



Mime
View raw message