Author: bfoster
Date: Tue Dec 21 16:56:27 2010
New Revision: 1051555
URL: http://svn.apache.org/viewvc?rev=1051555&view=rev
Log:
- updated throw messages in cas-catalog (removed blank messages)
------------------
OODT-95
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1051555&r1=1051554&r2=1051555&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Dec 21 16:56:27 2010
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.2 (Current Development)
--------------------------------------------
+* OODT-95 cas-catalog throws exceptions with blank messages (bfoster)
+
* OODT-98 Resource Manager TestXmlQueueRepository test fails on some computers
because <hashmap>.keySet() order is undefined (bfoster)
* OODT-97 Allow for unsorted paging across all catalogs to give option of
lowering heap footprint (bfoster)
Modified:
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java?rev=1051555&r1=1051554&r2=1051555&view=diff
==============================================================================
---
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
(original)
+++
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
Tue Dec 21 16:56:27 2010
@@ -65,7 +65,7 @@ public class DataSourceIngestMapper impl
stmt = conn.createStatement();
stmt.execute("DELETE FROM CatalogServiceMapper WHERE
CATALOG_ID = '" + catalogId + "'");
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -87,7 +87,7 @@ public class DataSourceIngestMapper impl
stmt.execute("DELETE FROM CatalogServiceMapper WHERE
CAT_SERV_TRANS_ID = '" + catalogServiceTransactionId + "'");
conn.commit();
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -109,7 +109,7 @@ public class DataSourceIngestMapper impl
stmt.execute("DELETE FROM CatalogServiceMapper WHERE
CAT_TRANS_ID = '" + catalogTransactionId + "' AND CATALOG_ID = '" + catalogId +
"'");
conn.commit();
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -136,7 +136,7 @@ public class DataSourceIngestMapper impl
return null;
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -166,7 +166,7 @@ public class DataSourceIngestMapper impl
return null;
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -197,7 +197,7 @@ public class DataSourceIngestMapper impl
return catalogIds;
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -233,7 +233,7 @@ public class DataSourceIngestMapper impl
return transactionIds;
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -259,7 +259,7 @@ public class DataSourceIngestMapper impl
rs = stmt.executeQuery("SELECT CAT_SERV_TRANS_ID FROM
CatalogServiceMapper WHERE CAT_SERV_TRANS_ID = '"+ catalogServiceTransactionId
+ "'");
return rs.next();
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -295,7 +295,7 @@ public class DataSourceIngestMapper impl
+ catalogReceipt.getCatalogId() + "')");
conn.commit();
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
@@ -325,7 +325,7 @@ public class DataSourceIngestMapper impl
return null;
}
}catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}finally {
try {
conn.close();
Modified:
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java?rev=1051555&r1=1051554&r2=1051555&view=diff
==============================================================================
---
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
(original)
+++
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/repository/SpringCatalogRepository.java
Tue Dec 21 16:56:27 2010
@@ -55,7 +55,7 @@ public class SpringCatalogRepository imp
appContext.refresh();
return new
HashSet<Catalog>(appContext.getBeansOfType(Catalog.class).values());
} catch (Exception e) {
- throw new CatalogRepositoryException("", e);
+ throw new CatalogRepositoryException(e.getMessage(), e);
}
}
Modified:
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java?rev=1051555&r1=1051554&r2=1051555&view=diff
==============================================================================
---
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
(original)
+++
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/Catalog.java
Tue Dec 21 16:56:27 2010
@@ -169,7 +169,7 @@ public class Catalog {
return null;
}
}catch (Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
@@ -193,7 +193,7 @@ public class Catalog {
return null;
}
}catch (Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
@@ -207,7 +207,7 @@ public class Catalog {
return false;
}
}catch (Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
@@ -227,7 +227,7 @@ public class Catalog {
return false;
}
}catch(Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
@@ -244,7 +244,7 @@ public class Catalog {
return Collections.emptyList();
}
}catch (Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
@@ -290,7 +290,7 @@ public class Catalog {
return new Metadata();
}
}catch(Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
@@ -307,7 +307,7 @@ public class Catalog {
}
return metadataMap;
}catch(Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
@@ -322,7 +322,7 @@ public class Catalog {
return true;
}
}catch(Exception e) {
- throw new CatalogException("", e);
+ throw new CatalogException(e.getMessage(), e);
}
}
Modified:
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java?rev=1051555&r1=1051554&r2=1051555&view=diff
==============================================================================
---
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java
(original)
+++
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceClient.java
Tue Dec 21 16:56:27 2010
@@ -64,7 +64,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.shutdown();
}catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -81,7 +81,7 @@ public class CatalogServiceClient implem
}
return serverSideUrls;
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -89,7 +89,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.addCatalog(catalog);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -98,7 +98,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.replaceCatalog(catalog);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -107,7 +107,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.addCatalog(catalogId,
index);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -115,7 +115,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.addCatalog(catalogId,
index, dictionaries);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -124,7 +124,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.addCatalog(catalogId,
index, dictionaries, restrictQueryPermission, restrictIngestPermission);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -133,7 +133,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.addDictionary(catalogId, dictionary);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -141,7 +141,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.replaceDictionaries(catalogId, dictionaries);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -150,7 +150,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.modifyIngestPermission(catalogId,
restrictIngestPermission);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -159,7 +159,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.modifyQueryPermission(catalogId,
restrictQueryPermission);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -168,7 +168,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.replaceIndex(catalogId,
index);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -176,7 +176,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.removeCatalog(catalogId);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -184,7 +184,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getPluginStorageDir();
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -192,7 +192,7 @@ public class CatalogServiceClient implem
try {
return this.communicationChannelClient.getPluginUrls();
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -200,7 +200,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.addPluginUrls(this.transferToServerSide(urls));
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -208,7 +208,7 @@ public class CatalogServiceClient implem
try {
this.communicationChannelClient.delete(metadata);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -226,7 +226,7 @@ public class CatalogServiceClient implem
}
return metadata;
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -234,7 +234,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getCalalogProperties();
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -243,7 +243,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getCalalogProperties(catalogUrn);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -253,7 +253,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getCatalogServiceTransactionId(catalogTransactionId,
catalogUrn);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -262,7 +262,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getCatalogServiceTransactionId(catalogReceipt,
generateNew);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -272,7 +272,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getCatalogServiceTransactionIds(catalogTransactionIds,
catalogUrn);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -280,7 +280,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getCurrentCatalogIds();
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -290,7 +290,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getMetadataFromTransactionIdStrings(catalogServiceTransactionIdStrings);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -300,7 +300,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getMetadataFromTransactionIds(catalogServiceTransactionIds);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -309,7 +309,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getNextPage(queryPager);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -317,7 +317,7 @@ public class CatalogServiceClient implem
try {
return this.communicationChannelClient.getProperty(key);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -326,7 +326,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getTransactionIdsForAllPages(queryPager);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -335,7 +335,7 @@ public class CatalogServiceClient implem
try {
return this.communicationChannelClient.ingest(metadata);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -343,7 +343,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.isRestrictIngestPermissions();
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -351,7 +351,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.isRestrictQueryPermissions();
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -359,7 +359,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getNextPage(page);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -367,7 +367,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getPage(pageInfo, queryExpression);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -375,7 +375,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getPage(pageInfo, queryExpression, catalogIds);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -383,7 +383,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.getMetadata(page);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -392,7 +392,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.query(queryExpression);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -400,7 +400,7 @@ public class CatalogServiceClient implem
try {
return
this.communicationChannelClient.query(queryExpression, catalogIds);
} catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
Modified:
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java?rev=1051555&r1=1051554&r2=1051555&view=diff
==============================================================================
---
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
(original)
+++
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
Tue Dec 21 16:56:27 2010
@@ -426,7 +426,7 @@ public class CatalogServiceLocal impleme
try {
return this.catalogRepository.deserializePluginURLs();
}catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -436,7 +436,7 @@ public class CatalogServiceLocal impleme
currentUrls.addAll(urls);
this.catalogRepository.serializePluginURLs(currentUrls);
}catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -822,7 +822,7 @@ public class CatalogServiceLocal impleme
returnList.add(new
TransactionReceipt(transactionId, existing.get(transactionId)));
return returnList;
}catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}
}
@@ -836,7 +836,7 @@ public class CatalogServiceLocal impleme
// }
indexedReceipts.add(transactionReceipt);
}catch(Exception e) {
- throw new CatalogServiceException("", e);
+ throw new
CatalogServiceException(e.getMessage(), e);
}
}
return indexedReceipts;
@@ -927,7 +927,7 @@ public class CatalogServiceLocal impleme
try {
return
this.ingestMapper.getCatalogServiceTransactionId(catalogTransactionId,
catalogUrn);
}catch (Exception e) {
- throw new CatalogServiceException("", e);
+ throw new CatalogServiceException(e.getMessage(), e);
}finally {
this.ingestMapperLock.readLock().unlock();
}
