You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ah...@apache.org on 2010/07/07 10:15:36 UTC

svn commit: r961290 [1/2] - in /incubator/oodt/trunk/pushpull/src/main/java: gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/ org/apache/oodt/cas/pushpull/config/ org/apache/oodt/cas/pushpull/daemon/ org/apache/oodt/cas/pushpull/exceptions/ org/apa...

Author: ahart
Date: Wed Jul  7 08:15:33 2010
New Revision: 961290

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

Added:
    incubator/oodt/trunk/pushpull/src/main/java/org/
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/   (props changed)
      - copied from r961256, incubator/oodt/trunk/pushpull/src/main/java/gov/nasa/jpl/oodt/
Removed:
    incubator/oodt/trunk/pushpull/src/main/java/gov/nasa/jpl/oodt/
Modified:
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DaemonInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DataFilesInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DownloadInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/SiteInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonManager.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/AlreadyInDatabaseException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ConfigException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlDaemonException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlerException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/FileRestrictionsException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MetExtractorException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MethodException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ParserException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolDeletionError.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolFileException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/PushPullFrameworkException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RemoteConnectionException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RetrievalMethodException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ThreadEvaluatorException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ToManyFailedDownloadsException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/UndefinedTypeException.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/GlobalVariables.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/MethodRepo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Operator.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Punctuation.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFileStructure.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/FileListParser.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/renamingconventions/RenamingConvention.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/objectfactory/PushPullObjectFactory.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/Protocol.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFactory.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFile.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFileFilter.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClientFactory_apache.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClient_apache.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClientFactory_cog.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClient_cog.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClientFactory_ftp4che.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClient_ftp4che.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClientFactory_jvftp.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClient_jvftp.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClientFactory.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpPath.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/imaps/ImapsClient.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/imaps/ImapsClientFactory.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/local/LocalClient.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/local/LocalClientFactory.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/sftp/j2ssh/SftpClient.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/sftp/j2ssh/SftpClientFactory.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/sftp/jsch/SftpClientFactory_jsch.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/sftp/jsch/SftpClient_jsch.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/ListRetriever.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RemoteCrawler.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalmethod/RetrievalMethod.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DataFileToPropFileLinker.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadListener.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadThreadEvaluator.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/DownloadingFileInfo.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/FileRetrievalSystem.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RemoteFile.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RemoteFileMetKeys.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/TimeAndThreadCount.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/url/handlers/imaps/Handler.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/url/handlers/imaps/ImapsURLConnection.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/url/handlers/sftp/Handler.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/url/handlers/sftp/SftpURLConnection.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/util/ExpressionValidator.java
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/util/email/InstallCert.java

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

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/Config.java Wed Jul  7 08:15:33 2010
@@ -16,14 +16,14 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ConfigException;
-import gov.nasa.jpl.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
-import gov.nasa.jpl.oodt.cas.pushpull.retrievalsystem.RemoteFileMetKeys;
-import gov.nasa.jpl.oodt.cas.filemgr.ingest.Ingester;
-import gov.nasa.jpl.oodt.cas.metadata.util.PropertiesUtils;
+import org.apache.oodt.cas.pushpull.exceptions.ConfigException;
+import org.apache.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
+import org.apache.oodt.cas.pushpull.retrievalsystem.RemoteFileMetKeys;
+import org.apache.oodt.cas.filemgr.ingest.Ingester;
+import org.apache.oodt.cas.metadata.util.PropertiesUtils;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigMetKeys.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 /**
  * @author mattmann
@@ -30,42 +30,42 @@ public interface ConfigMetKeys {
 
     public static final String STAGING_AREA_PREFIX = "Staging_Area";
 
-    public static final String EXTERNAL_PROPERTIES_FILES = "gov.nasa.jpl.oodt.cas.pushpull.config.external.properties.files";
+    public static final String EXTERNAL_PROPERTIES_FILES = "org.apache.oodt.cas.pushpull.config.external.properties.files";
 
-    public static final String PROTOCOL_FACTORY_INFO_FILES = "gov.nasa.jpl.oodt.cas.pushpull.config.protocolfactory.info.files";
+    public static final String PROTOCOL_FACTORY_INFO_FILES = "org.apache.oodt.cas.pushpull.config.protocolfactory.info.files";
 
-    public static final String PARSER_INFO_FILES = "gov.nasa.jpl.oodt.cas.pushpull.config.parser.info.files";
+    public static final String PARSER_INFO_FILES = "org.apache.oodt.cas.pushpull.config.parser.info.files";
     
-    public static final String INGESTER_CLASS = "gov.nasa.jpl.oodt.cas.filemgr.ingester";
+    public static final String INGESTER_CLASS = "org.apache.oodt.cas.filemgr.ingester";
     
-    public static final String INGESTER_DATA_TRANSFER = "gov.nasa.jpl.oodt.cas.filemgr.datatransfer.factory";
+    public static final String INGESTER_DATA_TRANSFER = "org.apache.oodt.cas.filemgr.datatransfer.factory";
     
-    public static final String INGESTER_FM_URL = "gov.nasa.jpl.oodt.cas.filemgr.url";
+    public static final String INGESTER_FM_URL = "org.apache.oodt.cas.filemgr.url";
     
     public static final String NO_FM_SPECIFIED = "N/A";
     
-    public static final String CACHE_FACTORY_CLASS = "gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.factory";
+    public static final String CACHE_FACTORY_CLASS = "org.apache.oodt.cas.filemgr.ingest.cache.factory";
 
-    public static final String TYPE_DETECTION_FILE = "gov.nasa.jpl.oodt.cas.pushpull.config.type.detection.file";
+    public static final String TYPE_DETECTION_FILE = "org.apache.oodt.cas.pushpull.config.type.detection.file";
 
-    public static final String MET_LIST_TO_PRINT = "gov.nasa.jpl.oodt.cas.pushpull.metadata.list.to.print";
+    public static final String MET_LIST_TO_PRINT = "org.apache.oodt.cas.pushpull.metadata.list.to.print";
 
-    public static final String ALLOW_ONLY_DEFINED_TYPES = "gov.nasa.jpl.oodt.cas.pushpull.allow.only.defined.types";
+    public static final String ALLOW_ONLY_DEFINED_TYPES = "org.apache.oodt.cas.pushpull.allow.only.defined.types";
 
-    public static final String USE_TRACKER = "gov.nasa.jpl.oodt.cas.pushpull.crawler.use.tracker";
+    public static final String USE_TRACKER = "org.apache.oodt.cas.pushpull.crawler.use.tracker";
 
-    public static final String FILE_RET_SYSTEM_REC_THREAD_COUNT = "gov.nasa.jpl.oodt.cas.pushpull.file.retrieval.system.recommended.thread.count";
+    public static final String FILE_RET_SYSTEM_REC_THREAD_COUNT = "org.apache.oodt.cas.pushpull.file.retrieval.system.recommended.thread.count";
 
-    public static final String FILE_RET_SYSTEM_MAX_ALLOWED_FAIL_DOWNLOADS = "gov.nasa.jpl.oodt.cas.pushpull.file.retrieval.system.max.number.allowed.failed.downloads";
+    public static final String FILE_RET_SYSTEM_MAX_ALLOWED_FAIL_DOWNLOADS = "org.apache.oodt.cas.pushpull.file.retrieval.system.max.number.allowed.failed.downloads";
 
-    public static final String MET_FILE_EXT = "gov.nasa.jpl.oodt.cas.pushpull.met.file.extension";
+    public static final String MET_FILE_EXT = "org.apache.oodt.cas.pushpull.met.file.extension";
 
-    public static final String PROTOCOL_TIMEOUT_MS = "gov.nasa.jpl.oodt.cas.pushpull.protocol.timeout.milliseconds";
+    public static final String PROTOCOL_TIMEOUT_MS = "org.apache.oodt.cas.pushpull.protocol.timeout.milliseconds";
 
-    public static final String PROTOCOL_PAGE_SIZE = "gov.nasa.jpl.oodt.cas.pushpull.protocol.page_size";
+    public static final String PROTOCOL_PAGE_SIZE = "org.apache.oodt.cas.pushpull.protocol.page_size";
 
-    public static final String DATA_FILE_BASE_STAGING_AREA = "gov.nasa.jpl.oodt.cas.pushpull.data.files.base.staging.area";
+    public static final String DATA_FILE_BASE_STAGING_AREA = "org.apache.oodt.cas.pushpull.data.files.base.staging.area";
 
-    public static final String WRITE_MET_FILE = "gov.nasa.jpl.oodt.cas.pushpull.write.met.file";
+    public static final String WRITE_MET_FILE = "org.apache.oodt.cas.pushpull.write.met.file";
     
 }

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DaemonInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DaemonInfo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DaemonInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DaemonInfo.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //JDK imports
 import java.text.ParseException;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DataFilesInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DataFilesInfo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DataFilesInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DataFilesInfo.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DownloadInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DownloadInfo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DownloadInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/DownloadInfo.java Wed Jul  7 08:15:33 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.RemoteSite;
+import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //JDK imports
 import java.io.File;
@@ -29,11 +29,11 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ConfigException;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.Parser;
-import gov.nasa.jpl.oodt.cas.pushpull.retrievalmethod.RetrievalMethod;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.pushpull.exceptions.ConfigException;
+import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
+import org.apache.oodt.cas.pushpull.retrievalmethod.RetrievalMethod;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java Wed Jul  7 08:15:33 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.Parser;
+import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java Wed Jul  7 08:15:33 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ConfigException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFactory;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.pushpull.exceptions.ConfigException;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java Wed Jul  7 08:15:33 2010
@@ -16,16 +16,16 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ConfigException;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.Parser;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.renamingconventions.RenamingConvention;
-import gov.nasa.jpl.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.RemoteSite;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.pushpull.exceptions.ConfigException;
+import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
+import org.apache.oodt.cas.pushpull.filerestrictions.renamingconventions.RenamingConvention;
+import org.apache.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
+import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/SiteInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/SiteInfo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/SiteInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/SiteInfo.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.config;
+package org.apache.oodt.cas.pushpull.config;
 
 //JDK imports
 import java.net.URL;
@@ -26,7 +26,7 @@ import java.util.Set;
 import java.util.Map.Entry;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.RemoteSite;
+import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/Daemon.java Wed Jul  7 08:15:33 2010
@@ -16,16 +16,16 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.config.Config;
-import gov.nasa.jpl.oodt.cas.pushpull.config.DaemonInfo;
-import gov.nasa.jpl.oodt.cas.pushpull.config.SiteInfo;
-import gov.nasa.jpl.oodt.cas.pushpull.daemon.DaemonMBean;
-import gov.nasa.jpl.oodt.cas.pushpull.daemon.DaemonRmiInterface;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.RemoteSite;
-import gov.nasa.jpl.oodt.cas.pushpull.retrievalsystem.RetrievalSetup;
+import org.apache.oodt.cas.pushpull.config.Config;
+import org.apache.oodt.cas.pushpull.config.DaemonInfo;
+import org.apache.oodt.cas.pushpull.config.SiteInfo;
+import org.apache.oodt.cas.pushpull.daemon.DaemonMBean;
+import org.apache.oodt.cas.pushpull.daemon.DaemonRmiInterface;
+import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
+import org.apache.oodt.cas.pushpull.retrievalsystem.RetrievalSetup;
 
 //JDK imports
 import java.io.File;
@@ -143,7 +143,7 @@ public class Daemon extends UnicastRemot
             // registry CrawlDaemon as MBean so it can be used with jconsole
             mbs = ManagementFactory.getPlatformMBeanServer();
             ObjectName name = new ObjectName(
-                    "gov.nasa.jpl.oodt.cas.pushpull.daemon:type=Daemon"
+                    "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
                             + this.getDaemonID());
             mbs.registerMBean(this, name);
         } catch (Exception e) {
@@ -249,7 +249,7 @@ public class Daemon extends UnicastRemot
             Naming.unbind("//localhost:" + this.rmiRegPort + "/daemon"
                     + this.getDaemonID());
             this.mbs.unregisterMBean(new ObjectName(
-                    "gov.nasa.jpl.oodt.cas.pushpull.daemon:type=Daemon"
+                    "org.apache.oodt.cas.pushpull.daemon:type=Daemon"
                             + this.getDaemonID()));
             UnicastRemoteObject.unexportObject(this, true);
             this.daemonListener.wasUnregisteredWith(this);
@@ -558,7 +558,7 @@ public class Daemon extends UnicastRemot
                 // registry CrawlDaemon as MBean so it can be used with jconsole
                 MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
                 ObjectName name = new ObjectName(
-                        "gov.nasa.jpl.oodt.cas.pushpull.daemon:type=Daemon");
+                        "org.apache.oodt.cas.pushpull.daemon:type=Daemon");
             } catch (Exception e) {
                 LOG.log(Level.SEVERE,
                         "Failed to register CrawlDaemon as a MBean Object : "

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonController.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 //JDK imports
 import java.rmi.Naming;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncher.java Wed Jul  7 08:15:33 2010
@@ -16,12 +16,12 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.config.Config;
-import gov.nasa.jpl.oodt.cas.pushpull.config.DaemonInfo;
-import gov.nasa.jpl.oodt.cas.pushpull.config.RemoteSpecs;
+import org.apache.oodt.cas.pushpull.config.Config;
+import org.apache.oodt.cas.pushpull.config.DaemonInfo;
+import org.apache.oodt.cas.pushpull.config.RemoteSpecs;
 
 //JDK imports
 import java.io.File;
@@ -83,7 +83,7 @@ public class DaemonLauncher implements D
             LocateRegistry.createRegistry(this.rmiRegistryPort);
             mbs = ManagementFactory.getPlatformMBeanServer();
             ObjectName name = new ObjectName(
-                    "gov.nasa.jpl.oodt.cas.pushpull.daemon:type=DaemonLauncher"
+                    "org.apache.oodt.cas.pushpull.daemon:type=DaemonLauncher"
                             + this.rmiRegistryPort);
             mbs.registerMBean(this, name);
         } catch (Exception e) {

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonLauncherMBean.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonListener.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonMBean.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonManager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonManager.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonManager.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonManager.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 //JDK imports
 import java.util.HashSet;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/daemon/DaemonRmiInterface.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.daemon;
+package org.apache.oodt.cas.pushpull.daemon;
 
 //JDK imports
 import java.rmi.Remote;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/AlreadyInDatabaseException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/AlreadyInDatabaseException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/AlreadyInDatabaseException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/AlreadyInDatabaseException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ConfigException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ConfigException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ConfigException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ConfigException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlDaemonException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlDaemonException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlDaemonException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlDaemonException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlerException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlerException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlerException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/CrawlerException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/FileRestrictionsException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/FileRestrictionsException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/FileRestrictionsException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/FileRestrictionsException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MetExtractorException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MetExtractorException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MetExtractorException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MetExtractorException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MethodException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MethodException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MethodException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/MethodException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ParserException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ParserException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ParserException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ParserException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolDeletionError.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolDeletionError.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolDeletionError.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolDeletionError.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolFileException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolFileException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolFileException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ProtocolFileException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/PushPullFrameworkException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/PushPullFrameworkException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/PushPullFrameworkException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/PushPullFrameworkException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RemoteConnectionException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RemoteConnectionException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RemoteConnectionException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RemoteConnectionException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RetrievalMethodException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RetrievalMethodException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RetrievalMethodException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/RetrievalMethodException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ThreadEvaluatorException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ThreadEvaluatorException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ThreadEvaluatorException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ThreadEvaluatorException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ToManyFailedDownloadsException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ToManyFailedDownloadsException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ToManyFailedDownloadsException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/ToManyFailedDownloadsException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/UndefinedTypeException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/UndefinedTypeException.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/UndefinedTypeException.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/exceptions/UndefinedTypeException.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.exceptions;
+package org.apache.oodt.cas.pushpull.exceptions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/GlobalVariables.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/GlobalVariables.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/GlobalVariables.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/GlobalVariables.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.expressions;
+package org.apache.oodt.cas.pushpull.expressions;
 
 //JDK imports
 import java.util.HashMap;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Method.java Wed Jul  7 08:15:33 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.expressions;
+package org.apache.oodt.cas.pushpull.expressions;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.MethodException;
+import org.apache.oodt.cas.pushpull.exceptions.MethodException;
 
 //JDK imports
 import java.util.LinkedList;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/MethodRepo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/MethodRepo.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/MethodRepo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/MethodRepo.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.expressions;
+package org.apache.oodt.cas.pushpull.expressions;
 
 //JDK imports
 import java.util.HashMap;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Operator.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Operator.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Operator.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Operator.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.expressions;
+package org.apache.oodt.cas.pushpull.expressions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Punctuation.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Punctuation.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Punctuation.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Punctuation.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.expressions;
+package org.apache.oodt.cas.pushpull.expressions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/ValidInput.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.expressions;
+package org.apache.oodt.cas.pushpull.expressions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/expressions/Variable.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.expressions;
+package org.apache.oodt.cas.pushpull.expressions;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/FileRestrictions.java Wed Jul  7 08:15:33 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions;
+package org.apache.oodt.cas.pushpull.filerestrictions;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolPath;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
 
 //JDK imports
 import java.io.InputStream;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/Parser.java Wed Jul  7 08:15:33 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions;
+package org.apache.oodt.cas.pushpull.filerestrictions;
 
 //JDK imports
 import java.io.FileInputStream;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ParserException;
+import org.apache.oodt.cas.pushpull.exceptions.ParserException;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFile.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions;
+package org.apache.oodt.cas.pushpull.filerestrictions;
 
 //JDK imports
 import java.util.LinkedList;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFileStructure.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFileStructure.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFileStructure.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/VirtualFileStructure.java Wed Jul  7 08:15:33 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions;
+package org.apache.oodt.cas.pushpull.filerestrictions;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.RemoteSite;
+import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/ClassNoaaEmailParser.java Wed Jul  7 08:15:33 2010
@@ -16,14 +16,14 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers;
+package org.apache.oodt.cas.pushpull.filerestrictions.parsers;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.Parser;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.VirtualFile;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.VirtualFileStructure;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.RemoteSite;
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ParserException;
+import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
+import org.apache.oodt.cas.pushpull.filerestrictions.VirtualFile;
+import org.apache.oodt.cas.pushpull.filerestrictions.VirtualFileStructure;
+import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
+import org.apache.oodt.cas.pushpull.exceptions.ParserException;
 
 //JDK imports
 import java.io.FileInputStream;
@@ -104,7 +104,7 @@ public class ClassNoaaEmailParser implem
 
     private boolean validEmail(String email) {
         String[] containsStrings = (System.getProperties()
-                .getProperty("gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.class.noaa.email.parser.contains.exprs")
+                .getProperty("org.apache.oodt.cas.pushpull.filerestrictions.parsers.class.noaa.email.parser.contains.exprs")
                 + ",").split(",");
         for (String containsString : containsStrings)
             if (!email.contains(containsString))

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java Wed Jul  7 08:15:33 2010
@@ -16,18 +16,18 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers;
+package org.apache.oodt.cas.pushpull.filerestrictions.parsers;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.Parser;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.VirtualFile;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.VirtualFileStructure;
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ParserException;
-import gov.nasa.jpl.oodt.cas.pushpull.expressions.GlobalVariables;
-import gov.nasa.jpl.oodt.cas.pushpull.expressions.Method;
-import gov.nasa.jpl.oodt.cas.pushpull.expressions.MethodRepo;
-import gov.nasa.jpl.oodt.cas.pushpull.expressions.Variable;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
+import org.apache.oodt.cas.pushpull.filerestrictions.VirtualFile;
+import org.apache.oodt.cas.pushpull.filerestrictions.VirtualFileStructure;
+import org.apache.oodt.cas.pushpull.exceptions.ParserException;
+import org.apache.oodt.cas.pushpull.expressions.GlobalVariables;
+import org.apache.oodt.cas.pushpull.expressions.Method;
+import org.apache.oodt.cas.pushpull.expressions.MethodRepo;
+import org.apache.oodt.cas.pushpull.expressions.Variable;
 
 //JDK imports
 import java.io.FileInputStream;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/FileListParser.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/FileListParser.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/FileListParser.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/FileListParser.java Wed Jul  7 08:15:33 2010
@@ -16,17 +16,17 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers;
+package org.apache.oodt.cas.pushpull.filerestrictions.parsers;
 
 //JDK imports
 import java.io.FileInputStream;
 import java.util.Scanner;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ParserException;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.Parser;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.VirtualFile;
-import gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.VirtualFileStructure;
+import org.apache.oodt.cas.pushpull.exceptions.ParserException;
+import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
+import org.apache.oodt.cas.pushpull.filerestrictions.VirtualFile;
+import org.apache.oodt.cas.pushpull.filerestrictions.VirtualFileStructure;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/renamingconventions/RenamingConvention.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/renamingconventions/RenamingConvention.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/renamingconventions/RenamingConvention.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/renamingconventions/RenamingConvention.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.renamingconventions;
+package org.apache.oodt.cas.pushpull.filerestrictions.renamingconventions;
 
 //OODT imports
 import java.util.logging.Level;
@@ -24,8 +24,8 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/objectfactory/PushPullObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/objectfactory/PushPullObjectFactory.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/objectfactory/PushPullObjectFactory.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/objectfactory/PushPullObjectFactory.java Wed Jul  7 08:15:33 2010
@@ -16,12 +16,12 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.objectfactory;
+package org.apache.oodt.cas.pushpull.objectfactory;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.ingest.Cache;
-import gov.nasa.jpl.oodt.cas.filemgr.ingest.CacheFactory;
-import gov.nasa.jpl.oodt.cas.filemgr.ingest.Ingester;
+import org.apache.oodt.cas.filemgr.ingest.Cache;
+import org.apache.oodt.cas.filemgr.ingest.CacheFactory;
+import org.apache.oodt.cas.filemgr.ingest.Ingester;
 
 //JDK imports
 import java.lang.reflect.InvocationTargetException;
@@ -57,7 +57,7 @@ public class PushPullObjectFactory {
             IllegalArgumentException, SecurityException,
             InvocationTargetException, NoSuchMethodException {
         String dataTransferFactory = System
-                .getProperty("gov.nasa.jpl.oodt.cas.filemgr.datatransfer.factory");
+                .getProperty("org.apache.oodt.cas.filemgr.datatransfer.factory");
         System.out.println("TRANSFER: " + dataTransferFactory);
         if (cacheFactoryClass == null || cacheFactoryClass.equals("")) {
             return (Ingester) Class.forName(ingesterClass).getConstructor(

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/Protocol.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/Protocol.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/Protocol.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/Protocol.java Wed Jul  7 08:15:33 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol;
+package org.apache.oodt.cas.pushpull.protocol;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ProtocolException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.pushpull.exceptions.ProtocolException;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFactory.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFactory.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFactory.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol;
+package org.apache.oodt.cas.pushpull.protocol;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFile.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFile.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFile.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFile.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol;
+package org.apache.oodt.cas.pushpull.protocol;
 
 //JDK imports
 import java.net.MalformedURLException;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFileFilter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFileFilter.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFileFilter.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolFileFilter.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol;
+package org.apache.oodt.cas.pushpull.protocol;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java Wed Jul  7 08:15:33 2010
@@ -16,15 +16,15 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol;
+package org.apache.oodt.cas.pushpull.protocol;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.config.ProtocolInfo;
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ProtocolException;
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.RemoteConnectionException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFactory;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.pushpull.config.ProtocolInfo;
+import org.apache.oodt.cas.pushpull.exceptions.ProtocolException;
+import org.apache.oodt.cas.pushpull.exceptions.RemoteConnectionException;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolPath.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol;
+package org.apache.oodt.cas.pushpull.protocol;
 
 //JDK imports
 import java.io.Serializable;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/RemoteSite.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol;
+package org.apache.oodt.cas.pushpull.protocol;
 
 //JDK imports
 import java.net.URL;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClientFactory_apache.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClientFactory_apache.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClientFactory_apache.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClientFactory_apache.java Wed Jul  7 08:15:33 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.apache;
+package org.apache.oodt.cas.pushpull.protocol.ftp.apache;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFactory;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClient_apache.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClient_apache.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClient_apache.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/apache/FtpClient_apache.java Wed Jul  7 08:15:33 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.apache;
+package org.apache.oodt.cas.pushpull.protocol.ftp.apache;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ProtocolException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolPath;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.pushpull.exceptions.ProtocolException;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClientFactory_cog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClientFactory_cog.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClientFactory_cog.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClientFactory_cog.java Wed Jul  7 08:15:33 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.cog;
+package org.apache.oodt.cas.pushpull.protocol.ftp.cog;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFactory;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClient_cog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClient_cog.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClient_cog.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/cog/FtpClient_cog.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.cog;
+package org.apache.oodt.cas.pushpull.protocol.ftp.cog;
 
 //JDK imports
 import java.io.File;
@@ -28,10 +28,10 @@ import org.globus.ftp.FTPClient;
 import org.globus.ftp.FileInfo;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ProtocolException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolPath;
+import org.apache.oodt.cas.pushpull.exceptions.ProtocolException;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClientFactory_ftp4che.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClientFactory_ftp4che.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClientFactory_ftp4che.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClientFactory_ftp4che.java Wed Jul  7 08:15:33 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.ftp4che;
+package org.apache.oodt.cas.pushpull.protocol.ftp.ftp4che;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFactory;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClient_ftp4che.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClient_ftp4che.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClient_ftp4che.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/ftp4che/FtpClient_ftp4che.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.ftp4che;
+package org.apache.oodt.cas.pushpull.protocol.ftp.ftp4che;
 
 //JDK imports
 import java.io.File;
@@ -29,10 +29,10 @@ import org.ftp4che.FTPConnectionFactory;
 import org.ftp4che.util.ftpfile.FTPFile;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ProtocolException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolPath;
+import org.apache.oodt.cas.pushpull.exceptions.ProtocolException;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClientFactory_jvftp.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClientFactory_jvftp.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClientFactory_jvftp.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClientFactory_jvftp.java Wed Jul  7 08:15:33 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.jvftp;
+package org.apache.oodt.cas.pushpull.protocol.ftp.jvftp;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFactory;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClient_jvftp.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClient_jvftp.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClient_jvftp.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ftp/jvftp/FtpClient_jvftp.java Wed Jul  7 08:15:33 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.jvftp;
+package org.apache.oodt.cas.pushpull.protocol.ftp.jvftp;
 
 //JDK imports
 import java.io.File;
@@ -31,10 +31,10 @@ import cz.dhl.io.CoLoad;
 import cz.dhl.io.LocalFile;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ProtocolException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolPath;
+import org.apache.oodt.cas.pushpull.exceptions.ProtocolException;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java Wed Jul  7 08:15:33 2010
@@ -16,14 +16,14 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.http;
+package org.apache.oodt.cas.pushpull.protocol.http;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.exceptions.ProtocolException;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFile;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolPath;
-import gov.nasa.jpl.oodt.cas.metadata.util.MimeTypeUtils;
+import org.apache.oodt.cas.pushpull.exceptions.ProtocolException;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFile;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
+import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
 
 //JDK imports
 import java.io.BufferedOutputStream;

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClientFactory.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClientFactory.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClientFactory.java Wed Jul  7 08:15:33 2010
@@ -16,12 +16,12 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.http;
+package org.apache.oodt.cas.pushpull.protocol.http;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.Protocol;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolFactory;
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.http.HttpClient;
+import org.apache.oodt.cas.pushpull.protocol.Protocol;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
+import org.apache.oodt.cas.pushpull.protocol.http.HttpClient;
 
 /**
  * 

Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpPath.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpPath.java?rev=961290&r1=961256&r2=961290&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpPath.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpPath.java Wed Jul  7 08:15:33 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.pushpull.protocol.http;
+package org.apache.oodt.cas.pushpull.protocol.http;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.pushpull.protocol.ProtocolPath;
+import org.apache.oodt.cas.pushpull.protocol.ProtocolPath;
 
 //JDK imports
 import java.net.MalformedURLException;