svn commit: r1052011 - in /oodt/trunk: ./ catalog/src/main/java/org/apache/oodt/cas/catalog/system/ catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/ catalog/src/test/org/apache/oodt/cas/catalog/system/impl/

[bfoster]

Author: bfoster
Date: Wed Dec 22 17:56:34 2010
New Revision: 1052011

URL: http://svn.apache.org/viewvc?rev=1052011&view=rev
Log:

- cas-catalog should now requires a metadata flag for allowing Transaction 
updates

-----------------------

OODT-102

Modified:
    oodt/trunk/CHANGES.txt
    
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
    
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
    
oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java

Modified: oodt/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1052011&r1=1052010&r2=1052011&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Dec 22 17:56:34 2010
@@ -4,6 +4,8 @@ Apache OODT Change Log
 Release 0.2 (Current Development)
 --------------------------------------------
 
+* OODT-192 cas-catalog should require a metadata flag for allowing Transaction 
updates (bfoster)
+
 * 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)

Modified: 
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java?rev=1052011&r1=1052010&r2=1052011&view=diff
==============================================================================
--- 
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
 (original)
+++ 
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/CatalogService.java
 Wed Dec 22 17:56:34 2010
@@ -49,6 +49,7 @@ public interface CatalogService {
                
        public static final String CATALOG_SERVICE_TRANSACTION_ID_MET_KEY = 
"urn:CatalogService:TransactionId";
        public static final String CATALOG_IDS_MET_KEY = 
"urn:CatalogService:CatalogIds";
+       public static final String ENABLE_UPDATE_MET_KEY = 
"urn:CatalogService:EnableUpdate";
        public static final String CATALOG_TRANSACTION_ID_MET_KEY = 
"urn:Catalog:TransactionId";
        public static final String CATALOG_ID_MET_KEY = "urn:Catalog:Id";
 

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=1052011&r1=1052010&r2=1052011&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
 Wed Dec 22 17:56:34 2010
@@ -504,6 +504,8 @@ public class CatalogServiceLocal impleme
                                        try {
                                                // perform update
                                                if (performUpdate) {
+                                                       if 
(!Boolean.parseBoolean(metadata.getMetadata(ENABLE_UPDATE_MET_KEY)))
+                                                               throw new 
CatalogServiceException("TransactionId '" + catalogServiceTransactionId + "' 
already exists -- enable update by setting metadata key '" + 
ENABLE_UPDATE_MET_KEY + "'=true");
                                                        TransactionId<?> 
catalogTransactionId = 
this.ingestMapper.getCatalogTransactionId(catalogServiceTransactionId, 
catalog.getId());
                                                        if 
(catalogTransactionId != null) {
                                                                CatalogReceipt 
catalogReceipt = catalog.update(catalogTransactionId, metadata);

Modified: 
oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java?rev=1052011&r1=1052010&r2=1052011&view=diff
==============================================================================
--- 
oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
 (original)
+++ 
oodt/trunk/catalog/src/test/org/apache/oodt/cas/catalog/system/impl/TestCatalogServiceLocal.java
 Wed Dec 22 17:56:34 2010
@@ -102,6 +102,7 @@ public class TestCatalogServiceLocal ext
 
                //test ingest update
                
m.replaceMetadata(CatalogServiceLocal.CATALOG_SERVICE_TRANSACTION_ID_MET_KEY.toString(),
 tr.getTransactionId().toString());
+               m.replaceMetadata(CatalogServiceLocal.ENABLE_UPDATE_MET_KEY, 
"true");
                tr = cs.ingest(m);
                receipts = new Vector<TransactionReceipt>();
                receipts.add(tr);