incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ah...@apache.org
Subject svn commit: r961285 - in /incubator/oodt/trunk/metadata/src/main/java: gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/ org/apache/oodt/cas/metadata/ org/apache/oodt/cas/metadata/exceptions/ org/apache/oodt/cas/metadata/extractors/ org/apache/oodt/...
Date Wed, 07 Jul 2010 08:04:49 GMT
Author: ahart
Date: Wed Jul  7 08:04:48 2010
New Revision: 961285

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

Added:
    incubator/oodt/trunk/metadata/src/main/java/org/
    incubator/oodt/trunk/metadata/src/main/java/org/apache/
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/   (props changed)
      - copied from r961256, incubator/oodt/trunk/metadata/src/main/java/gov/nasa/jpl/oodt/
Removed:
    incubator/oodt/trunk/metadata/src/main/java/gov/nasa/jpl/oodt/
Modified:
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/AbstractMetExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfig.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/MetExtractionException.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/MetExtractorConfigReaderException.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfig.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfigReader.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfig.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfigReader.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/FileSizeComparator.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
    incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PropertiesUtils.java

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

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/AbstractMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/AbstractMetExtractor.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/AbstractMetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/AbstractMetExtractor.java Wed Jul  7 08:04:48 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata;
+package org.apache.oodt.cas.metadata;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
 
 //JDK imports
 import java.io.File;
