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 09:51:54 UTC
svn commit: r961279 [3/3] - in /incubator/oodt/trunk/catalog/src/main/java:
gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/
org/apache/oodt/cas/catalog/exception/ org/apache/oodt/cas/catalog/mapping/
org/apache/oodt/cas/catalog/metadata/ org/apach...
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java Wed Jul 7 07:51:51 2010
@@ -15,34 +15,34 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.system.impl;
+package org.apache.oodt.cas.catalog.system.impl;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogDictionaryException;
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogException;
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogIndexException;
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.mapping.IngestMapper;
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-import gov.nasa.jpl.oodt.cas.catalog.page.CatalogReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.page.Page;
-import gov.nasa.jpl.oodt.cas.catalog.page.PageInfo;
-import gov.nasa.jpl.oodt.cas.catalog.page.ProcessedPageInfo;
-import gov.nasa.jpl.oodt.cas.catalog.page.QueryPager;
-import gov.nasa.jpl.oodt.cas.catalog.page.TransactionReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryLogicalGroup;
-import gov.nasa.jpl.oodt.cas.catalog.query.WrapperQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository;
-import gov.nasa.jpl.oodt.cas.catalog.struct.Dictionary;
-import gov.nasa.jpl.oodt.cas.catalog.struct.Index;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.system.CatalogService;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
-import gov.nasa.jpl.oodt.cas.catalog.util.QueryUtils;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
+import org.apache.oodt.cas.catalog.exception.CatalogException;
+import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
+import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
+import org.apache.oodt.cas.catalog.mapping.IngestMapper;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.page.CatalogReceipt;
+import org.apache.oodt.cas.catalog.page.Page;
+import org.apache.oodt.cas.catalog.page.PageInfo;
+import org.apache.oodt.cas.catalog.page.ProcessedPageInfo;
+import org.apache.oodt.cas.catalog.page.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
+import org.apache.oodt.cas.catalog.query.WrapperQueryExpression;
+import org.apache.oodt.cas.catalog.repository.CatalogRepository;
+import org.apache.oodt.cas.catalog.struct.Dictionary;
+import org.apache.oodt.cas.catalog.struct.Index;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.system.CatalogService;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.catalog.util.QueryUtils;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocalFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocalFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocalFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocalFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.system.impl;
+package org.apache.oodt.cas.catalog.system.impl;
//JDK imports
import java.io.File;
@@ -26,10 +26,10 @@ import java.util.logging.Logger;
import org.springframework.beans.factory.annotation.Required;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.mapping.IngestMapperFactory;
-import gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepositoryFactory;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
-import gov.nasa.jpl.oodt.cas.catalog.system.CatalogServiceFactory;
+import org.apache.oodt.cas.catalog.mapping.IngestMapperFactory;
+import org.apache.oodt.cas.catalog.repository.CatalogRepositoryFactory;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.system.CatalogServiceFactory;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Bucket.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Bucket.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Bucket.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Bucket.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.term;
+package org.apache.oodt.cas.catalog.term;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.term;
+package org.apache.oodt.cas.catalog.term;
//JDK imports
import java.util.Collections;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/TermBucket.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/TermBucket.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/TermBucket.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/term/TermBucket.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.term;
+package org.apache.oodt.cas.catalog.term;
//JDK imports
import java.util.Collections;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/CasPropertyPlaceholderConfigurer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/CasPropertyPlaceholderConfigurer.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/CasPropertyPlaceholderConfigurer.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/CasPropertyPlaceholderConfigurer.java Wed Jul 7 07:51:51 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.util;
+package org.apache.oodt.cas.catalog.util;
//OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
//Spring imports
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginClassLoader.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginClassLoader.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginClassLoader.java Wed Jul 7 07:51:51 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.util;
+package org.apache.oodt.cas.catalog.util;
//JDK imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
import java.io.File;
import java.io.FileFilter;
@@ -60,7 +60,7 @@ public class PluginClassLoader extends U
public static URL[] getPluginURLs() {
List<URL> urls = new Vector<URL>();
try {
- String pluginDirs = System.getProperty("gov.nasa.jpl.oodt.cas.catalog.plugin.dirs");
+ String pluginDirs = System.getProperty("org.apache.oodt.cas.catalog.plugin.dirs");
if (pluginDirs != null) {
for (String pluginDir : PathUtils.doDynamicReplacement(pluginDirs).split(",")) {
File[] jarFiles = new File(pluginDir).listFiles(new FileFilter() {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginURL.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginURL.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginURL.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/PluginURL.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.util;
+package org.apache.oodt.cas.catalog.util;
//JDK imports
import java.net.URL;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/QueryUtils.java Wed Jul 7 07:51:51 2010
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.util;
+package org.apache.oodt.cas.catalog.util;
//JDK imports
import java.util.List;
import java.util.Vector;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryLogicalGroup;
-import gov.nasa.jpl.oodt.cas.catalog.query.WrapperQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.filter.QueryFilter;
-import gov.nasa.jpl.oodt.cas.catalog.query.parser.ParseException;
-import gov.nasa.jpl.oodt.cas.catalog.query.parser.QueryParser;
-import gov.nasa.jpl.oodt.cas.catalog.query.parser.TokenMgrError;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
+import org.apache.oodt.cas.catalog.query.WrapperQueryExpression;
+import org.apache.oodt.cas.catalog.query.filter.QueryFilter;
+import org.apache.oodt.cas.catalog.query.parser.ParseException;
+import org.apache.oodt.cas.catalog.query.parser.QueryParser;
+import org.apache.oodt.cas.catalog.query.parser.TokenMgrError;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/Serializer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/Serializer.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/Serializer.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/Serializer.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.util;
+package org.apache.oodt.cas.catalog.util;
//JDK imports
import java.io.InputStream;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java Wed Jul 7 07:51:51 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.util;
+package org.apache.oodt.cas.catalog.util;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.system.Catalog;
//JDK imports
import java.util.HashSet;