incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ah...@apache.org
Subject svn commit: r961282 - in /incubator/oodt/trunk/curator/src/main/java: gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/ org/apache/oodt/cas/curation/policymgr/ org/apache/oodt/cas/curation/service/ org/apache/oodt/cas/curation/servlet/ org/apache/oo...
Date Wed, 07 Jul 2010 08:00:08 GMT
Author: ahart
Date: Wed Jul  7 08:00:07 2010
New Revision: 961282

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

Added:
    incubator/oodt/trunk/curator/src/main/java/org/
    incubator/oodt/trunk/curator/src/main/java/org/apache/
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/   (props changed)
      - copied from r961256, incubator/oodt/trunk/curator/src/main/java/gov/nasa/jpl/oodt/
Removed:
    incubator/oodt/trunk/curator/src/main/java/gov/nasa/jpl/oodt/
Modified:
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/policymgr/CurationPolicyManager.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/SystemResource.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/BeginIngestionTaskServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/DirectoryListingServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/MetViewerServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/SSOConfiguredCuratorWebService.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingDatasetsByPolicyServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingPoliciesServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadDatasetDefinitionServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadMetExtractorConfigServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadPolicyServlet.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/ExtractorConfig.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalogFactory.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/DateUtils.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/HTMLEncode.java
    incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java

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

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/policymgr/CurationPolicyManager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/policymgr/CurationPolicyManager.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/policymgr/CurationPolicyManager.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/policymgr/CurationPolicyManager.java Wed Jul  7 08:00:07 2010
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.curation.policymgr;
+package org.apache.oodt.cas.curation.policymgr;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManager;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.metadata.SerializableMetadata;
+import org.apache.oodt.cas.filemgr.repository.XMLRepositoryManager;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java Wed Jul  7 08:00:07 2010
@@ -16,17 +16,17 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.service;
+package org.apache.oodt.cas.curation.service;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.servlet.CuratorConfMetKeys;
-import gov.nasa.jpl.oodt.cas.curation.util.SSOUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.metadata.SerializableMetadata;
-import gov.nasa.jpl.oodt.cas.security.sso.SingleSignOn;
+import org.apache.oodt.cas.curation.servlet.CuratorConfMetKeys;
+import org.apache.oodt.cas.curation.util.SSOUtils;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
+import org.apache.oodt.cas.security.sso.SingleSignOn;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java Wed Jul  7 08:00:07 2010
@@ -16,14 +16,14 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.service;
+package org.apache.oodt.cas.curation.service;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.servlet.CuratorConfMetKeys;
-import gov.nasa.jpl.oodt.cas.filemgr.datatransfer.DataTransferFactory;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.curation.servlet.CuratorConfMetKeys;
+import org.apache.oodt.cas.filemgr.datatransfer.DataTransferFactory;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 //JDK imports
 import java.net.MalformedURLException;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.service;
+package org.apache.oodt.cas.curation.service;
 
 //JAX-RS imports
 import java.io.File;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java Wed Jul  7 08:00:07 2010
@@ -16,16 +16,16 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.service;
+package org.apache.oodt.cas.curation.service;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.structs.IngestionTask;
-import gov.nasa.jpl.oodt.cas.curation.util.DateUtils;
-import gov.nasa.jpl.oodt.cas.curation.util.ExtractorConfigReader;
-import gov.nasa.jpl.oodt.cas.filemgr.ingest.Ingester;
-import gov.nasa.jpl.oodt.cas.filemgr.ingest.StdIngester;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.IngestException;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.curation.structs.IngestionTask;
+import org.apache.oodt.cas.curation.util.DateUtils;
+import org.apache.oodt.cas.curation.util.ExtractorConfigReader;
+import org.apache.oodt.cas.filemgr.ingest.Ingester;
+import org.apache.oodt.cas.filemgr.ingest.StdIngester;
+import org.apache.oodt.cas.filemgr.structs.exceptions.IngestException;
+import org.apache.oodt.cas.metadata.Metadata;
 
 //JDK imports
 import java.io.File;
@@ -73,7 +73,7 @@ public class IngestionResource extends C
   private static final Logger LOG = Logger.getLogger(IngestionResource.class
       .getName());
 
