Working on labcas

Author: LucaCinquini

common/src/main/java/gov/nasa/jpl/edrn/labcas/FileManagerUtils.java

@@ -35,6 +35,16 @@ public class FileManagerUtils {
 	}
 
 	private static final Logger LOG = Logger.getLogger(FileManagerUtils.class.getName());
+	
+	public static void reload() throws Exception {
+		
+		XmlRpcFileManagerClient client = new XmlRpcFileManagerClient(new URL(FILEMANAGER_URL));
+		
+		boolean status = client.refreshConfigAndPolicy();
+		LOG.info("File Manager reoloaded, status="+status);
+		Thread.sleep(5000); // FIXME: sleep 5 seconds
+		
+	}
 
 	/**
 	 * Method to add a new dataset, or update an existing dataset, into the File Manager.
@@ -93,11 +103,7 @@ public static void updateDataset(String dataset) throws Exception {
 		File productTypesXmlFile = new File(FileManagerUtils.getDatasetDir(dataset), "/policy/product-types.xml");
 		XmlStructFactory.writeProductTypeXmlDocument(producTypes, productTypesXmlFile.getAbsolutePath());
 		LOG.info("Written XML file="+ productTypesXmlFile.getAbsolutePath());
-		
-		// send updated object to the File Manager
-		String productTypeId = client.addProductType(productType);
-		LOG.info("Updated product type="+productTypeId);
-		
+				
 	}
 
 

common/src/main/java/gov/nasa/jpl/edrn/labcas/tasks/LabcasUpdateTaskInstance.java

@@ -31,6 +31,9 @@ public void run(Metadata metadata, WorkflowTaskConfiguration config) throws Work
 			// update dataset object in File Manager
 			FileManagerUtils.updateDataset(dataset);
 
+			// reload the catalog configuration so that the new product type is available for publishing
+			FileManagerUtils.reload();
+			
 
 		} catch(Exception e) {
 			e.printStackTrace();

common/src/main/java/gov/nasa/jpl/edrn/labcas/tasks/LabcasUploadInitTaskInstance.java

@@ -4,7 +4,6 @@
 import java.io.FilenameFilter;
 import java.util.logging.Logger;
 
-import org.apache.commons.lang.WordUtils;
 import org.apache.oodt.cas.metadata.Metadata;
 import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
 import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
@@ -78,7 +77,10 @@ public void run(Metadata metadata, WorkflowTaskConfiguration config) throws Work
 
 			// must upload the same product type through the File Manager XML/RPC interface so it can be used right away
 			// without waiting for the static XML metadata to be ingested at the next startup
-			Utils.addProductType(productType, datasetDescription, datasetMetadata);
+			//Utils.addProductType(productType, datasetDescription, datasetMetadata);
+			
+			// reload the catalog configuration so that the new product type is available for publishing
+			FileManagerUtils.reload();
 
 		} catch(Exception ioe) {
 			throw new WorkflowTaskInstanceException(ioe.getMessage());