http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
deleted file mode 100644
index 873d997..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/AbstractCommunicationChannelServer.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel;
-
-//JDK imports
-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;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-//OODT imports
-
-/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * An Abstract Communication Channel Server Interface that automatically 
handles throw exceptions
- * <p>
- */
-public abstract class AbstractCommunicationChannelServer implements 
CommunicationChannelServer {
-       
-       private static Logger LOG = 
Logger.getLogger(AbstractCommunicationChannelServer.class.getName());
-       
-       protected CatalogService catalogService;
-       protected int port;
-       protected Serializer serializer;
-       
-       public AbstractCommunicationChannelServer() {
-               this.serializer = new Serializer();
-       }
-       
-       public void setCatalogService(CatalogService catalogService) {
-               this.catalogService = catalogService;
-       }
-       
-       public void setPort(int port) { 
-               this.port = port;
-       }
-       
-       public int getPort() {
-               return this.port;
-       }
-
-       public void shutdown() throws CatalogServiceException {
-               try {
-                       this.catalogService.shutdown();
-                       this.catalogService = null;
-                       System.gc(); // used to speed up shutdown process 
(gives java a boost-start at cleaning up everything so server will die)
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed to shutdown server : " + 
e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public boolean isRestrictQueryPermissions() throws 
CatalogServiceException {
-               try {
-                       return this.catalogService.isRestrictQueryPermissions();
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while checking server 
query permissions : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-
-       public boolean isRestrictIngestPermissions() throws 
CatalogServiceException {
-               try {
-                       return 
this.catalogService.isRestrictIngestPermissions();
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while checking server 
ingest permissions : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       public void addCatalog(Catalog catalog) throws CatalogServiceException {
-               try {
-                       this.catalogService.addCatalog(catalog);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while adding catalog '" + 
catalog + "' to server : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void replaceCatalog(Catalog catalog) throws 
CatalogServiceException {
-               try {
-                       this.catalogService.replaceCatalog(catalog);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while replacing catalog 
'" + catalog + "' to server : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void addCatalog(String catalogId, Index index) throws 
CatalogServiceException {
-               try {
-                       this.catalogService.addCatalog(catalogId, index);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while adding catalog '" + 
catalogId + "' with index '" + index + "' to server : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries) throws CatalogServiceException {
-               try {
-                       this.catalogService.addCatalog(catalogId, index, 
dictionaries);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while adding catalog '" + 
catalogId + "' with index '" + index + "' and dictionaries '" + dictionaries + 
"' to server : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-
-       public void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries, boolean restrictQueryPermission, boolean 
restrictIngestPermission) throws CatalogServiceException {
-               try {
-                       this.catalogService.addCatalog(catalogId, index, 
dictionaries, restrictQueryPermission, restrictIngestPermission);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while adding catalog '" + 
catalogId + "' with index '" + index + "' and dictionaries '" + dictionaries + 
"' and restrictQueryPermission '" + restrictQueryPermission + "' and 
restrictIngestPermission '" + restrictIngestPermission + "' to server : " + 
e.getMessage(), e);
-                       throw e;
-               }
-       }
-
-       public void addDictionary(String catalogId, Dictionary dictionary) 
throws CatalogServiceException {
-               try {
-                       this.catalogService.addDictionary(catalogId, 
dictionary);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while adding dictionary 
'" + dictionary + "' to catalog '" + catalogId + "' : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void replaceDictionaries(String catalogId, List<Dictionary> 
dictionaries) throws CatalogServiceException {
-               try {
-                       this.catalogService.replaceDictionaries(catalogId, 
dictionaries);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while replacing 
dictionaries '" + dictionaries + "' in catalog '" + catalogId + "' : " + 
e.getMessage(), e);
-                       throw e;
-               }
-       }
-
-       public void replaceIndex(String catalogId, Index index) throws 
CatalogServiceException {
-               try {
-                       this.catalogService.replaceIndex(catalogId, index);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while replacing index '" 
+ index + "' in catalog '" + catalogId + "' : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-
-       public void modifyIngestPermission(String catalogId, boolean 
restrictIngestPermission) throws CatalogServiceException {
-               try {
-                       this.catalogService.modifyIngestPermission(catalogId, 
restrictIngestPermission);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while changing ingest 
permissions for catalog '" + catalogId + "' to '" + restrictIngestPermission + 
"' : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void modifyQueryPermission(String catalogId, boolean 
restrictQueryPermission) throws CatalogServiceException {
-               try {
-                       this.catalogService.modifyQueryPermission(catalogId, 
restrictQueryPermission);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while changing query 
permissions for catalog '" + catalogId + "' to '" + restrictQueryPermission + 
"' : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void removeCatalog(String catalogId) throws 
CatalogServiceException {
-               try {
-                       this.catalogService.removeCatalog(catalogId);
-               } catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while removing catalog '" 
+ catalogId + "' : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-
-       public List<PluginURL> getPluginUrls() throws CatalogServiceException {
-               try {
-                       return this.catalogService.getPluginUrls();
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting plugin URLs 
: " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void addPluginUrls(List<PluginURL> pluginURLs) throws 
CatalogServiceException {
-               try {
-                       this.catalogService.addPluginUrls(pluginURLs);
-                       this.serializer.refreshClassLoader();
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while adding plugin URLs 
'" + pluginURLs + "' : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public URL getPluginStorageDir() throws CatalogServiceException {
-               try {
-                       return this.catalogService.getPluginStorageDir();
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting plugin 
storage directory : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-
-       public Set<String> getCurrentCatalogIds() throws 
CatalogServiceException {
-               try {
-                       return this.catalogService.getCurrentCatalogIds();
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting current 
catalog ids : " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-               
-       public TransactionReceipt ingest(Metadata metadata) throws 
CatalogServiceException {
-               try {
-                       return this.catalogService.ingest(metadata);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while performing ingest : 
" + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public void delete(Metadata metadata) throws CatalogServiceException {
-               try {
-                       this.catalogService.delete(metadata);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while performing deletion 
: " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public List<String> getProperty(String key) throws 
CatalogServiceException {
-               try {
-                       return this.catalogService.getProperty(key);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting property '" 
+ key + "' : " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-
-       public Properties getCalalogProperties() throws CatalogServiceException 
{
-               try {
-                       return this.catalogService.getCalalogProperties();
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting catalog 
properties : " + e.getMessage(), e);
-                       throw e;
-               }               
-       }
-       
-       public Properties getCalalogProperties(String catalogId) throws 
CatalogServiceException {
-               try {
-                       return 
this.catalogService.getCalalogProperties(catalogId);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting catalog 
properties for catalog '" + catalogId + "' : " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public Page getNextPage(Page page) throws CatalogServiceException {
-               try {
-                       return this.catalogService.getNextPage(page);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting next page : 
" + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) 
throws CatalogServiceException {
-               try {
-                       return this.catalogService.getPage(pageInfo, 
queryExpression);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting next page 
[pageInfo='" + pageInfo + "',query='" + queryExpression + "'] : " + 
e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, 
Set<String> catalogIds) throws CatalogServiceException {
-               try {
-                       return this.catalogService.getPage(pageInfo, 
queryExpression, catalogIds);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting next page 
[pageInfo='" + pageInfo + "',query='" + queryExpression + "',catalogIds='" + 
catalogIds + "'] : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public List<TransactionalMetadata> getMetadata(Page page) throws 
CatalogServiceException {
-               try {
-                       return this.catalogService.getMetadata(page);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting metadata 
for page : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public QueryPager query(QueryExpression queryExpression) throws 
CatalogServiceException {
-               try {
-                       return this.catalogService.query(queryExpression);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while performing query '" 
+ queryExpression + "' : " + e.getMessage(), e);
-                       throw e;
-               }
-       }
-       
-       public QueryPager query(QueryExpression queryExpression, Set<String> 
catalogIds) throws CatalogServiceException {
-               try {
-                       return this.catalogService.query(queryExpression, 
catalogIds);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while performing query '" 
+ queryExpression + "' to catalogs '" + catalogIds + "' : " + e.getMessage(), 
e);
-                       throw e;
-               }
-       }
- 
-       public List<TransactionalMetadata> getNextPage(QueryPager queryPager) 
throws CatalogServiceException {
-               try {
-                       return this.catalogService.getNextPage(queryPager);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while get next page from 
query pager : " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public List<TransactionalMetadata> getAllPages(QueryPager queryPager) 
throws CatalogServiceException {
-               try {
-                       return this.catalogService.getAllPages(queryPager);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while get all pages from 
query pager : " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public List<TransactionalMetadata> 
getMetadataFromTransactionIdStrings(List<String> 
catalogServiceTransactionIdStrings) throws CatalogServiceException {
-               try {
-                       return 
this.catalogService.getMetadataFromTransactionIdStrings(catalogServiceTransactionIdStrings);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting metadata 
for catalog service transaction ids '" + catalogServiceTransactionIdStrings + 
"' : " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public List<TransactionalMetadata> 
getMetadataFromTransactionIds(List<TransactionId<?>> 
catalogServiceTransactionIds) throws CatalogServiceException {
-               try {
-                       return 
this.catalogService.getMetadataFromTransactionIds(catalogServiceTransactionIds);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting metadata 
for catalog service transaction ids '" + catalogServiceTransactionIds + "' : " 
+ e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public List<TransactionId<?>> 
getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, 
String catalogId) throws CatalogServiceException {
-               try {
-                       return 
this.catalogService.getCatalogServiceTransactionIds(catalogTransactionIds, 
catalogId);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting catalog 
service transaction ids for catalog transaction ids '" + catalogTransactionIds 
+ "' from catalog '" + catalogId + "' : " + e.getMessage(), e);
-                       throw e;
-               }       
-       }
-       
-       public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> 
catalogTransactionId, String catalogId) throws CatalogServiceException {
-               try {
-                       return 
this.catalogService.getCatalogServiceTransactionId(catalogTransactionId, 
catalogId);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting catalog 
service transaction id for catalog transaction id '" + catalogTransactionId + 
"' from catalog '" + catalogId + "' : " + e.getMessage(), e);
-                       throw e;
-               }               
-       }
-       
-       public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt 
catalogReceipt, boolean generateNew) throws CatalogServiceException {
-               try {
-                       return 
this.catalogService.getCatalogServiceTransactionId(catalogReceipt, generateNew);
-               }catch (CatalogServiceException e) {
-                       LOG.log(Level.SEVERE, "Failed while getting metadata 
for catalog service transaction id for catalog receipt '" + catalogReceipt + "' 
with generate new equal '" + generateNew + "' : " + e.getMessage(), e);
-                       throw e;
-               }               
-       }
-       
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
deleted file mode 100644
index 63f5016..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClient.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel;
-
-import org.apache.oodt.cas.catalog.exception.CatalogException;
-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;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * A Communication Channel Interface
- * <p>
- */
-public interface CommunicationChannelClient {
-
-       void shutdown() throws CatalogException;
-       
-       boolean isRestrictQueryPermissions() throws CatalogException;
-
-       boolean isRestrictIngestPermissions() throws CatalogException;
-
-       void addCatalog(Catalog catalog) throws CatalogException;
-
-       void replaceCatalog(Catalog catalog) throws CatalogException;
-
-       void addCatalog(String catalogId, Index index) throws CatalogException;
-       
-       void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries) throws CatalogException;
-
-       void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries, boolean restrictQueryPermission,
-                                       boolean restrictIngestPermission) 
throws CatalogException;
-
-       void addDictionary(String catalogId, Dictionary dictionary) throws 
CatalogException;
-
-       void replaceDictionaries(String catalogId, List<Dictionary> 
dictionaries) throws CatalogException;
-
-       void replaceIndex(String catalogId, Index index) throws 
CatalogException;
-
-       void modifyIngestPermission(String catalogId, boolean 
restrictIngestPermission) throws CatalogException;
-       
-       void modifyQueryPermission(String catalogId, boolean 
restrictQueryPermission) throws CatalogException;
-       
-       void removeCatalog(String catalogUrn) throws CatalogException;
-
-       List<PluginURL> getPluginUrls() throws CatalogException;
-
-       void addPluginUrls(List<PluginURL> pluginUrls) throws CatalogException;
-
-       URL getPluginStorageDir() throws CatalogException;
-       
-       void transferUrl(URL fromUrl, URL toUrl) throws CatalogException;
-
-       Set<String> getCurrentCatalogIds() throws CatalogException;
-               
-       TransactionReceipt ingest(Metadata metadata) throws CatalogException;
-       
-       void delete(Metadata metadata) throws CatalogException;
-       
-       List<String> getProperty(String key) throws CatalogException;
-
-       Properties getCalalogProperties() throws CatalogException;
-       
-       Properties getCalalogProperties(String catalogUrn) throws 
CatalogException;
-       
-       Page getNextPage(Page page) throws CatalogException;
-       
-       Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws 
CatalogException;
-       
-       Page getPage(PageInfo pageInfo, QueryExpression queryExpression, 
Set<String> catalogIds) throws CatalogException;
-       
-       List<TransactionalMetadata> getMetadata(Page page) throws 
CatalogException;
-
-       QueryPager query(QueryExpression queryExpression) throws 
CatalogException;
-
-       QueryPager query(QueryExpression queryExpression, Set<String> 
catalogIds) throws CatalogException;
-
-       List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws 
CatalogException;
-
-       List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager 
queryPager) throws CatalogException;
-       
-       List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws 
CatalogException;
-       
-       List<TransactionalMetadata> 
getMetadataFromTransactionIdStrings(List<String> 
catalogServiceTransactionIdStrings) throws CatalogException;
-       
-       List<TransactionalMetadata> 
getMetadataFromTransactionIds(List<TransactionId<?>> 
catalogServiceTransactionIds) throws CatalogException;
-       
-       List<TransactionId<?>> 
getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
-                                                                               
                                   String catalogUrn) throws CatalogException;
-       
-       TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> 
catalogTransactionId, String catalogUrn) throws CatalogException;
-       
-       TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt 
catalogReceipt, boolean generateNew) throws CatalogException;
-       
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
deleted file mode 100644
index 24d0eb7..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelClientFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel;
-
-/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * A Factory for creating CommunicationChannelClient
- * <p>
- */
-public interface CommunicationChannelClientFactory {
-
-       CommunicationChannelClient createCommunicationChannelClient();
-       
-       void setServerUrl(String url);
-       
-       String getServerUrl();
-       
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
deleted file mode 100644
index bfd43a1..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServer.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel;
-
-//JDK imports
-import org.apache.oodt.cas.catalog.metadata.TransactionalMetadata;
-import org.apache.oodt.cas.catalog.page.*;
-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;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * A Communication Channel Server
- * <p>
- */
-public interface CommunicationChannelServer {
-
-       void setCatalogService(CatalogService catalogService);
-       
-       void setPort(int port);
-
-       int getPort();
-       
-       void startup();
-
-       void shutdown() throws Exception;
-
-       boolean isRestrictQueryPermissions() throws Exception;
-//
-//     public void setRestrictQueryPermissions(boolean 
restrictQueryPermissions) throws Exception;
-//
-boolean isRestrictIngestPermissions() throws Exception;
-//
-//     public void setHasIngestPermissions(boolean restrictIngestPermissions) 
throws Exception;
-
-//     public Class<? extends TransactionId<?>> getTransactionIdClass() throws 
Exception;
-//
-//     public void setTransactionIdClass(Class<? extends TransactionId<?>> 
transactionIdClass) throws Exception;
-//     
-void addCatalog(Catalog catalog) throws Exception;
-
-       void replaceCatalog(Catalog catalog) throws Exception;
-       
-       void addCatalog(String catalogId, Index index) throws Exception;
-       
-       void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries) throws Exception;
-
-       void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries, boolean restrictQueryPermission,
-                                       boolean restrictIngestPermission) 
throws Exception;
-
-       void addDictionary(String catalogId, Dictionary dictionary) throws 
Exception;
-
-       void replaceDictionaries(String catalogId, List<Dictionary> 
dictionaries) throws Exception;
-       
-       void replaceIndex(String catalogId, Index index) throws Exception;
-
-       void modifyIngestPermission(String catalogId, boolean 
restrictIngestPermission) throws Exception;
-       
-       void modifyQueryPermission(String catalogId, boolean 
restrictQueryPermission) throws Exception;
-               
-       void removeCatalog(String catalogUrn) throws Exception;
-       
-//     public void removeCatalog(String catalogUrn, boolean preserveMapping) 
throws Exception;
-
-       List<PluginURL> getPluginUrls() throws Exception;
-       
-       void addPluginUrls(List<PluginURL> pluginURLs) throws Exception;
-       
-       URL getPluginStorageDir() throws Exception;
-       
-//     public Set<Catalog> getCurrentCatalogList() throws Exception;
-//     
-//     public Catalog getCatalog(String catalogUrn) throws Exception;
-
-       Set<String> getCurrentCatalogIds() throws Exception;
-               
-       TransactionReceipt ingest(Metadata metadata) throws Exception;
-       
-       void delete(Metadata metadata) throws Exception;
-       
-       List<String> getProperty(String key) throws Exception;
-
-       Properties getCalalogProperties() throws Exception;
-       
-       Properties getCalalogProperties(String catalogUrn) throws Exception;
-       
-//     public Page getFirstPage(QueryExpression queryExpression) throws 
Exception;
-//
-//     public Page getFirstPage(QueryExpression queryExpression, Set<String> 
catalogIds) throws Exception;
-       
-       Page getNextPage(Page page) throws Exception;
-       
-       Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws 
Exception;
-       
-       Page getPage(PageInfo pageInfo, QueryExpression queryExpression, 
Set<String> catalogIds) throws Exception;
-       
-//     public Page getLastPage(QueryExpression queryExpression) throws 
Exception;
-//
-//     public Page getLastPage(QueryExpression queryExpression, Set<String> 
catalogIds) throws Exception;
-       
-       List<TransactionalMetadata> getMetadata(Page page) throws Exception;
-       
-       QueryPager query(QueryExpression queryExpression) throws Exception;
-
-       QueryPager query(QueryExpression queryExpression, Set<String> 
catalogIds) throws Exception;
-
-//     public QueryPager query(QueryExpression queryExpression, boolean 
sortResults) throws Exception;
- 
-       List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws 
Exception;
-
-//     public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager 
queryPager) throws Exception;
-       
-       List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws 
Exception;
-       
-       List<TransactionalMetadata> 
getMetadataFromTransactionIdStrings(List<String> 
catalogServiceTransactionIdStrings) throws Exception;
-       
-       List<TransactionalMetadata> 
getMetadataFromTransactionIds(List<TransactionId<?>> 
catalogServiceTransactionIds) throws Exception;
-       
-       List<TransactionId<?>> 
getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
-                                                                               
                                   String catalogUrn) throws Exception;
-       
-       TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> 
catalogTransactionId, String catalogUrn) throws Exception;
-       
-       TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt 
catalogReceipt, boolean generateNew) throws Exception;
-       
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
deleted file mode 100644
index db6116b..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/CommunicationChannelServerFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel;
-
-//OODT imports
-import org.apache.oodt.cas.catalog.system.CatalogServiceFactory;
-
-/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * A Factory for creating CommunicationChannelServer
- * <p>
- */
-public interface CommunicationChannelServerFactory {
-       
-       CommunicationChannelServer createCommunicationChannelServer();
-       
-       void setPort(int port);
-       
-       int getPort();
-       
-       void setCatalogServiceFactory(CatalogServiceFactory 
catalogServiceFactory);
-       
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java
deleted file mode 100644
index 3611cc9..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClient.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel.rmi;
-
-//JDK imports
-import org.apache.oodt.cas.catalog.exception.CatalogException;
-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;
-
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-//OODT imports
-
-/**
- * 
- * @author bfoster
- * @version $Revision$
- *
- */
-public class RmiCommunicationChannelClient extends UnicastRemoteObject 
implements CommunicationChannelClient{
-
-       private static final long serialVersionUID = 4618051069367331679L;
-
-       protected RmiCommunicationChannelClient() throws RemoteException {
-               super();
-       }
-
-       public void addCatalog(Catalog catalog) throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addCatalog(String catalogId, Index index) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addCatalog(String catalogId, Index index,
-                       List<Dictionary> dictionaries) throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addCatalog(String catalogId, Index index,
-                       List<Dictionary> dictionaries, boolean 
restrictQueryPermission,
-                       boolean restrictIngestPermission) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addDictionary(String catalogId, Dictionary dictionary)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addPluginUrls(List<PluginURL> pluginUrls) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void delete(Metadata metadata) throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public List<TransactionalMetadata> getAllPages(QueryPager queryPager)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Properties getCalalogProperties() throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Properties getCalalogProperties(String catalogUrn) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public TransactionId<?> getCatalogServiceTransactionId(
-                       TransactionId<?> catalogTransactionId, String 
catalogUrn)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public TransactionId<?> getCatalogServiceTransactionId(
-                       CatalogReceipt catalogReceipt, boolean generateNew)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionId<?>> getCatalogServiceTransactionIds(
-                       List<TransactionId<?>> catalogTransactionIds, String 
catalogUrn)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Set<String> getCurrentCatalogIds() throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getMetadata(Page page) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(
-                       List<String> catalogServiceTransactionIdStrings) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getMetadataFromTransactionIds(
-                       List<TransactionId<?>> catalogServiceTransactionIds)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Page getNextPage(Page page) throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getNextPage(QueryPager queryPager)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression)
-                       throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression,
-                       Set<String> catalogIds) throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public URL getPluginStorageDir() throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<PluginURL> getPluginUrls() throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<String> getProperty(String key) throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionId<?>> getTransactionIdsForAllPages(
-                       QueryPager queryPager) throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public TransactionReceipt ingest(Metadata metadata) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public boolean isRestrictIngestPermissions() throws CatalogException {
-               // TODO Auto-generated method stub
-               return false;
-       }
-
-       public boolean isRestrictQueryPermissions() throws CatalogException {
-               // TODO Auto-generated method stub
-               return false;
-       }
-
-       public void modifyIngestPermission(String catalogId,
-                       boolean restrictIngestPermission) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void modifyQueryPermission(String catalogId,
-                       boolean restrictQueryPermission) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public QueryPager query(QueryExpression queryExpression) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public QueryPager query(QueryExpression queryExpression,
-                       Set<String> catalogIds) throws CatalogException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public void removeCatalog(String catalogUrn) throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void replaceCatalog(Catalog catalog) throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void replaceDictionaries(String catalogId,
-                       List<Dictionary> dictionaries) throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void replaceIndex(String catalogId, Index index) throws 
CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void shutdown() throws CatalogException {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void transferUrl(URL fromUrl, URL toUrl) throws CatalogException 
{
-               // TODO Auto-generated method stub
-               
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
deleted file mode 100644
index 97f261b..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientInterface.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel.rmi;
-
-//JDK imports
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-//OODT imports
-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;
-
-/**
- * 
- * @author bfoster
- * @version $Revision$
- *
- */
-public interface RmiCommunicationChannelClientInterface extends Remote {
-       
-       void setCatalogRepository(CatalogRepository catalogRepository);
-       
-       CatalogRepository getCatalogRepository();
-       
-       IngestMapper getIngestMapper() throws RemoteException;
-
-       void setIngestMapper(IngestMapper ingestMapper) throws RemoteException;
-
-       boolean isRestrictQueryPermissions() throws RemoteException;
-
-       void setRestrictQueryPermissions(boolean restrictQueryPermissions) 
throws RemoteException;
-
-       boolean isHasIngestPermissions() throws RemoteException;
-
-       void setHasIngestPermissions(boolean restrictIngestPermissions) throws 
RemoteException;
-
-       Class<? extends TransactionId<?>> getTransactionIdClass() throws 
RemoteException;
-
-       void setTransactionIdClass(Class<? extends TransactionId<?>> 
transactionIdClass) throws RemoteException;
-
-       void addCatalog(Catalog catalog) throws RemoteException;
-       
-       void addCatalog(Catalog catalog, boolean allowOverride) throws 
RemoteException;
-       
-       void removeCatalog(String catalogUrn) throws RemoteException;
-
-       void removeCatalog(String catalogUrn, boolean preserveMapping) throws 
RemoteException;
-
-       Set<Catalog> getCurrentCatalogList() throws RemoteException;
-       
-       Catalog getCatalog(String catalogUrn) throws RemoteException;
-
-       Set<String> getCurrentCatalogIds() throws RemoteException;
-               
-       TransactionId<?> ingest(Metadata metadata) throws RemoteException;
-       
-       void delete(Metadata metadata) throws RemoteException;
-       
-       List<String> getProperty(String key) throws RemoteException;
-
-       Properties getCalalogProperties() throws RemoteException;
-       
-       Properties getCalalogProperties(String catalogUrn) throws 
RemoteException;
-       
-       QueryPager query(QueryExpression queryExpression) throws 
RemoteException;
-       
-       QueryPager query(QueryExpression queryExpression, boolean sortResults) 
throws RemoteException;
- 
-       Set<TransactionalMetadata> getNextPage(QueryPager queryPager) throws 
RemoteException;
-
-       Set<TransactionId<?>> getTransactionIdsForAllPages(QueryPager 
queryPager) throws RemoteException;
-       
-       Set<TransactionalMetadata> getAllPages(QueryPager queryPager) throws 
RemoteException;
-       
-       Set<TransactionalMetadata> 
getMetadataFromTransactionIdStrings(List<String> 
catalogServiceTransactionIdStrings) throws RemoteException;
-       
-       Set<TransactionalMetadata> 
getMetadataFromTransactionIds(List<TransactionId<?>> 
catalogServiceTransactionIds) throws RemoteException;
-       
-       Set<TransactionId<?>> 
getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds,
-                                                                               
                                  String catalogUrn) throws RemoteException;
-       
-       TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> 
catalogTransactionId, String catalogUrn) throws RemoteException;
-       
-       TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> 
catalogTransactionId, String catalogUrn,
-                                                                               
                        boolean generateNew) throws RemoteException;
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java
deleted file mode 100644
index 9c25ab7..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelClientMBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel.rmi;
-
-/**
- * 
- * @author bfoster
- * @version $Revision$
- *
- */
-public interface RmiCommunicationChannelClientMBean {
-
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
deleted file mode 100644
index c03000b..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/rmi/RmiCommunicationChannelServer.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel.rmi;
-
-//JDK imports
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-//OODT imports
-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;
-
-/**
- * 
- * @author bfoster
- * @version $Revision$
- *
- */
-public class RmiCommunicationChannelServer implements
-               CommunicationChannelServer {
-
-       public void shutdown() throws IOException {
-               // TODO Auto-generated method stub
-
-       }
-
-       public void startup() {
-               // TODO Auto-generated method stub
-
-       }
-
-       public void addCatalog(Catalog catalog) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addCatalog(String catalogId, Index index) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addCatalog(String catalogId, Index index,
-                       List<Dictionary> dictionaries) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addCatalog(String catalogId, Index index,
-                       List<Dictionary> dictionaries, boolean 
restrictQueryPermission,
-                       boolean restrictIngestPermission) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addDictionary(String catalogId, Dictionary dictionary)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void addPluginUrls(List<PluginURL> pluginURLs) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void delete(Metadata metadata) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public List<TransactionalMetadata> getAllPages(QueryPager queryPager)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Properties getCalalogProperties() throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Properties getCalalogProperties(String catalogUrn) throws 
Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public TransactionId<?> getCatalogServiceTransactionId(
-                       TransactionId<?> catalogTransactionId, String 
catalogUrn)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public TransactionId<?> getCatalogServiceTransactionId(
-                       CatalogReceipt catalogReceipt, boolean generateNew)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionId<?>> getCatalogServiceTransactionIds(
-                       List<TransactionId<?>> catalogTransactionIds, String 
catalogUrn)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Set<String> getCurrentCatalogIds() throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getMetadata(Page page) throws 
Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(
-                       List<String> catalogServiceTransactionIdStrings) throws 
Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getMetadataFromTransactionIds(
-                       List<TransactionId<?>> catalogServiceTransactionIds)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Page getNextPage(Page page) throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<TransactionalMetadata> getNextPage(QueryPager queryPager)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression)
-                       throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression,
-                       Set<String> catalogIds) throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public URL getPluginStorageDir() throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public List<PluginURL> getPluginUrls() throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public int getPort() {
-               // TODO Auto-generated method stub
-               return 0;
-       }
-
-       public List<String> getProperty(String key) throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public TransactionReceipt ingest(Metadata metadata) throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public boolean isRestrictIngestPermissions() throws Exception {
-               // TODO Auto-generated method stub
-               return false;
-       }
-
-       public boolean isRestrictQueryPermissions() throws Exception {
-               // TODO Auto-generated method stub
-               return false;
-       }
-
-       public void modifyIngestPermission(String catalogId,
-                       boolean restrictIngestPermission) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void modifyQueryPermission(String catalogId,
-                       boolean restrictQueryPermission) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public QueryPager query(QueryExpression queryExpression) throws 
Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public QueryPager query(QueryExpression queryExpression,
-                       Set<String> catalogIds) throws Exception {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       public void removeCatalog(String catalogUrn) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void replaceCatalog(Catalog catalog) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void replaceDictionaries(String catalogId,
-                       List<Dictionary> dictionaries) throws Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void replaceIndex(String catalogId, Index index) throws 
Exception {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void setCatalogService(CatalogService catalogService) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       public void setPort(int port) {
-               // TODO Auto-generated method stub
-               
-       }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
deleted file mode 100644
index 51b27b4..0000000
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oodt.cas.catalog.server.channel.xmlrpc;
-
-import org.apache.oodt.cas.catalog.exception.CatalogException;
-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;
-import org.apache.xmlrpc.CommonsXmlRpcTransportFactory;
-import org.apache.xmlrpc.XmlRpcClient;
-import org.apache.xmlrpc.XmlRpcException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Vector;
-
-/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * A Communication Channel Client over XML-RPC
- * <p>
- */
-public class XmlRpcCommunicationChannelClient extends 
AbstractCommunicationChannelClient {
-
-  public static final int INT = 60;
-  protected XmlRpcClient client;
-       protected int chunkSize;
-       
-       public XmlRpcCommunicationChannelClient(URL serverUrl, int 
connectionTimeout, int requestTimeout, int chunkSize) {
-               super();
-        CommonsXmlRpcTransportFactory transportFactory = new 
CommonsXmlRpcTransportFactory(serverUrl);
-        transportFactory.setConnectionTimeout(connectionTimeout * INT * 1000);
-        transportFactory.setTimeout(requestTimeout * INT * 1000);
-               this.client = new XmlRpcClient(serverUrl, transportFactory);
-               this.chunkSize = chunkSize;
-       }
-       
-       public void shutdown() throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_shutdown", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Shutdown Failed: "+ e.getMessage(), 
e);
-         } catch (IOException e) {
-               throw new CatalogException("Shutdown Failed: "+ e.getMessage(), 
e);
-         }
-       }
-
-       public void addCatalog(Catalog catalog) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(catalog));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_addCatalog", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public void replaceCatalog(Catalog catalog) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(catalog));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_replaceCatalog", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Replace Catalog Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Replace Catalog Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public void addCatalog(String catalogId, Index index) throws 
CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               args.add(this.serializer.serializeObject(index));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_addCatalog", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               args.add(this.serializer.serializeObject(index));
-               args.add(this.serializer.serializeObject(dictionaries));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_addCatalog", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public void addCatalog(String catalogId, Index index, List<Dictionary> 
dictionaries, boolean restrictQueryPermission, boolean 
restrictIngestPermission) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               args.add(this.serializer.serializeObject(index));
-               args.add(this.serializer.serializeObject(dictionaries));
-               args.add(restrictQueryPermission);
-               args.add(restrictIngestPermission);
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_addCatalog", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Add Catalog Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public void addDictionary(String catalogId, Dictionary dictionary) 
throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               args.add(this.serializer.serializeObject(dictionary));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_addDictionary", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Add Dictionary: "+ e.getMessage(), 
e);
-         } catch (IOException e) {
-               throw new CatalogException("Add Dictionary: "+ e.getMessage(), 
e);
-         }
-       }
-       
-       public void replaceDictionaries(String catalogId, List<Dictionary> 
dictionaries) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               args.add(this.serializer.serializeObject(dictionaries));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_addDictionary", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Replace Dictionaries Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Replace Dictionaries Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public void replaceIndex(String catalogId, Index index) throws 
CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               args.add(this.serializer.serializeObject(index));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_replaceIndex", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Replace Index Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Replace Index Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public void modifyIngestPermission(String catalogId, boolean 
restrictIngestPermission) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               
args.add(this.serializer.serializeObject(restrictIngestPermission));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_modifyIngestPermission", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Modify Ingest Permission Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Modify Ingest Permission Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public void modifyQueryPermission(String catalogId, boolean 
restrictQueryPermission) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogId);
-               
args.add(this.serializer.serializeObject(restrictQueryPermission));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_modifyQueryPermission", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Modify Query Permission Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Modify Query Permission Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public List<PluginURL> getPluginUrls() throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getPluginUrls", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Plugins Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Plugins Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public void addPluginUrls(List<PluginURL> pluginURLs) throws 
CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(pluginURLs));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_addPluginUrls", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Add Plugins Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Add Plugins Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public URL getPluginStorageDir() throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-         try {
-               return this.serializer.deserializeObject(URL.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getPluginStorageDir", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Plugin Storage Dir Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Plugin Storage Dir Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public void transferUrl(URL fromUrl, URL toURL) throws CatalogException 
{
-               System.out.println("Transfering '" + fromUrl + "' to '" + toURL 
+ "'");
-        FileInputStream is = null;
-        try {
-            byte[] buf = new byte[this.chunkSize];
-               is = new FileInputStream(new File(fromUrl.getPath()));
-            int offset = 0;
-            int numBytes;
-               while ((numBytes = is.read(buf, offset, chunkSize)) != -1) {
-                         this.transferFile(new 
File(toURL.getPath()).getAbsolutePath(), buf, offset, numBytes);
-                       }
-        } catch (FileNotFoundException e) {
-                 throw new CatalogException("Transfer URL Failed: "+ 
e.getMessage(), e);
-               } catch (IOException e) {
-                 throw new CatalogException("Transfer URL Failed: "+ 
e.getMessage(), e);
-               } finally {
-               try {
-                       is.close();
-               }catch(Exception ignored) {}
-        }
-       }
-       
-    protected void transferFile(String filePath, byte[] fileData, int offset,
-            int numBytes) throws CatalogException {
-        Vector<Object> argList = new Vector<Object>();
-        argList.add(filePath);
-        argList.add(fileData);
-        argList.add(offset);
-        argList.add(numBytes);
-         try {
-               
client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_transferFile", argList);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Transfer File Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Transfer File Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public void delete(Metadata metadata) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(metadata));
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_delete", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Delete Failed: "+ e.getMessage(), 
e);
-         } catch (IOException e) {
-               throw new CatalogException("Delete Failed: "+ e.getMessage(), 
e);
-         }
-       }
-
-       public List<TransactionalMetadata> getAllPages(QueryPager queryPager) 
throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryPager));
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getAllPages", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get All Pages Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get All Pages Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public Properties getCalalogProperties() throws CatalogException {
-         try {
-               return this.serializer.deserializeObject(Properties.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getCalalogProperties", new Vector<Object>()));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Catalog Properties Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Catalog Properties Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public Properties getCalalogProperties(String catalogUrn)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogUrn);
-         try {
-               return this.serializer.deserializeObject(Properties.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getCalalogProperties", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Catalog Properties Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Catalog Properties Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public TransactionId<?> getCatalogServiceTransactionId(
-                       TransactionId<?> catalogTransactionId, String 
catalogUrn)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(catalogTransactionId));
-               args.add(catalogUrn);
-         try {
-               return this.serializer.deserializeObject(TransactionId.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getCatalogServiceTransactionId", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Catalog Service Transaction 
Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Catalog Service Transaction 
Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public TransactionId<?> getCatalogServiceTransactionId(
-                       CatalogReceipt catalogReceipt,
-                       boolean generateNew) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(catalogReceipt));
-               args.add(this.serializer.serializeObject(generateNew));
-         try {
-               return this.serializer.deserializeObject(TransactionId.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getCatalogServiceTransactionId2", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Catalog Services Transaction Id 
Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Catalog Services Transaction Id 
Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public List<TransactionId<?>> getCatalogServiceTransactionIds(
-                       List<TransactionId<?>> catalogTransactionIds, String 
catalogUrn)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               
args.add(this.serializer.serializeObject(catalogTransactionIds));
-               args.add(catalogUrn);
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getCatalogServiceTransactionId", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Catalog Service Transaction Ids 
Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Catalog Service Transaction Ids 
Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public Set<String> getCurrentCatalogIds() throws CatalogException {
-         try {
-               return this.serializer.deserializeObject(Set.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getCurrentCatalogIds", new Vector<Object>()));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Curent Catalog Ids Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Current Catalog Ids Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(
-                       List<String> catalogServiceTransactionIdStrings)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               
args.add(this.serializer.serializeObject(catalogServiceTransactionIdStrings));
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getMetadataFromTransactionIdStrings", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Metadata From Transaction Id 
Strings Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Metadata From Transaction Id 
String Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public List<TransactionalMetadata> getMetadataFromTransactionIds(
-                       List<TransactionId<?>> catalogServiceTransactionIds)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               
args.add(this.serializer.serializeObject(catalogServiceTransactionIds));
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getMetadataFromTransactionIds", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Metadata Transaction Ids 
Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Metadata Transaction Ids 
Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public List<TransactionalMetadata> getNextPage(QueryPager queryPager)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryPager));
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getNextPage", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Next Page Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Next Page Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public List<String> getProperty(String key) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(key);
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getProperty", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Property Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Property Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public Class<? extends TransactionId<?>> getTransactionIdClass() throws 
CatalogException {
-         try {
-               return this.serializer.deserializeObject(Class.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getTransactionIdClass", new Vector<Object>()));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Transaction Id Class Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Transaction Id Calss Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public List<TransactionId<?>> getTransactionIdsForAllPages(
-                       QueryPager queryPager) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryPager));
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getTransactionIdsForAllPages", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Transaction Ids For All Pages 
Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Transaction Ids For All Pages 
Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public TransactionReceipt ingest(Metadata metadata)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(metadata));
-         try {
-               return 
this.serializer.deserializeObject(TransactionReceipt.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_ingest", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Ingest Failed: "+ e.getMessage(), 
e);
-         } catch (IOException e) {
-               throw new CatalogException("Ingest Failed: "+ e.getMessage(), 
e);
-         }
-       }
-
-       public boolean isRestrictIngestPermissions() throws CatalogException {
-         try {
-               return this.serializer.deserializeObject(Boolean.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_isRestrictIngestPermissions", new Vector<Object>()));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Is Restrict Ingest Permissions 
Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Is Restrict Ingest Permissions 
Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public boolean isRestrictQueryPermissions() throws CatalogException {
-         try {
-               return this.serializer.deserializeObject(Boolean.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_isRestrictQueryPermissions", new Vector<Object>()));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Is Restrict Query Permissions 
Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Is Restrict Query Permissions 
Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public Page getFirstPage(QueryExpression queryExpression) throws 
CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryExpression));
-         try {
-               return this.serializer.deserializeObject(Page.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getFirstPage", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get First Page Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get First Page Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public Page getFirstPage(QueryExpression queryExpression, Set<String> 
catalogIds) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryExpression));
-               args.add(this.serializer.serializeObject(catalogIds));
-         try {
-               return this.serializer.deserializeObject(Page.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getFirstPage", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get First Page Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get First Page Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public Page getNextPage(Page page) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(page));
-         try {
-               return this.serializer.deserializeObject(Page.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getNextPage2", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Next Page Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Next Page Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) 
throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(pageInfo));
-               args.add(this.serializer.serializeObject(queryExpression));
-         try {
-               return this.serializer.deserializeObject(Page.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getPage", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Page Failed: "+ e.getMessage(), 
e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Page Failed: "+ e.getMessage(), 
e);
-         }
-       }
-       
-       public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, 
Set<String> catalogIds) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(pageInfo));
-               args.add(this.serializer.serializeObject(queryExpression));
-               args.add(this.serializer.serializeObject(catalogIds));
-         try {
-               return this.serializer.deserializeObject(Page.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getPage", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Page Failed: "+ e.getMessage(), 
e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Page Failed: "+ e.getMessage(), 
e);
-         }
-       }
-       
-       public Page getLastPage(QueryExpression queryExpression) throws 
CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryExpression));
-         try {
-               return this.serializer.deserializeObject(Page.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getLastPage", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Last Page Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Last Page Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-       public Page getLastPage(QueryExpression queryExpression, Set<String> 
catalogIds) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryExpression));
-               args.add(this.serializer.serializeObject(catalogIds));
-         try {
-               return this.serializer.deserializeObject(Page.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getLastPage", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Last Page Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Last Page Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public List<TransactionalMetadata> getMetadata(Page page) throws 
CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(page));
-         try {
-               return this.serializer.deserializeObject(List.class, (String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_getMetadata", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Get Metadata Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Get Metadata Failed: "+ 
e.getMessage(), e);
-         }
-       }
-       
-       public QueryPager query(QueryExpression queryExpression)
-                       throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryExpression));
-         try {
-               return this.serializer.deserializeObject(QueryPager.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_query", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Query Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Query Failed: "+ e.getMessage(), e);
-         }
-       }
-
-       public QueryPager query(QueryExpression queryExpression, Set<String> 
catalogIds) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(this.serializer.serializeObject(queryExpression));
-               args.add(this.serializer.serializeObject(catalogIds));
-         try {
-               return this.serializer.deserializeObject(QueryPager.class, 
(String) 
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_query", args));
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Query Failed: "+ e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Query Failed: "+ e.getMessage(), e);
-         }
-       }
-
-
-       public void removeCatalog(String catalogUrn) throws CatalogException {
-               Vector<Object> args = new Vector<Object>();
-               args.add(catalogUrn);
-         try {
-               
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + 
".xmlrpc_removeCatalog", args);
-         } catch (XmlRpcException e) {
-               throw new CatalogException("Remove Catalog Failed: "+ 
e.getMessage(), e);
-         } catch (IOException e) {
-               throw new CatalogException("Remove Catalog Failed: "+ 
e.getMessage(), e);
-         }
-       }
-
-
-
-}

Reply via email to