-  private static final String DATA_TRANSFER_SERVICE = "gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
+  private static final String DATA_TRANSFER_SERVICE = "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
 
   private static final String RESP_SUCCESS = "success";
 

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java Wed Jul  7 08:00:07 2010
@@ -16,29 +16,29 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.service;
+package org.apache.oodt.cas.curation.service;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.policymgr.CurationPolicyManager;
-import gov.nasa.jpl.oodt.cas.curation.structs.ExtractorConfig;
-import gov.nasa.jpl.oodt.cas.curation.util.CurationXmlStructFactory;
-import gov.nasa.jpl.oodt.cas.curation.util.ExtractorConfigReader;
-import gov.nasa.jpl.oodt.cas.curation.util.HTMLEncode;
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
-import gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManager;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
-import gov.nasa.jpl.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.filemgr.util.XmlStructFactory;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractor;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.metadata.SerializableMetadata;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
-import gov.nasa.jpl.oodt.cas.metadata.util.GenericMetadataObjectFactory;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.curation.policymgr.CurationPolicyManager;
+import org.apache.oodt.cas.curation.structs.ExtractorConfig;
+import org.apache.oodt.cas.curation.util.CurationXmlStructFactory;
+import org.apache.oodt.cas.curation.util.ExtractorConfigReader;
+import org.apache.oodt.cas.curation.util.HTMLEncode;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.repository.XMLRepositoryManager;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
+import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
+import org.apache.oodt.cas.filemgr.util.XmlStructFactory;
+import org.apache.oodt.cas.metadata.MetExtractor;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.SerializableMetadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.util.GenericMetadataObjectFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -488,7 +488,7 @@ public class MetadataResource extends Cu
     System.getProperties().load(
         new FileInputStream(CurationService.config.getFileMgrProps()));
     Catalog catalog = GenericFileManagerObjectFactory
