svn commit: r1423001 - in /oodt/trunk/curator/src/main: java/org/apache/oodt/cas/curation/service/MetadataResource.java java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java webapp/META-INF/context.xml

[luca]

Author: luca
Date: Mon Dec 17 16:17:02 2012
New Revision: 1423001

URL: http://svn.apache.org/viewvc?rev=1423001&view=rev
Log:
Allow for customizable CatalogFactory back-end to Curator web app (OODT-545)

Modified:
    
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
    
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java
    oodt/trunk/curator/src/main/webapp/META-INF/context.xml

Modified: 
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java?rev=1423001&r1=1423000&r2=1423001&view=diff
==============================================================================
--- 
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
 (original)
+++ 
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java
 Mon Dec 17 16:17:02 2012
@@ -87,9 +87,11 @@ public class MetadataResource extends Cu
   
   @Context
   UriInfo uriInfo;
+  
+  @Context 
+  private ServletContext context;
 
   private static final long serialVersionUID = 1930946924218765724L;
-  private final static String CATALOG_FACTORY_CLASS = 
"org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory";
 
   public static final String STAGING = "staging";
 
@@ -98,13 +100,13 @@ public class MetadataResource extends Cu
   public static final String PRODUCT_TYPE = "productType";
   
   public static final String UPDATE = "update";
-  
+    
   public MetadataResource(){
     
   }
 
   public MetadataResource(@Context ServletContext context) {
-
+       
   }
 
   @GET
@@ -264,6 +266,7 @@ public class MetadataResource extends Cu
   @Produces("text/plain")
   public String setCatalogMetadata(MultivaluedMap<String, String> formParams,
       @FormParam("id") String id) {
+       
     Product prod;
     Metadata metadata = this.getMetadataFromMap(formParams);
     
@@ -518,7 +521,7 @@ public class MetadataResource extends Cu
       
       System.getProperties().load( new 
FileInputStream(CurationService.config.getFileMgrProps()) );
       Catalog catalog = GenericFileManagerObjectFactory
-                      .getCatalogServiceFromFactory(CATALOG_FACTORY_CLASS);
+                      
.getCatalogServiceFromFactory(this.getCatalogFactoryClass());
       
       // retrieve existing metadata
       metadata = catalog.getMetadata(product);
@@ -579,7 +582,7 @@ public class MetadataResource extends Cu
     System.getProperties().load(
         new FileInputStream(CurationService.config.getFileMgrProps()));
     Catalog catalog = GenericFileManagerObjectFactory
-        .getCatalogServiceFromFactory(CATALOG_FACTORY_CLASS);
+        .getCatalogServiceFromFactory(this.getCatalogFactoryClass());
     
     Metadata oldMetadata = catalog.getMetadata(product);
     List<Reference> references = catalog.getProductReferences(product);
@@ -642,4 +645,12 @@ public class MetadataResource extends Cu
     }
     return retStr;
   }
+  
+  private String getCatalogFactoryClass() {
+       String catalogFactoryClass = 
this.context.getInitParameter(CATALOG_FACTORY_CLASS);
+       // preserve backward compatibility
+       if (!StringUtils.hasText(catalogFactoryClass))
+               catalogFactoryClass = 
"org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory";
+       return catalogFactoryClass;
+  }
 }

Modified: 
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java?rev=1423001&r1=1423000&r2=1423001&view=diff
==============================================================================
--- 
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java
 (original)
+++ 
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/servlet/CuratorConfMetKeys.java
 Mon Dec 17 16:17:02 2012
@@ -50,4 +50,7 @@ public interface CuratorConfMetKeys {
   final String MET_EXTENSION = "org.apache.oodt.cas.curator.metExtension";
   
   final String FM_PROPS = "org.apache.oodt.cas.curator.fmProps";
+  
+  final String CATALOG_FACTORY_CLASS = 
"org.apache.oodt.cas.curator.catalogFactoryClass";
+  
 }

Modified: oodt/trunk/curator/src/main/webapp/META-INF/context.xml
URL: 
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/webapp/META-INF/context.xml?rev=1423001&r1=1423000&r2=1423001&view=diff
==============================================================================
--- oodt/trunk/curator/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/curator/src/main/webapp/META-INF/context.xml Mon Dec 17 16:17:02 
2012
@@ -43,5 +43,8 @@ the License.
            
        <Parameter name="org.apache.oodt.security.sso.implClass"
                  value="org.apache.oodt.security.sso.DummyImpl"/>
+                 
+       <Parameter name="org.apache.oodt.cas.curator.catalogFactoryClass" 
+                          
value="org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory" />
 
 </Context>