Author: mattmann
Date: Mon Sep 17 15:31:33 2012
New Revision: 1386660
URL: http://svn.apache.org/viewvc?rev=1386660&view=rev
Log:
- wrap up OODT-498: Overwrite and bring back 0.3 ThreadPoolWorkflowEngine plus
patches
- fix unit tests, and ensure there is enough time for 2 workflow instances to
persist
- fix inconsistent logging in tests
- more definitive message for resource manager URL loading
Modified:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java
oodt/trunk/workflow/src/main/resources/logging.properties
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java
oodt/trunk/workflow/src/testdata/test.logging.properties
Modified:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java?rev=1386660&r1=1386659&r2=1386660&view=diff
==============================================================================
---
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java
(original)
+++
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java
Mon Sep 17 15:31:33 2012
@@ -21,6 +21,8 @@ import static java.lang.Boolean.getBoole
import static java.lang.Integer.getInteger;
import static java.lang.Long.getLong;
import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
//OODT imports
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
@@ -34,6 +36,9 @@ import org.apache.oodt.cas.workflow.util
*/
public class ThreadPoolWorkflowEngineFactory implements WorkflowEngineFactory {
+ private static final Logger LOG = Logger
+ .getLogger(ThreadPoolWorkflowEngineFactory.class.getName());
+
private static final String INSTANCE_REPO_FACTORY_PROPERTY =
"workflow.engine.instanceRep.factory";
private static final String QUEUE_SIZE_PROPERTY =
"org.apache.oodt.cas.workflow.engine.queueSize";
private static final String MAX_POOL_SIZE_PROPERTY =
"org.apache.oodt.cas.workflow.engine.maxPoolSize";
@@ -64,7 +69,10 @@ public class ThreadPoolWorkflowEngineFac
try {
return new URL(System.getProperty(RESMGR_URL_PROPERTY));
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(
+ Level.INFO,
+ "No Resource Manager URL provided or malformed URL: executing jobs "
+
+ "locally. URL: ["+System.getProperty(RESMGR_URL_PROPERTY)+"]");
return null;
}
}
Modified: oodt/trunk/workflow/src/main/resources/logging.properties
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/resources/logging.properties?rev=1386660&r1=1386659&r2=1386660&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/resources/logging.properties (original)
+++ oodt/trunk/workflow/src/main/resources/logging.properties Mon Sep 17
15:31:33 2012
@@ -57,6 +57,7 @@ org.apache.commons.httpclient.level = IN
httpclient.wire.header.level = INFO
httpclient.wire.level = INFO
sun.net.level = OFF
+sun.net.www.level = OFF
# spring framework logging
org.springframework.beans.level = SEVERE
Modified:
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java?rev=1386660&r1=1386659&r2=1386660&view=diff
==============================================================================
---
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java
(original)
+++
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java
Mon Sep 17 15:31:33 2012
@@ -55,14 +55,21 @@ public class TestXmlRpcWorkflowManager e
.getLogger(TestXmlRpcWorkflowManager.class.getName());
public void testGetWorkflowInstances() {
+
Vector workflowInsts = null;
- try {
- workflowInsts = wmgr.getWorkflowInstances();
- } catch (Exception e) {
- e.printStackTrace();
+
+ int numInsts = -1;
+ while (numInsts != 2) {
+ try {
+ workflowInsts = wmgr.getWorkflowInstances();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ assertNotNull(workflowInsts);
+ numInsts = workflowInsts.size();
}
- assertNotNull(workflowInsts);
assertEquals(2, workflowInsts.size());
}
@@ -132,13 +139,13 @@ public class TestXmlRpcWorkflowManager e
System
.setProperty("org.apache.oodt.cas.workflow.instanceRep.lucene.idxPath",
luceneCatLoc);
-
try {
System.setProperty("org.apache.oodt.cas.workflow.repo.dirs", "file://"
+ new File("./src/main/resources/examples").getCanonicalPath());
- System.setProperty("org.apache.oodt.cas.workflow.lifecycle.filePath",
- new
File("./src/main/resources/examples/workflow-lifecycle.xml").getCanonicalPath());
+ System.setProperty("org.apache.oodt.cas.workflow.lifecycle.filePath",
+ new File("./src/main/resources/examples/workflow-lifecycle.xml")
+ .getCanonicalPath());
} catch (Exception e) {
fail(e.getMessage());
}
Modified: oodt/trunk/workflow/src/testdata/test.logging.properties
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/testdata/test.logging.properties?rev=1386660&r1=1386659&r2=1386660&view=diff
==============================================================================
--- oodt/trunk/workflow/src/testdata/test.logging.properties (original)
+++ oodt/trunk/workflow/src/testdata/test.logging.properties Mon Sep 17
15:31:33 2012
@@ -48,4 +48,6 @@ org.apache.oodt.cas.workflow.system.leve
org.apache.commons.httpclient.level = INFO
httpclient.wire.header.level = INFO
httpclient.wire.level = INFO
+sun.net.level = OFF
+sun.net.www.level = OFF
