Author: luca
Date: Wed Jun 17 13:15:09 2015
New Revision: 1686008
URL: http://svn.apache.org/r1686008
Log:
Enabling recursive parsing of policy directories for Workflow Manager (OODT-854)
Modified:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepositoryFactory.java
oodt/trunk/workflow/src/main/resources/workflow.properties
Modified:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepositoryFactory.java?rev=1686008&r1=1686007&r2=1686008&view=diff
==============================================================================
---
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepositoryFactory.java
(original)
+++
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepositoryFactory.java
Wed Jun 17 13:15:09 2015
@@ -19,23 +19,30 @@
package org.apache.oodt.cas.workflow.repository;
//JDK imports
-import org.apache.oodt.cas.metadata.util.PathUtils;
-
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.commons.io.DirectorySelector;
+
+
/**
* @author mattmann
- * @version $Revsion$
+ * @author luca
+ * @version $Revision$
*
* <p>A Factory class for creating {@link XMLWorkflowRepository}s.</p>
*/
public class XMLWorkflowRepositoryFactory implements WorkflowRepositoryFactory
{
/* list of dir uris specifying file paths to workflow directories */
- private List workflowDirList = null;
+ private List<String> workflowDirList = null;
/* our log stream */
private static Logger LOG =
Logger.getLogger(XMLWorkflowRepositoryFactory.class.getName());
@@ -44,13 +51,49 @@ public class XMLWorkflowRepositoryFactor
* <p>Default Constructor</p>.
*/
public XMLWorkflowRepositoryFactory() {
+
String workflowDirUris =
System.getProperty("org.apache.oodt.cas.workflow.repo.dirs");
+ // only returns true if
org.apache.oodt.cas.workflow.repo.dirs.recursive=true
+ boolean recursive = Boolean.parseBoolean(
+
System.getProperty("org.apache.oodt.cas.workflow.repo.dirs.recursive") );
+
if(workflowDirUris != null){
/* do env var replacement */
workflowDirUris =
PathUtils.replaceEnvVariables(workflowDirUris);
String [] dirUris = workflowDirUris.split(",");
- workflowDirList = Arrays.asList(dirUris);
+
+ // recursive directory listing
+ if (recursive) {
+
+ // empty list
+ workflowDirList = new ArrayList<String>();
+
+ // loop over specified root directories,
+ // add directories and sub-directories that contain all
workflow related XML files
+ for (String rootDir : dirUris) {
+ try {
+
+ DirectorySelector dirsel = new
DirectorySelector(
+ Arrays.asList(
+ new String[]
{"events.xml", "tasks.xml", "conditions.xml"} ));
+ workflowDirList.addAll( dirsel.traverseDir(new
File(new URI(rootDir))) );
+
+ } catch (URISyntaxException e) {
+ LOG.log(Level.WARNING, "URISyntaxException when
traversing directory: "+rootDir);
+ }
+ }
+
+ // non-recursive directory listing
+ } else {
+ workflowDirList = Arrays.asList(dirUris);
+ }
+
+ LOG.log(Level.FINE,"Collecting XML workflows from the following
directories:");
+ for (String pdir : workflowDirList) {
+ LOG.log(Level.FINE, pdir);
+ }
+
}
}
Modified: oodt/trunk/workflow/src/main/resources/workflow.properties
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/resources/workflow.properties?rev=1686008&r1=1686007&r2=1686008&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/resources/workflow.properties (original)
+++ oodt/trunk/workflow/src/main/resources/workflow.properties Wed Jun 17
13:15:09 2015
@@ -67,6 +67,8 @@ org.apache.oodt.cas.workflow.instanceRep
# XML workflow repository properties
org.apache.oodt.cas.workflow.repo.dirs=file:///path/to/your/repo1,
file:///path/to/your/repo2
+# uncomment the following line and set the value to true to recursively parse
repository directories
+#org.apache.oodt.cas.workflow.repo.dirs.recursive=false
# wengine-style packaged workflow repo properties
org.apache.oodt.cas.workflow.wengine.packagedRepo.dir.path =
/path/to/wengine/workflow/files
