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 [2/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/server/CatalogServiceServerLauncher.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/CatalogServiceServerLauncher.java Wed Jul 7 07:51:51 2010
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server;
+package org.apache.oodt.cas.catalog.server;
//OODT imports
import java.io.FileInputStream;
import java.util.List;
-import gov.nasa.jpl.oodt.cas.catalog.server.action.CatalogServiceServerAction;
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelServer;
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelServerFactory;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClientFactory;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
-import gov.nasa.jpl.oodt.cas.commons.option.CmdLineOptionInstance;
-import gov.nasa.jpl.oodt.cas.commons.option.util.CmdLineOptionUtils;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.catalog.server.action.CatalogServiceServerAction;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelServer;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelServerFactory;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClientFactory;
+import org.apache.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.commons.option.CmdLineOptionInstance;
+import org.apache.oodt.cas.commons.option.util.CmdLineOptionUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
//Spring imports
import org.springframework.context.support.FileSystemXmlApplicationContext;
@@ -47,10 +47,10 @@ public class CatalogServiceServerLaunche
private CatalogServiceServerLauncher() throws InstantiationException {}
//
// public static void startup(String beanId) throws Exception {
-// String propertiesFile = System.getProperty("gov.nasa.jpl.oodt.cas.catalog.properties.file");
+// String propertiesFile = System.getProperty("org.apache.oodt.cas.catalog.properties.file");
// if (propertiesFile != null)
// System.getProperties().load(new FileInputStream(propertiesFile));
-// FileSystemXmlApplicationContext appContext = new FileSystemXmlApplicationContext(PathUtils.doDynamicReplacement(System.getProperty("gov.nasa.jpl.oodt.cas.catalog.config.file", "classpath:/gov/nasa/jpl/oodt/cas/catalog/config/catserv-config.xml")));
+// FileSystemXmlApplicationContext appContext = new FileSystemXmlApplicationContext(PathUtils.doDynamicReplacement(System.getProperty("org.apache.oodt.cas.catalog.config.file", "classpath:/org.apache/oodt/cas/catalog/config/catserv-config.xml")));
// CommunicationChannelServerFactory serverFactory = (CommunicationChannelServerFactory) appContext.getBean(beanId, CommunicationChannelServerFactory.class);
// CommunicationChannelServer communicationChannelServer = serverFactory.createCommunicationChannelServer();
// communicationChannelServer.startup();
@@ -58,10 +58,10 @@ public class CatalogServiceServerLaunche
// }
public static void main(String[] args) throws Exception {
- String propertiesFile = System.getProperty("gov.nasa.jpl.oodt.cas.catalog.properties.file");
+ String propertiesFile = System.getProperty("org.apache.oodt.cas.catalog.properties.file");
if (propertiesFile != null)
System.getProperties().load(new FileInputStream(propertiesFile));
- String configFile = PathUtils.doDynamicReplacement(System.getProperty("gov.nasa.jpl.oodt.cas.catalog.server.config.file", "classpath:/gov/nasa/jpl/oodt/cas/catalog/config/catserv-server-config.xml"));
+ String configFile = PathUtils.doDynamicReplacement(System.getProperty("org.apache.oodt.cas.catalog.server.config.file", "classpath:/org.apache/oodt/cas/catalog/config/catserv-server-config.xml"));
FileSystemXmlApplicationContext appContext = new FileSystemXmlApplicationContext(new String[] { configFile }, false);
appContext.setClassLoader(new Serializer().getClassLoader());
appContext.refresh();
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/CatalogServiceServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/CatalogServiceServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/CatalogServiceServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/CatalogServiceServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
import org.springframework.beans.factory.annotation.Required;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
-import gov.nasa.jpl.oodt.cas.commons.spring.SpringSetIdInjectionType;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.commons.spring.SpringSetIdInjectionType;
public abstract class CatalogServiceServerAction implements SpringSetIdInjectionType {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/GetSupportedCatalogIds.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/GetSupportedCatalogIds.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/GetSupportedCatalogIds.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/GetSupportedCatalogIds.java Wed Jul 7 07:51:51 2010
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
public class GetSupportedCatalogIds extends CatalogServiceServerAction {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogRepositoryServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogRepositoryServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogRepositoryServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogRepositoryServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
import java.util.Set;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-import gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository;
-import gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepositoryFactory;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.catalog.repository.CatalogRepository;
+import org.apache.oodt.cas.catalog.repository.CatalogRepositoryFactory;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.util.Serializer;
public class LoadCatalogRepositoryServerAction extends CatalogServiceServerAction {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogsServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogsServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogsServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/LoadCatalogsServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
import java.util.Map;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.util.Serializer;
import org.springframework.context.support.FileSystemXmlApplicationContext;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/PagedQueryServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/PagedQueryServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/PagedQueryServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/PagedQueryServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-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.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.parser.QueryParser;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.page.Page;
+import org.apache.oodt.cas.catalog.page.PageInfo;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.parser.QueryParser;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
public class PagedQueryServerAction extends CatalogServiceServerAction {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/QueryServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/QueryServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/QueryServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/QueryServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-import gov.nasa.jpl.oodt.cas.catalog.page.QueryPager;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.parser.QueryParser;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.page.QueryPager;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.parser.QueryParser;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
public class QueryServerAction extends CatalogServiceServerAction {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedPagedQueryServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedPagedQueryServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedPagedQueryServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedPagedQueryServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
import java.util.HashSet;
import java.util.List;
@@ -23,12 +23,12 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-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.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.parser.QueryParser;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.page.Page;
+import org.apache.oodt.cas.catalog.page.PageInfo;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.parser.QueryParser;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
public class ReducedPagedQueryServerAction extends CatalogServiceServerAction {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedQueryServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedQueryServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedQueryServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ReducedQueryServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
import java.util.HashSet;
import java.util.List;
@@ -23,11 +23,11 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import gov.nasa.jpl.oodt.cas.catalog.metadata.TransactionalMetadata;
-import gov.nasa.jpl.oodt.cas.catalog.page.QueryPager;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.parser.QueryParser;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.page.QueryPager;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.parser.QueryParser;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
public class ReducedQueryServerAction extends CatalogServiceServerAction {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ShutdownServerAction.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ShutdownServerAction.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ShutdownServerAction.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/action/ShutdownServerAction.java Wed Jul 7 07:51:51 2010
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.action;
+package org.apache.oodt.cas.catalog.server.action;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
public class ShutdownServerAction extends CatalogServiceServerAction {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelClient.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelClient.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelClient.java Wed Jul 7 07:51:51 2010
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel;
+package org.apache.oodt.cas.catalog.server.channel;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
+import org.apache.oodt.cas.catalog.util.Serializer;
//JDK imports
import java.lang.reflect.InvocationHandler;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java Wed Jul 7 07:51:51 2010
@@ -15,25 +15,25 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel;
+package org.apache.oodt.cas.catalog.server.channel;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogServiceException;
-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.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.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.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.Serializer;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+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.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.Serializer;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.lang.reflect.InvocationHandler;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java Wed Jul 7 07:51:51 2010
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel;
+package org.apache.oodt.cas.catalog.server.channel;
//OODT imports
-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.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.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.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+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.system.Catalog;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.net.URL;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel;
+package org.apache.oodt.cas.catalog.server.channel;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java Wed Jul 7 07:51:51 2010
@@ -15,24 +15,24 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel;
+package org.apache.oodt.cas.catalog.server.channel;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogServiceException;
-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.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.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.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.metadata.Metadata;
+import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+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.system.Catalog;
+import org.apache.oodt.cas.catalog.system.CatalogService;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.net.URL;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java Wed Jul 7 07:51:51 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel;
+package org.apache.oodt.cas.catalog.server.channel;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.system.CatalogServiceFactory;
+import org.apache.oodt.cas.catalog.system.CatalogServiceFactory;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.rmi;
+package org.apache.oodt.cas.catalog.server.channel.rmi;
import java.net.URL;
import java.rmi.RemoteException;
@@ -24,20 +24,20 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-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.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.server.channel.CommunicationChannelClient;
-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.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelClient;
+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.system.Catalog;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.metadata.Metadata;
public class RmiCommunicationChannelClient extends UnicastRemoteObject implements CommunicationChannelClient{
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java Wed Jul 7 07:51:51 2010
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.rmi;
+package org.apache.oodt.cas.catalog.server.channel.rmi;
-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.QueryPager;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.repository.CatalogRepository;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.system.Catalog;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.catalog.mapping.IngestMapper;
+import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
+import org.apache.oodt.cas.catalog.page.QueryPager;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.repository.CatalogRepository;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.system.Catalog;
+import org.apache.oodt.cas.metadata.Metadata;
import java.rmi.Remote;
import java.rmi.RemoteException;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.rmi;
+package org.apache.oodt.cas.catalog.server.channel.rmi;
public interface RmiCommunicationChannelClientMBean {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.rmi;
+package org.apache.oodt.cas.catalog.server.channel.rmi;
import java.io.IOException;
import java.net.URL;
@@ -23,21 +23,21 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-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.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.server.channel.CommunicationChannelServer;
-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.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.metadata.Metadata;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelServer;
+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.system.Catalog;
+import org.apache.oodt.cas.catalog.system.CatalogService;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.metadata.Metadata;
public class RmiCommunicationChannelServer implements
CommunicationChannelServer {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc;
+package org.apache.oodt.cas.catalog.server.channel.xmlrpc;
//JDK imports
import java.io.File;
@@ -31,20 +31,20 @@ import org.apache.xmlrpc.CommonsXmlRpcTr
import org.apache.xmlrpc.XmlRpcClient;
//OODT imports
-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.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.server.channel.AbstractCommunicationChannelClient;
-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.system.Catalog;
-import gov.nasa.jpl.oodt.cas.catalog.util.PluginURL;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.server.channel.AbstractCommunicationChannelClient;
+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.system.Catalog;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+import org.apache.oodt.cas.metadata.Metadata;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc;
+package org.apache.oodt.cas.catalog.server.channel.xmlrpc;
//JDK imports
import java.net.URL;
@@ -26,8 +26,8 @@ import java.util.logging.Logger;
import org.springframework.beans.factory.annotation.Required;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelClient;
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelClientFactory;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelClient;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelClientFactory;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc;
+package org.apache.oodt.cas.catalog.server.channel.xmlrpc;
//JDK imports
import java.io.File;
@@ -27,18 +27,18 @@ import java.util.Set;
import org.apache.xmlrpc.WebServer;
//OODT imports
-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.QueryPager;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.AbstractCommunicationChannelServer;
-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.system.Catalog;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.server.channel.AbstractCommunicationChannelServer;
+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.system.Catalog;
+import org.apache.oodt.cas.metadata.Metadata;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc;
+package org.apache.oodt.cas.catalog.server.channel.xmlrpc;
//JDK imports
import java.util.logging.Level;
@@ -25,9 +25,9 @@ import java.util.logging.Logger;
import org.springframework.beans.factory.annotation.Required;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelServer;
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelServerFactory;
-import gov.nasa.jpl.oodt.cas.catalog.system.CatalogServiceFactory;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelServer;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelServerFactory;
+import org.apache.oodt.cas.catalog.system.CatalogServiceFactory;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedActionsHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedActionsHandler.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedActionsHandler.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedActionsHandler.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.option;
+package org.apache.oodt.cas.catalog.server.option;
import java.io.PrintStream;
import java.util.List;
@@ -23,10 +23,10 @@ import java.util.Map;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-import gov.nasa.jpl.oodt.cas.catalog.server.action.CatalogServiceServerAction;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
-import gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption;
-import gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+import org.apache.oodt.cas.catalog.server.action.CatalogServiceServerAction;
+import org.apache.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.commons.option.CmdLineOption;
+import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
public class PrintSupportedActionsHandler extends CmdLineOptionHandler {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedClientsHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedClientsHandler.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedClientsHandler.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedClientsHandler.java Wed Jul 7 07:51:51 2010
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.option;
+package org.apache.oodt.cas.catalog.server.option;
import java.io.PrintStream;
import java.util.List;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClient;
-import gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClientFactory;
-import gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption;
-import gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+import org.apache.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
+import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClientFactory;
+import org.apache.oodt.cas.commons.option.CmdLineOption;
+import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
public class PrintSupportedClientsHandler extends CmdLineOptionHandler {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedServersHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedServersHandler.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedServersHandler.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/server/option/PrintSupportedServersHandler.java Wed Jul 7 07:51:51 2010
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.server.option;
+package org.apache.oodt.cas.catalog.server.option;
import java.io.PrintStream;
import java.util.List;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-import gov.nasa.jpl.oodt.cas.catalog.util.Serializer;
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelServerFactory;
-import gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption;
-import gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+import org.apache.oodt.cas.catalog.util.Serializer;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelServerFactory;
+import org.apache.oodt.cas.commons.option.CmdLineOption;
+import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
public class PrintSupportedServersHandler extends CmdLineOptionHandler {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Dictionary.java Wed Jul 7 07:51:51 2010
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogDictionaryException;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.term.TermBucket;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.term.TermBucket;
+import org.apache.oodt.cas.metadata.Metadata;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/DictionaryFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
public interface DictionaryFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/Index.java Wed Jul 7 07:51:51 2010
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogIndexException;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
+import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
+import org.apache.oodt.cas.catalog.page.IndexPager;
//JDK imports
import java.util.List;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IndexFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
public interface IndexFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/IngestService.java Wed Jul 7 07:51:51 2010
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
//OODT imports
import java.util.List;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.IngestServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.page.IngestReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.term.TermBucket;
+import org.apache.oodt.cas.catalog.exception.IngestServiceException;
+import org.apache.oodt.cas.catalog.page.IngestReceipt;
+import org.apache.oodt.cas.catalog.term.TermBucket;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java Wed Jul 7 07:51:51 2010
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
//JDK imports
import java.util.List;
import java.util.Map;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.QueryServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.page.IngestReceipt;
-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.term.TermBucket;
+import org.apache.oodt.cas.catalog.exception.QueryServiceException;
+import org.apache.oodt.cas.catalog.page.IngestReceipt;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.term.TermBucket;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionId.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionId.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionId.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionId.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/TransactionIdFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct;
+package org.apache.oodt.cas.catalog.struct;
public interface TransactionIdFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionary.java Wed Jul 7 07:51:51 2010
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.dictionary;
+package org.apache.oodt.cas.catalog.struct.impl.dictionary;
import java.util.Set;
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogDictionaryException;
-import gov.nasa.jpl.oodt.cas.catalog.query.ComparisonQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.NotQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryLogicalGroup;
-import gov.nasa.jpl.oodt.cas.catalog.query.StdQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.TermQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.struct.Dictionary;
-import gov.nasa.jpl.oodt.cas.catalog.term.Term;
-import gov.nasa.jpl.oodt.cas.catalog.term.TermBucket;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.catalog.exception.CatalogDictionaryException;
+import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
+import org.apache.oodt.cas.catalog.query.NotQueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
+import org.apache.oodt.cas.catalog.query.StdQueryExpression;
+import org.apache.oodt.cas.catalog.query.TermQueryExpression;
+import org.apache.oodt.cas.catalog.struct.Dictionary;
+import org.apache.oodt.cas.catalog.term.Term;
+import org.apache.oodt.cas.catalog.term.TermBucket;
+import org.apache.oodt.cas.metadata.Metadata;
public class WorkflowManagerDictionary implements Dictionary {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionaryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionaryFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionaryFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/dictionary/WorkflowManagerDictionaryFactory.java Wed Jul 7 07:51:51 2010
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.dictionary;
+package org.apache.oodt.cas.catalog.struct.impl.dictionary;
-import gov.nasa.jpl.oodt.cas.catalog.struct.DictionaryFactory;
+import org.apache.oodt.cas.catalog.struct.DictionaryFactory;
public class WorkflowManagerDictionaryFactory implements DictionaryFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndex.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.index;
+package org.apache.oodt.cas.catalog.struct.impl.index;
//JDK imports
import java.io.UnsupportedEncodingException;
@@ -38,28 +38,28 @@ import java.util.logging.Logger;
import javax.sql.DataSource;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogIndexException;
-import gov.nasa.jpl.oodt.cas.catalog.exception.IngestServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.exception.QueryServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.page.IngestReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.page.PageInfo;
-import gov.nasa.jpl.oodt.cas.catalog.page.ProcessedPageInfo;
-import gov.nasa.jpl.oodt.cas.catalog.query.ComparisonQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.NotQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryLogicalGroup;
-import gov.nasa.jpl.oodt.cas.catalog.query.StdQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.struct.Index;
-import gov.nasa.jpl.oodt.cas.catalog.struct.IngestService;
-import gov.nasa.jpl.oodt.cas.catalog.struct.QueryService;
-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.struct.impl.transaction.UuidTransactionIdFactory;
-import gov.nasa.jpl.oodt.cas.catalog.term.Term;
-import gov.nasa.jpl.oodt.cas.catalog.term.TermBucket;
-import gov.nasa.jpl.oodt.cas.commons.database.DatabaseConnectionBuilder;
-import gov.nasa.jpl.oodt.cas.commons.date.DateUtils;
+import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
+import org.apache.oodt.cas.catalog.exception.IngestServiceException;
+import org.apache.oodt.cas.catalog.exception.QueryServiceException;
+import org.apache.oodt.cas.catalog.page.IndexPager;
+import org.apache.oodt.cas.catalog.page.IngestReceipt;
+import org.apache.oodt.cas.catalog.page.PageInfo;
+import org.apache.oodt.cas.catalog.page.ProcessedPageInfo;
+import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
+import org.apache.oodt.cas.catalog.query.NotQueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
+import org.apache.oodt.cas.catalog.query.StdQueryExpression;
+import org.apache.oodt.cas.catalog.struct.Index;
+import org.apache.oodt.cas.catalog.struct.IngestService;
+import org.apache.oodt.cas.catalog.struct.QueryService;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.struct.impl.transaction.UuidTransactionIdFactory;
+import org.apache.oodt.cas.catalog.term.Term;
+import org.apache.oodt.cas.catalog.term.TermBucket;
+import org.apache.oodt.cas.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.cas.commons.date.DateUtils;
/**
*
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndexFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndexFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndexFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/DataSourceIndexFactory.java Wed Jul 7 07:51:51 2010
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.index;
+package org.apache.oodt.cas.catalog.struct.impl.index;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.struct.Index;
-import gov.nasa.jpl.oodt.cas.catalog.struct.IndexFactory;
+import org.apache.oodt.cas.catalog.struct.Index;
+import org.apache.oodt.cas.catalog.struct.IndexFactory;
/**
*
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndex.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndex.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndex.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndex.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.index;
+package org.apache.oodt.cas.catalog.struct.impl.index;
//JDK imports
import java.util.Collections;
@@ -26,16 +26,16 @@ import java.util.Properties;
import java.util.Vector;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogIndexException;
-import gov.nasa.jpl.oodt.cas.catalog.exception.IngestServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.page.IngestReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.struct.Index;
-import gov.nasa.jpl.oodt.cas.catalog.struct.IngestService;
-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.struct.impl.transaction.UuidTransactionIdFactory;
-import gov.nasa.jpl.oodt.cas.catalog.term.TermBucket;
+import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
+import org.apache.oodt.cas.catalog.exception.IngestServiceException;
+import org.apache.oodt.cas.catalog.page.IndexPager;
+import org.apache.oodt.cas.catalog.page.IngestReceipt;
+import org.apache.oodt.cas.catalog.struct.Index;
+import org.apache.oodt.cas.catalog.struct.IngestService;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.struct.impl.transaction.UuidTransactionIdFactory;
+import org.apache.oodt.cas.catalog.term.TermBucket;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndexFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndexFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndexFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/InMemoryIndexFactory.java Wed Jul 7 07:51:51 2010
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.index;
+package org.apache.oodt.cas.catalog.struct.impl.index;
-import gov.nasa.jpl.oodt.cas.catalog.struct.IndexFactory;
+import org.apache.oodt.cas.catalog.struct.IndexFactory;
public class InMemoryIndexFactory implements IndexFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndex.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.index;
+package org.apache.oodt.cas.catalog.struct.impl.index;
//JDK imports
import java.io.UnsupportedEncodingException;
@@ -40,23 +40,23 @@ import javax.sql.DataSource;
import jpl.eda.util.DateConvert;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogIndexException;
-import gov.nasa.jpl.oodt.cas.catalog.exception.QueryServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.page.IngestReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.query.ComparisonQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.NotQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryLogicalGroup;
-import gov.nasa.jpl.oodt.cas.catalog.query.StdQueryExpression;
-import gov.nasa.jpl.oodt.cas.catalog.struct.Index;
-import gov.nasa.jpl.oodt.cas.catalog.struct.QueryService;
-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.struct.impl.transaction.LongTransactionIdFactory;
-import gov.nasa.jpl.oodt.cas.catalog.term.Term;
-import gov.nasa.jpl.oodt.cas.catalog.term.TermBucket;
-import gov.nasa.jpl.oodt.cas.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.cas.catalog.exception.CatalogIndexException;
+import org.apache.oodt.cas.catalog.exception.QueryServiceException;
+import org.apache.oodt.cas.catalog.page.IndexPager;
+import org.apache.oodt.cas.catalog.page.IngestReceipt;
+import org.apache.oodt.cas.catalog.query.ComparisonQueryExpression;
+import org.apache.oodt.cas.catalog.query.NotQueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.query.QueryLogicalGroup;
+import org.apache.oodt.cas.catalog.query.StdQueryExpression;
+import org.apache.oodt.cas.catalog.struct.Index;
+import org.apache.oodt.cas.catalog.struct.QueryService;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.struct.impl.transaction.LongTransactionIdFactory;
+import org.apache.oodt.cas.catalog.term.Term;
+import org.apache.oodt.cas.catalog.term.TermBucket;
+import org.apache.oodt.cas.commons.database.DatabaseConnectionBuilder;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndexFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndexFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndexFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/index/WorkflowManagerDataSourceIndexFactory.java Wed Jul 7 07:51:51 2010
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.index;
+package org.apache.oodt.cas.catalog.struct.impl.index;
-import gov.nasa.jpl.oodt.cas.catalog.struct.IndexFactory;
+import org.apache.oodt.cas.catalog.struct.IndexFactory;
public class WorkflowManagerDataSourceIndexFactory implements IndexFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/LongTransactionIdFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/LongTransactionIdFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/LongTransactionIdFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/LongTransactionIdFactory.java Wed Jul 7 07:51:51 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction;
+package org.apache.oodt.cas.catalog.struct.impl.transaction;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
public class LongTransactionIdFactory implements TransactionIdFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/StringTransactionIdFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/StringTransactionIdFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/StringTransactionIdFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/StringTransactionIdFactory.java Wed Jul 7 07:51:51 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction;
+package org.apache.oodt.cas.catalog.struct.impl.transaction;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
public class StringTransactionIdFactory implements TransactionIdFactory {
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/UuidTransactionIdFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/UuidTransactionIdFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/UuidTransactionIdFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/impl/transaction/UuidTransactionIdFactory.java Wed Jul 7 07:51:51 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction;
+package org.apache.oodt.cas.catalog.struct.impl.transaction;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionId;
-import gov.nasa.jpl.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
import java.util.UUID;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java Wed Jul 7 07:51:51 2010
@@ -15,26 +15,26 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.system;
+package org.apache.oodt.cas.catalog.system;
//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.IngestServiceException;
-import gov.nasa.jpl.oodt.cas.catalog.page.CatalogReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.page.IndexPager;
-import gov.nasa.jpl.oodt.cas.catalog.page.IngestReceipt;
-import gov.nasa.jpl.oodt.cas.catalog.query.QueryExpression;
-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.IngestService;
-import gov.nasa.jpl.oodt.cas.catalog.struct.QueryService;
-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.term.Term;
-import gov.nasa.jpl.oodt.cas.catalog.term.TermBucket;
-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.IngestServiceException;
+import org.apache.oodt.cas.catalog.page.CatalogReceipt;
+import org.apache.oodt.cas.catalog.page.IndexPager;
+import org.apache.oodt.cas.catalog.page.IngestReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.struct.Dictionary;
+import org.apache.oodt.cas.catalog.struct.Index;
+import org.apache.oodt.cas.catalog.struct.IngestService;
+import org.apache.oodt.cas.catalog.struct.QueryService;
+import org.apache.oodt.cas.catalog.struct.TransactionId;
+import org.apache.oodt.cas.catalog.struct.TransactionIdFactory;
+import org.apache.oodt.cas.catalog.term.Term;
+import org.apache.oodt.cas.catalog.term.TermBucket;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.lang.reflect.InvocationTargetException;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogFactory.java Wed Jul 7 07:51:51 2010
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.system;
+package org.apache.oodt.cas.catalog.system;
-import gov.nasa.jpl.oodt.cas.catalog.struct.Dictionary;
-import gov.nasa.jpl.oodt.cas.catalog.struct.DictionaryFactory;
-import gov.nasa.jpl.oodt.cas.catalog.struct.IndexFactory;
+import org.apache.oodt.cas.catalog.struct.Dictionary;
+import org.apache.oodt.cas.catalog.struct.DictionaryFactory;
+import org.apache.oodt.cas.catalog.struct.IndexFactory;
import java.util.List;
import java.util.Vector;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java Wed Jul 7 07:51:51 2010
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.system;
+package org.apache.oodt.cas.catalog.system;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.exception.CatalogServiceException;
-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.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.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.util.PluginURL;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+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.util.PluginURL;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.net.URL;
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogServiceFactory.java Wed Jul 7 07:51:51 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.system;
+package org.apache.oodt.cas.catalog.system;
/**
* @author bfoster
Modified: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java Wed Jul 7 07:51:51 2010
@@ -15,25 +15,25 @@
* 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.CatalogServiceException;
-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.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.server.channel.CommunicationChannelClient;
-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.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.metadata.Metadata;
+import org.apache.oodt.cas.catalog.exception.CatalogServiceException;
+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.QueryPager;
+import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.query.QueryExpression;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelClient;
+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.system.Catalog;
+import org.apache.oodt.cas.catalog.system.CatalogService;
+import org.apache.oodt.cas.catalog.util.PluginURL;
+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/CatalogServiceClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClientFactory.java?rev=961279&r1=961256&r2=961279&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClientFactory.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClientFactory.java Wed Jul 7 07:51:51 2010
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.catalog.system.impl;
+package org.apache.oodt.cas.catalog.system.impl;
//Spring imports
import org.springframework.beans.factory.annotation.Required;
//OODT imports
-import gov.nasa.jpl.oodt.cas.catalog.server.channel.CommunicationChannelClientFactory;
-import gov.nasa.jpl.oodt.cas.catalog.system.CatalogServiceFactory;
+import org.apache.oodt.cas.catalog.server.channel.CommunicationChannelClientFactory;
+import org.apache.oodt.cas.catalog.system.CatalogServiceFactory;
/**
* @author bfoster