-        .getCatalogServiceFromFactory("gov.nasa.jpl.oodt.cas.curation.util.CuratorLuceneCatalogFactory");
+        .getCatalogServiceFromFactory("org.apache.oodt.cas.curation.util.CuratorLuceneCatalogFactory");
     
     Metadata oldMetadata = catalog.getMetadata(product);
     List<Reference> references = catalog.getProductReferences(product);

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/PolicyResource.java Wed Jul  7 08:00:07 2010
@@ -16,16 +16,16 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.service;
+package org.apache.oodt.cas.curation.service;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.util.HTMLEncode;
-import gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManager;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
+import org.apache.oodt.cas.curation.util.HTMLEncode;
+import org.apache.oodt.cas.filemgr.repository.XMLRepositoryManager;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductPage;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Query;
+import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/SystemResource.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/SystemResource.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/SystemResource.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/SystemResource.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.service;
+package org.apache.oodt.cas.curation.service;
 
 //JAX-RS imports
 import javax.ws.rs.GET;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/BeginIngestionTaskServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/BeginIngestionTaskServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/BeginIngestionTaskServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/BeginIngestionTaskServlet.java Wed Jul  7 08:00:07 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.crawl.MetExtractorProductCrawler;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.crawl.MetExtractorProductCrawler;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
 
 //JDK imports
 import java.io.IOException;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 /**
  * 
@@ -29,25 +29,25 @@ package gov.nasa.jpl.oodt.cas.curation.s
  */
 public interface CuratorConfMetKeys {
 
-  final String MET_EXTRACTOR_CONF_UPLOAD_PATH = "gov.nasa.jpl.oodt.cas.curator.metExtractorConf.uploadPath";
+  final String MET_EXTRACTOR_CONF_UPLOAD_PATH = "org.apache.oodt.cas.curator.metExtractorConf.uploadPath";
 
-  final String POLICY_UPLOAD_PATH = "gov.nasa.jpl.oodt.cas.curator.dataDefinition.uploadPath";
+  final String POLICY_UPLOAD_PATH = "org.apache.oodt.cas.curator.dataDefinition.uploadPath";
 
-  final String FM_URL = "gov.nasa.jpl.oodt.cas.fm.url";
+  final String FM_URL = "org.apache.oodt.cas.fm.url";
 
-  final String SSO_IMPL_CLASS = "gov.nasa.jpl.oodt.cas.security.sso.implClass";
+  final String SSO_IMPL_CLASS = "org.apache.oodt.cas.security.sso.implClass";
 
-  final String DEFAULT_TRANSFER_FACTORY = "gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
+  final String DEFAULT_TRANSFER_FACTORY = "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
 
-  final String CRAWLER_CONF_FILE = "classpath:/gov/nasa/jpl/oodt/cas/crawl/crawler-config.xml";
+  final String CRAWLER_CONF_FILE = "classpath:/org.apache/oodt/cas/crawl/crawler-config.xml";
 
-  final String PROJECT_DISPLAY_NAME = "gov.nasa.jpl.oodt.cas.curator.projectName";
+  final String PROJECT_DISPLAY_NAME = "org.apache.oodt.cas.curator.projectName";
 
-  final String STAGING_AREA_PATH = "gov.nasa.jpl.oodt.cas.curator.stagingAreaPath";
+  final String STAGING_AREA_PATH = "org.apache.oodt.cas.curator.stagingAreaPath";
 
-  final String MET_AREA_PATH = "gov.nasa.jpl.oodt.cas.curator.metAreaPath";
+  final String MET_AREA_PATH = "org.apache.oodt.cas.curator.metAreaPath";
   
-  final String MET_EXTENSION = "gov.nasa.jpl.oodt.cas.curator.metExtension";
+  final String MET_EXTENSION = "org.apache.oodt.cas.curator.metExtension";
   
-  final String FM_PROPS = "gov.nasa.jpl.oodt.cas.curator.fmProps";
+  final String FM_PROPS = "org.apache.oodt.cas.curator.fmProps";
 }

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/DirectoryListingServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/DirectoryListingServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/DirectoryListingServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/DirectoryListingServlet.java Wed Jul  7 08:00:07 2010
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
-import gov.nasa.jpl.oodt.cas.curation.policymgr.CurationPolicyManager;
+import org.apache.oodt.cas.curation.policymgr.CurationPolicyManager;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/MetViewerServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/MetViewerServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/MetViewerServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/MetViewerServlet.java Wed Jul  7 08:00:07 2010
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
-import gov.nasa.jpl.oodt.cas.curation.policymgr.CurationPolicyManager;
+import org.apache.oodt.cas.curation.policymgr.CurationPolicyManager;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/SSOConfiguredCuratorWebService.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/SSOConfiguredCuratorWebService.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/SSOConfiguredCuratorWebService.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/SSOConfiguredCuratorWebService.java Wed Jul  7 08:00:07 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.util.SSOUtils;
-import gov.nasa.jpl.oodt.cas.security.sso.SingleSignOn;
+import org.apache.oodt.cas.curation.util.SSOUtils;
+import org.apache.oodt.cas.security.sso.SingleSignOn;
 
 //JDK imports
 import javax.servlet.http.HttpServlet;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingDatasetsByPolicyServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingDatasetsByPolicyServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingDatasetsByPolicyServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingDatasetsByPolicyServlet.java Wed Jul  7 08:00:07 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.policymgr.CurationPolicyManager;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.curation.policymgr.CurationPolicyManager;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 //JDK imports
 import java.io.IOException;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingPoliciesServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingPoliciesServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingPoliciesServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/ShowExistingPoliciesServlet.java Wed Jul  7 08:00:07 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.policymgr.CurationPolicyManager;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.curation.policymgr.CurationPolicyManager;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 //JDK imports
 import java.io.IOException;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UpdateDatasetMetaDataServlet.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //JDK imports
 import java.io.IOException;
@@ -34,12 +34,12 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpSession;
 
 // OODT imports