@@ -65,7 +65,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File)
      */
     public Metadata extractMetadata(File f) throws MetExtractionException {
         if (f == null || !f.exists())
@@ -76,7 +76,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#extractMetadata(java.lang.String)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#extractMetadata(java.lang.String)
      */
     public Metadata extractMetadata(String filePath)
             throws MetExtractionException {
@@ -86,7 +86,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#extractMetadata(java.net.URL)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#extractMetadata(java.net.URL)
      */
     public Metadata extractMetadata(URL fileUrl) throws MetExtractionException {
         try {
@@ -101,7 +101,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File,
+     * @see org.apache.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File,
      *      java.io.File)
      */
     public Metadata extractMetadata(File f, File configFile)
@@ -113,7 +113,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File,
+     * @see org.apache.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File,
      *      java.lang.String)
      */
     public Metadata extractMetadata(File f, String configFilePath)
@@ -124,8 +124,8 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File,
-     *      gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#extractMetadata(java.io.File,
+     *      org.apache.oodt.cas.metadata.MetExtractorConfig)
      */
     public Metadata extractMetadata(File f, MetExtractorConfig config)
             throws MetExtractionException {
@@ -136,8 +136,8 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#extractMetadata(java.net.URL,
-     *      gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#extractMetadata(java.net.URL,
+     *      org.apache.oodt.cas.metadata.MetExtractorConfig)
      */
     public Metadata extractMetadata(URL fileUrl, MetExtractorConfig config)
             throws MetExtractionException {
@@ -148,7 +148,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#setConfigFile(java.io.File)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#setConfigFile(java.io.File)
      */
     public void setConfigFile(File f) throws MetExtractionException {
         try {
@@ -163,7 +163,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#setConfigFile(gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#setConfigFile(org.apache.oodt.cas.metadata.MetExtractorConfig)
      */
     public void setConfigFile(MetExtractorConfig config) {
         this.config = config;
@@ -172,7 +172,7 @@ public abstract class AbstractMetExtract
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractor#setConfigFile(java.lang.String)
+     * @see org.apache.oodt.cas.metadata.MetExtractor#setConfigFile(java.lang.String)
      */
     public void setConfigFile(String filePath) throws MetExtractionException {
         setConfigFile(new File(filePath));

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractor.java Wed Jul  7 08:04:48 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata;
+package org.apache.oodt.cas.metadata;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
 
 //JDK imports
 import java.io.File;

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

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/MetExtractorConfigReader.java Wed Jul  7 08:04:48 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata;
+package org.apache.oodt.cas.metadata;
 
 //JDK imports
 import java.io.File;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata;
+package org.apache.oodt.cas.metadata;
 
 //JDK imports
 import java.util.Iterator;
@@ -38,7 +38,7 @@ import java.io.UnsupportedEncodingExcept
 import java.io.InputStream;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
 
 /**
  * @author mattmann
@@ -376,7 +376,7 @@ public class Metadata {
     /**
      * @deprecated
      * <p>
-     * @see gov.nasa.jpl.oodt.cas.metadata.SerializableMetadata for new toXML usage.
+     * @see org.apache.oodt.cas.metadata.SerializableMetadata for new toXML usage.
      * Returns an XML representation of this Metadata as an
      * <code>org.w3c.Document</code>.
      * </p>

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java Wed Jul  7 08:04:48 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata;
+package org.apache.oodt.cas.metadata;
 
 //JDK imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -86,7 +86,7 @@ public class SerializableMetadata extend
     /**
      * @deprecated
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.Metadata#init(java.io.InputStream)
+     * @see org.apache.oodt.cas.metadata.Metadata#init(java.io.InputStream)
      */
     public SerializableMetadata(InputStream is, String xmlEncoding,
             boolean useCDATA) throws Exception {

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/MetExtractionException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/MetExtractionException.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/MetExtractionException.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/MetExtractionException.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.exceptions;
+package org.apache.oodt.cas.metadata.exceptions;
 
 /**
  * @author mattmann

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

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/exceptions/PreconditionComparatorException.java Wed Jul  7 08:04:48 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.exceptions;
+package org.apache.oodt.cas.metadata.exceptions;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.preconditions.PreConditionComparator; //for javadoc
+import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; //for javadoc
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
@@ -27,11 +27,11 @@ import java.util.Properties;
 import java.util.logging.Level;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.AbstractMetExtractor;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.commons.exec.EnvUtilities;
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.metadata.AbstractMetExtractor;
+import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.commons.exec.EnvUtilities;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java Wed Jul  7 08:04:48 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.util.Properties;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java Wed Jul  7 08:04:48 2010
@@ -16,15 +16,15 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
 
 /**
  * 
@@ -40,7 +40,7 @@ public class CopyAndRewriteConfigReader 
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile(java.io.File)
+     * @see org.apache.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile(java.io.File)
      */
     public MetExtractorConfig parseConfigFile(File configFile)
             throws MetExtractorConfigReaderException {

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java Wed Jul  7 08:04:48 2010
@@ -16,17 +16,17 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
 import java.util.logging.Level;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
-import gov.nasa.jpl.oodt.cas.metadata.extractors.CmdLineMetExtractor;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.extractors.CmdLineMetExtractor;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 /**
  * @author mattmann
@@ -69,7 +69,7 @@ public class CopyAndRewriteExtractor ext
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.AbstractMetExtractor#extractMetadata(java.io.File)
+     * @see org.apache.oodt.cas.metadata.AbstractMetExtractor#extractMetadata(java.io.File)
      */
     public Metadata extrMetadata(File file) throws MetExtractionException {
         if (this.config == null) {

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java Wed Jul  7 08:04:48 2010
@@ -16,14 +16,14 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
 
 //JDK imports
 import java.io.File;
@@ -48,7 +48,7 @@ public final class ExternConfigReader im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile(java.io.File)
+     * @see org.apache.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile(java.io.File)
      */
     public MetExtractorConfig parseConfigFile(File file)
             throws MetExtractorConfigReaderException {

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
@@ -31,11 +31,11 @@ import java.util.logging.Level;
 import org.apache.commons.lang.StringUtils;
 
 //OODT imports
-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.extractors.CmdLineMetExtractor;
-import gov.nasa.jpl.oodt.cas.commons.exec.ExecUtils;
+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.extractors.CmdLineMetExtractor;
+import org.apache.oodt.cas.commons.exec.ExecUtils;
 
 /**
  * @author mattmann
@@ -59,7 +59,7 @@ public class ExternMetExtractor extends 
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.AbstractMetExtractor#extractMetadata(java.io.File)
+     * @see org.apache.oodt.cas.metadata.AbstractMetExtractor#extractMetadata(java.io.File)
      */
     public Metadata extrMetadata(File file) throws MetExtractionException {
 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 /**
  * @author bfoster

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java Wed Jul  7 08:04:48 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfig.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfig.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfig.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfig.java Wed Jul  7 08:04:48 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
-import gov.nasa.jpl.oodt.pcs.input.PGEConfigurationFile;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.pcs.input.PGEConfigurationFile;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfigReader.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfigReader.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenConfigReader.java Wed Jul  7 08:04:48 2010
@@ -16,18 +16,18 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
 import java.io.FileInputStream;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
-import gov.nasa.jpl.oodt.pcs.input.PGEConfigFileReader;
-import gov.nasa.jpl.oodt.pcs.input.PGEConfigurationFile;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
+import org.apache.oodt.pcs.input.PGEConfigFileReader;
+import org.apache.oodt.pcs.input.PGEConfigurationFile;
 
 /**
  * 
@@ -43,7 +43,7 @@ public class FilenameTokenConfigReader i
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile
+   * org.apache.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile
    * (java.io.File)
    */
   public MetExtractorConfig parseConfigFile(File file)

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenExtractorMetKeys.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/FilenameTokenMetExtractor.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
@@ -24,14 +24,14 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
-import gov.nasa.jpl.oodt.cas.metadata.extractors.CmdLineMetExtractor;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.pcs.input.PGEConfigurationFile;
-import gov.nasa.jpl.oodt.pcs.input.PGEGroup;
-import gov.nasa.jpl.oodt.pcs.input.PGEScalar;
-import gov.nasa.jpl.oodt.pcs.input.PGEVector;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.extractors.CmdLineMetExtractor;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.pcs.input.PGEConfigurationFile;
+import org.apache.oodt.pcs.input.PGEGroup;
+import org.apache.oodt.pcs.input.PGEScalar;
+import org.apache.oodt.pcs.input.PGEVector;
 
 /**
  * 
@@ -60,7 +60,7 @@ public class FilenameTokenMetExtractor e
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.metadata.AbstractMetExtractor#extrMetadata(java.io
+   * org.apache.oodt.cas.metadata.AbstractMetExtractor#extrMetadata(java.io
    * .File)
    */
   @Override

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfig.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfig.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfig.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfig.java Wed Jul  7 08:04:48 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.util.Properties;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfigReader.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfigReader.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderConfigReader.java Wed Jul  7 08:04:48 2010
@@ -16,16 +16,16 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
 import java.io.FileInputStream;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfig;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
+import org.apache.oodt.cas.metadata.MetExtractorConfig;
+import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
 
 /**
  * 
@@ -41,7 +41,7 @@ public class MetReaderConfigReader imple
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see gov.nasa.jpl.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile(java.io.File)
+	 * @see org.apache.oodt.cas.metadata.MetExtractorConfigReader#parseConfigFile(java.io.File)
 	 */
 	public MetExtractorConfig parseConfigFile(File configFile)
 			throws MetExtractorConfigReaderException {

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/MetReaderExtractor.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
 
 //JDK imports
 import java.io.File;
@@ -24,10 +24,10 @@ import java.io.FileInputStream;
 import java.util.logging.Level;
 
 //OODT imports
-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.extractors.CmdLineMetExtractor;
+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.extractors.CmdLineMetExtractor;
 
 /**
  * @author mattmann
@@ -71,7 +71,7 @@ public class MetReaderExtractor extends 
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.metadata.AbstractMetExtractor#extractMetadata(java.io.File)
+     * @see org.apache.oodt.cas.metadata.AbstractMetExtractor#extractMetadata(java.io.File)
      */
     public Metadata extrMetadata(File file) throws MetExtractionException {
         // don't really need conf file, we're assuming that there is an existing
@@ -81,7 +81,7 @@ public class MetReaderExtractor extends 
     	if (this.config != null)
     		extension = ((MetReaderConfig) this.config)
 				.getProperty(
-						"gov.nasa.jpl.oodt.cas.metadata.extractors.MetReader.metFileExt",
+						"org.apache.oodt.cas.metadata.extractors.MetReader.metFileExt",
 						this.metFileExt);
         String metFileFullPath = file.getAbsolutePath() + "." + extension;
     	LOG.log(Level.INFO, "Reading metadata from " + metFileFullPath);

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java Wed Jul  7 08:04:48 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.preconditions;
+package org.apache.oodt.cas.metadata.preconditions;
 
 //JDK imports
 import java.io.File;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.PreconditionComparatorException;
+import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/FileSizeComparator.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/FileSizeComparator.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/FileSizeComparator.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/FileSizeComparator.java Wed Jul  7 08:04:48 2010
@@ -16,13 +16,13 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.preconditions;
+package org.apache.oodt.cas.metadata.preconditions;
 
 //JDK imports
 import java.io.File;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.PreconditionComparatorException;
+import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/MimeTypeComparator.java Wed Jul  7 08:04:48 2010
@@ -16,15 +16,15 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.preconditions;
+package org.apache.oodt.cas.metadata.preconditions;
 
 //JDK imports
 import java.io.File;
 import java.io.FileInputStream;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.PreconditionComparatorException;
-import gov.nasa.jpl.oodt.cas.metadata.util.MimeTypeUtils;
+import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
+import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.preconditions;
+package org.apache.oodt.cas.metadata.preconditions;
 
 //JDK imports
 import java.io.File;
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.springframework.context.ApplicationContext;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractor; // for javadoc
+import org.apache.oodt.cas.metadata.MetExtractor; // for javadoc
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java Wed Jul  7 08:04:48 2010
@@ -16,17 +16,17 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.preconditions;
+package org.apache.oodt.cas.metadata.preconditions;
 
 //JDK imports
 import java.io.File;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.commons.spring.SpringSetIdInjectionType;
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractor;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.PreconditionComparatorException;
-import static gov.nasa.jpl.oodt.cas.metadata.preconditions.PreConditionOperatorMetKeys.*;
+import org.apache.oodt.cas.commons.spring.SpringSetIdInjectionType;
+import org.apache.oodt.cas.metadata.MetExtractor;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
+import static org.apache.oodt.cas.metadata.preconditions.PreConditionOperatorMetKeys.*;
 
 //Spring imports
 import org.springframework.beans.factory.annotation.Required;

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.preconditions;
+package org.apache.oodt.cas.metadata.preconditions;
 
 /**
  * 

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/GenericMetadataObjectFactory.java Wed Jul  7 08:04:48 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.util;
+package org.apache.oodt.cas.metadata.util;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractor;
+import org.apache.oodt.cas.metadata.MetExtractor;
 
 //JDK imports
 import java.util.logging.Level;

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.util;
+package org.apache.oodt.cas.metadata.util;
 
 //JDK imports
 import java.io.File;
@@ -56,7 +56,7 @@ public final class MimeTypeUtils {
     private boolean mimeMagic;
 
     /* static resource path for the mimeTypesFile */
-    public final static String MIME_FILE_RES_PATH = "/gov/nasa/jpl/oodt/cas/metadata/preconditions/tika-mimetypes.xml";
+    public final static String MIME_FILE_RES_PATH = "/org.apache/oodt/cas/metadata/preconditions/tika-mimetypes.xml";
 
     /* our log stream */
     private static final Logger LOG = Logger.getLogger(MimeTypeUtils.class

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java Wed Jul  7 08:04:48 2010
@@ -18,7 +18,7 @@
 
 //$Id$
 
-package gov.nasa.jpl.oodt.cas.metadata.util;
+package org.apache.oodt.cas.metadata.util;
 
 //JDK imports
 import java.text.SimpleDateFormat;
@@ -33,9 +33,9 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang.StringUtils;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.commons.date.DateUtils;
-import gov.nasa.jpl.oodt.cas.commons.exec.EnvUtilities;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.commons.date.DateUtils;
+import org.apache.oodt.cas.commons.exec.EnvUtilities;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PropertiesUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PropertiesUtils.java?rev=961285&r1=961256&r2=961285&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PropertiesUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PropertiesUtils.java Wed Jul  7 08:04:48 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.metadata.util;
+package org.apache.oodt.cas.metadata.util;
 
 //JDK imports
 import java.util.StringTokenizer;



Mime
View raw message