-import gov.nasa.jpl.oodt.cas.curation.policymgr.CurationPolicyManager;
-import gov.nasa.jpl.oodt.cas.curation.util.CurationXmlStructFactory;
-import gov.nasa.jpl.oodt.cas.curation.util.HTMLEncode;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.curation.policymgr.CurationPolicyManager;
+import org.apache.oodt.cas.curation.util.CurationXmlStructFactory;
+import org.apache.oodt.cas.curation.util.HTMLEncode;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 /**
  * This servlet processes form data submitted via POST from the dataset metadata

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadDatasetDefinitionServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadDatasetDefinitionServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadDatasetDefinitionServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadDatasetDefinitionServlet.java Wed Jul  7 08:00:07 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadMetExtractorConfigServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadMetExtractorConfigServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadMetExtractorConfigServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadMetExtractorConfigServlet.java Wed Jul  7 08:00:07 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadPolicyServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadPolicyServlet.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadPolicyServlet.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/UploadPolicyServlet.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.servlet;
+package org.apache.oodt.cas.curation.servlet;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/ExtractorConfig.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/ExtractorConfig.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/ExtractorConfig.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/ExtractorConfig.java Wed Jul  7 08:00:07 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.curation.structs;
+package org.apache.oodt.cas.curation.structs;
 
 import java.io.File;
 import java.util.List;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTask.java Wed Jul  7 08:00:07 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.structs;
+package org.apache.oodt.cas.curation.structs;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.ingest.Ingester;
+import org.apache.oodt.cas.filemgr.ingest.Ingester;
 
 //JDK imports
 import java.util.Date;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/structs/IngestionTaskStatus.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.structs;
+package org.apache.oodt.cas.curation.structs;
 
 /**
  *

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CurationXmlStructFactory.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 //JDK imports
 import java.net.URLEncoder;
@@ -26,9 +26,9 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.util.XmlStructFactory;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.util.XmlStructFactory;
 
 /**
  * 

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalog.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 //JDK imports
 import java.io.File;
@@ -29,22 +29,22 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.BooleanQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Element;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.QueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.RangeQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.TermQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
-import gov.nasa.jpl.oodt.cas.commons.pagination.PaginationUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.structs.BooleanQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.Element;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductPage;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Query;
+import org.apache.oodt.cas.filemgr.structs.QueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
+import org.apache.oodt.cas.commons.pagination.PaginationUtils;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.metadata.Metadata;
 
 //JUG imports
 import org.safehaus.uuid.UUID;
@@ -149,8 +149,8 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addMetadata(gov.nasa.jpl.
-   * oodt.cas.metadata.Metadata, gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#addMetadata(org.apache.
+   * oodt.cas.metadata.Metadata, org.apache.oodt.cas.filemgr.structs.Product)
    */
   public synchronized void addMetadata(Metadata m, Product product)
       throws CatalogException {
@@ -175,8 +175,8 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#removeMetadata(gov.nasa.jpl
-   * .oodt.cas.metadata.Metadata, gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#removeMetadata(org.apache
+   * .oodt.cas.metadata.Metadata, org.apache.oodt.cas.filemgr.structs.Product)
    */
   public synchronized void removeMetadata(Metadata m, Product product)
       throws CatalogException {
@@ -238,7 +238,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addProduct(gov.nasa.jpl.oodt
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#addProduct(org.apache.oodt
    * .cas.filemgr.structs.Product)
    */
   public synchronized void addProduct(Product product) throws CatalogException {
@@ -271,7 +271,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#modifyProduct(gov.nasa.jpl
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#modifyProduct(org.apache
    * .oodt.cas.filemgr.structs.Product)
    */
   public synchronized void modifyProduct(Product product)
@@ -302,7 +302,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#removeProduct(gov.nasa.jpl
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#removeProduct(org.apache
    * .oodt.cas.filemgr.structs.Product)
    */
   public synchronized void removeProduct(Product product)
@@ -314,8 +314,8 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#setProductTransferStatus(
-   * gov.nasa.jpl.oodt.cas.filemgr.structs.Product)
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#setProductTransferStatus(
+   * org.apache.oodt.cas.filemgr.structs.Product)
    */
   public synchronized void setProductTransferStatus(Product product)
       throws CatalogException {
@@ -329,7 +329,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#addProductReferences(gov.
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#addProductReferences(gov.
    * nasa.jpl.oodt.cas.filemgr.structs.Product)
    */
   public synchronized void addProductReferences(Product product)
@@ -356,7 +356,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductById(java.lang.
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#getProductById(java.lang.
    * String)
    */
   public Product getProductById(String productId) throws CatalogException {
@@ -417,7 +417,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductByName(java.lang
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#getProductByName(java.lang
    * .String)
    */
   public Product getProductByName(String productName) throws CatalogException {
@@ -466,7 +466,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductReferences(gov.
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#getProductReferences(gov.
    * nasa.jpl.oodt.cas.filemgr.structs.Product)
    */
   public List<Reference> getProductReferences(Product product)
@@ -481,7 +481,7 @@ public class CuratorLuceneCatalog implem
   /*
    * (non-Javadoc)
    * 
-   * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProducts()
+   * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getProducts()
    */
   public List<Product> getProducts() throws CatalogException {
     return getProducts(false);
@@ -533,8 +533,8 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getProductsByProductType(
-   * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#getProductsByProductType(
+   * org.apache.oodt.cas.filemgr.structs.ProductType)
    */
   public List<Product> getProductsByProductType(ProductType type)
       throws CatalogException {
@@ -633,8 +633,8 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#query(gov.nasa.jpl.oodt.cas
-   * .filemgr.structs.Query, gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#query(org.apache.oodt.cas
+   * .filemgr.structs.Query, org.apache.oodt.cas.filemgr.structs.ProductType)
    */
   public List<String> query(Query query, ProductType type)
       throws CatalogException {
@@ -658,7 +658,7 @@ public class CuratorLuceneCatalog implem
   /*
    * (non-Javadoc)
    * 
-   * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int)
+   * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int)
    */
   public List<Product> getTopNProducts(int n) throws CatalogException {
     List<Product> products = null;
@@ -709,8 +709,8 @@ public class CuratorLuceneCatalog implem
   /*
    * (non-Javadoc)
    * 
-   * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int,
-   * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType)
+   * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getTopNProducts(int,
+   * org.apache.oodt.cas.filemgr.structs.ProductType)
    */
   public List<Product> getTopNProducts(int n, ProductType type)
       throws CatalogException {
@@ -736,7 +736,7 @@ public class CuratorLuceneCatalog implem
   /*
    * (non-Javadoc)
    * 
-   * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
+   * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
    */
   public ValidationLayer getValidationLayer() throws CatalogException {
     return valLayer;
@@ -746,7 +746,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#getNumProducts(gov.nasa.jpl
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#getNumProducts(org.apache
    * .oodt.cas.filemgr.structs.ProductType)
    */
   public int getNumProducts(ProductType type) throws CatalogException {
@@ -758,7 +758,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getFirstPage(gov.nasa.jpl
+   * org.apache.oodt.cas.filemgr.util.Pagination#getFirstPage(org.apache
    * .oodt.cas.filemgr.structs.ProductType)
    */
   public ProductPage getFirstPage(ProductType type) {
@@ -803,7 +803,7 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getLastProductPage(gov.nasa
+   * org.apache.oodt.cas.filemgr.util.Pagination#getLastProductPage(gov.nasa
    * .jpl.oodt.cas.filemgr.structs.ProductType)
    */
   public ProductPage getLastProductPage(ProductType type) {
@@ -841,9 +841,9 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getNextPage(gov.nasa.jpl.
+   * org.apache.oodt.cas.filemgr.util.Pagination#getNextPage(org.apache.
    * oodt.cas.filemgr.structs.ProductType,
-   * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage)
+   * org.apache.oodt.cas.filemgr.structs.ProductPage)
    */
   public ProductPage getNextPage(ProductType type, ProductPage currentPage) {
     if (currentPage == null) {
@@ -887,9 +887,9 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.util.Pagination#getPrevPage(gov.nasa.jpl.
+   * org.apache.oodt.cas.filemgr.util.Pagination#getPrevPage(org.apache.
    * oodt.cas.filemgr.structs.ProductType,
-   * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage)
+   * org.apache.oodt.cas.filemgr.structs.ProductPage)
    */
   public ProductPage getPrevPage(ProductType type, ProductPage currentPage) {
     if (currentPage == null) {
@@ -932,9 +932,9 @@ public class CuratorLuceneCatalog implem
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog#pagedQuery(gov.nasa.jpl.oodt
+   * org.apache.oodt.cas.filemgr.catalog.Catalog#pagedQuery(org.apache.oodt
    * .cas.filemgr.structs.Query,
-   * gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, int)
+   * org.apache.oodt.cas.filemgr.structs.ProductType, int)
    */
   public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
       throws CatalogException {

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalogFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalogFactory.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalogFactory.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/CuratorLuceneCatalogFactory.java Wed Jul  7 08:00:07 2010
@@ -16,14 +16,14 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory;
-import gov.nasa.jpl.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.catalog.CatalogFactory;
+import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
 
 /**
  * @author mattmann
@@ -59,10 +59,10 @@ public class CuratorLuceneCatalogFactory
    */
   public CuratorLuceneCatalogFactory() throws IllegalArgumentException {
     indexFilePath = System
-        .getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath");
+        .getProperty("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath");
     if (indexFilePath == null) {
       throw new IllegalArgumentException("error initializing lucene catalog: "
-          + "[gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath="
+          + "[org.apache.oodt.cas.filemgr.catalog.lucene.idxPath="
           + indexFilePath);
     }
 
@@ -71,30 +71,30 @@ public class CuratorLuceneCatalogFactory
 
     String validationLayerFactoryClass = System.getProperty(
         "filemgr.validationLayer.factory",
-        "gov.nasa.jpl.oodt.cas.validation.DataSourceValidationLayerFactory");
+        "org.apache.oodt.cas.validation.DataSourceValidationLayerFactory");
     validationLayer = GenericFileManagerObjectFactory
         .getValidationLayerFromFactory(validationLayerFactoryClass);
 
     pageSize = Integer.getInteger(
-        "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.pageSize", 20).intValue();
+        "org.apache.oodt.cas.filemgr.catalog.lucene.pageSize", 20).intValue();
 
     commitLockTimeOut = Long
         .getLong(
-            "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
+            "org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
             60).longValue();
     writeLockTimeOut = Long
         .getLong(
-            "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
+            "org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
             60).longValue();
     mergeFactor = Integer.getInteger(
-        "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20)
+        "org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20)
         .intValue();
   }
 
   /*
    * (non-Javadoc)
    * 
-   * @see gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
+   * @see org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
    */
   public Catalog createCatalog() {
     return new CuratorLuceneCatalog(indexFilePath, validationLayer, pageSize,

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/DateUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/DateUtils.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/DateUtils.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/DateUtils.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 //JDK imports
 import java.text.SimpleDateFormat;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java Wed Jul  7 08:00:07 2010
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 
-import gov.nasa.jpl.oodt.cas.curation.structs.ExtractorConfig;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.curation.structs.ExtractorConfig;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java Wed Jul  7 08:00:07 2010
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 
-import gov.nasa.jpl.oodt.cas.curation.structs.ExtractorConfig;
+import org.apache.oodt.cas.curation.structs.ExtractorConfig;
 
 import java.io.File;
 import java.io.FileNotFoundException;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/HTMLEncode.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/HTMLEncode.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/HTMLEncode.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/HTMLEncode.java Wed Jul  7 08:00:07 2010
@@ -57,7 +57,7 @@
 
 //package org.w3c.tidy.servlet.util;
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 import java.lang.reflect.Method;
 import java.net.URLEncoder;

Modified: incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java?rev=961282&r1=961256&r2=961282&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java (original)
+++ incubator/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java Wed Jul  7 08:00:07 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.curation.util;
+package org.apache.oodt.cas.curation.util;
 
 //JDK imports
 import javax.servlet.ServletContext;
@@ -24,10 +24,10 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.curation.service.CurationServiceConfig;
-import gov.nasa.jpl.oodt.cas.curation.servlet.CuratorConfMetKeys;
-import gov.nasa.jpl.oodt.cas.security.sso.AbstractWebBasedSingleSignOn;
-import gov.nasa.jpl.oodt.cas.security.sso.SingleSignOnFactory;
+import org.apache.oodt.cas.curation.service.CurationServiceConfig;
+import org.apache.oodt.cas.curation.servlet.CuratorConfMetKeys;
+import org.apache.oodt.cas.security.sso.AbstractWebBasedSingleSignOn;
+import org.apache.oodt.cas.security.sso.SingleSignOnFactory;
 
 /**
  * 



Mime
View raw message