Modified: oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonWorkflowJob.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonWorkflowJob.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonWorkflowJob.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonWorkflowJob.java Tue Aug 13 20:51:05 2013 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,6 +18,9 @@ package org.apache.oozie.client.rest; import junit.framework.TestCase; + +import org.apache.oozie.WorkflowActionBean; +import org.apache.oozie.WorkflowJobBean; import org.apache.oozie.client.WorkflowJob; import java.util.Arrays; @@ -27,8 +30,8 @@ public class TestJsonWorkflowJob extends static String START_TIME = "Fri, 02 Jan 2009 00:00:00 GMT"; static String END_TIME = "Sat, 03 Jan 2009 00:00:00 GMT"; - static JsonWorkflowJob createWorkflow() { - JsonWorkflowJob wf = new JsonWorkflowJob(); + static WorkflowJobBean createWorkflow() { + WorkflowJobBean wf = new WorkflowJobBean(); wf.setAppPath("a"); wf.setAppName("b"); wf.setId("c"); @@ -45,7 +48,7 @@ public class TestJsonWorkflowJob extends } public void testProperties() { - JsonWorkflowJob wf = createWorkflow(); + WorkflowJobBean wf = createWorkflow(); assertEquals("a", wf.getAppPath()); assertEquals("b", wf.getAppName()); assertEquals("c", wf.getId()); @@ -60,7 +63,7 @@ public class TestJsonWorkflowJob extends assertEquals("cu", wf.getConsoleUrl()); assertEquals(0, wf.getActions().size()); - wf.setActions(Arrays.asList((JsonWorkflowAction) TestJsonWorkflowAction.createNode())); + wf.setActions(Arrays.asList((WorkflowActionBean) TestJsonWorkflowAction.createNode())); assertEquals(1, wf.getActions().size()); }
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java Tue Aug 13 20:51:05 2013 @@ -882,7 +882,7 @@ public class TestCoordActionInputCheckXC coordJob.setJobXml(appXml); coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); JPAService jpaService = Services.get().get(JPAService.class); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java Tue Aug 13 20:51:05 2013 @@ -493,7 +493,7 @@ public class TestCoordChangeXCommand ext coordJob.setJobXml(appXml); coordJob.setLastActionNumber(0); coordJob.setFrequency("5"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); try { coordJob.setStartTime(DateUtils.parseDateOozieTZ("2009-02-01T01:00Z")); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java Tue Aug 13 20:51:05 2013 @@ -1020,7 +1020,7 @@ public class TestCoordRerunXCommand exte coordJob.setJobXml(appXml); coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); try { coordJob.setStartTime(DateUtils.parseDateOozieTZ("2009-12-15T01:00Z")); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java Tue Aug 13 20:51:05 2013 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,9 +29,9 @@ import java.util.List; import java.util.TimeZone; import org.apache.hadoop.conf.Configuration; +import org.apache.oozie.CoordinatorActionBean; import org.apache.oozie.CoordinatorEngine; import org.apache.oozie.CoordinatorJobBean; -import org.apache.oozie.client.rest.JsonCoordinatorAction; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.CoordinatorJob; import org.apache.oozie.client.OozieClient; @@ -193,7 +193,7 @@ public class TestFutureActionsTimeOut ex assertTrue(actions.size() > 0); for (CoordinatorAction action : actions) { - JsonCoordinatorAction jsonAction = (JsonCoordinatorAction) action; + CoordinatorActionBean jsonAction = (CoordinatorActionBean) action; if (jsonAction.getNominalTime().before(createDate)) { assertEquals(10, jsonAction.getTimeOut()); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java Tue Aug 13 20:51:05 2013 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,9 +25,9 @@ import java.net.URL; import java.util.List; import org.apache.hadoop.conf.Configuration; -import org.apache.oozie.client.rest.JsonCoordinatorAction; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.CoordinatorJob; +import org.apache.oozie.CoordinatorActionBean; import org.apache.oozie.CoordinatorEngine; import org.apache.oozie.CoordinatorJobBean; import org.apache.oozie.client.OozieClient; @@ -156,7 +156,7 @@ public class TestPastActionsTimeOut exte assertTrue(actions.size() > 0); for (CoordinatorAction action : actions) { - JsonCoordinatorAction json = (JsonCoordinatorAction) action; + CoordinatorActionBean json = (CoordinatorActionBean) action; assertEquals(10, json.getTimeOut()); } } Modified: oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java Tue Aug 13 20:51:05 2013 @@ -129,7 +129,7 @@ public class TestCoordJobsGetForPurgeJPA coordJob.setJobXml(appXml); coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); try { coordJob.setStartTime(DateUtils.parseDateOozieTZ("2009-12-15T01:00Z")); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java Tue Aug 13 20:51:05 2013 @@ -117,7 +117,7 @@ public class TestCoordJobsToBeMaterializ coordJob.setJobXml(appXml); coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); try { coordJob.setStartTime(DateUtils.parseDateOozieTZ("2009-12-15T01:00Z")); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java Tue Aug 13 20:51:05 2013 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -137,7 +137,7 @@ public class TestCoordMaterializeTrigger coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); coordJob.setTimeUnit(Timeunit.DAY); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); coordJob.setMatThrottling(1); try { Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java Tue Aug 13 20:51:05 2013 @@ -717,7 +717,7 @@ public class TestRecoveryService extends coordJob.setJobXml(appXml); coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); try { coordJob.setEndTime(DateUtils.parseDateOozieTZ("2009-02-03T23:59Z")); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java Tue Aug 13 20:51:05 2013 @@ -35,7 +35,6 @@ import org.apache.oozie.XException; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.CoordinatorJob; import org.apache.oozie.client.CoordinatorJob.Execution; -import org.apache.oozie.client.rest.JsonCoordinatorAction; import org.apache.oozie.client.rest.RestConstants; import org.apache.oozie.service.CoordinatorEngineService; import org.apache.oozie.util.DateUtils; @@ -234,7 +233,7 @@ public class MockCoordinatorEngineServic coordJob.setConf(CONFIGURATION); coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); try { coordJob.setEndTime(DateUtils.parseDateOozieTZ("2009-02-03T23:59Z")); @@ -244,7 +243,7 @@ public class MockCoordinatorEngineServic e.printStackTrace(); } - List<JsonCoordinatorAction> actions = new ArrayList<JsonCoordinatorAction>(); + List<CoordinatorActionBean> actions = new ArrayList<CoordinatorActionBean>(); for (int i = 0; i < idx; i++) { actions.add(createDummyAction(i, JOB_ID + idx)); } @@ -266,7 +265,7 @@ public class MockCoordinatorEngineServic coordJob.setConf(conf.toString()); coordJob.setLastActionNumber(0); coordJob.setFrequency("1"); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); try { coordJob.setEndTime(DateUtils.parseDateOozieTZ("2009-02-03T23:59Z")); @@ -276,7 +275,7 @@ public class MockCoordinatorEngineServic e.printStackTrace(); } - List<JsonCoordinatorAction> actions = new ArrayList<JsonCoordinatorAction>(); + List<CoordinatorActionBean> actions = new ArrayList<CoordinatorActionBean>(); for (int i = 0; i < idx; i++) { actions.add(createDummyAction(i, JOB_ID + idx)); } @@ -285,7 +284,7 @@ public class MockCoordinatorEngineServic return coordJob; } - private static JsonCoordinatorAction createDummyAction(int idx, String jobId) { + private static CoordinatorActionBean createDummyAction(int idx, String jobId) { CoordinatorActionBean action = new CoordinatorActionBean(); action.setId(ACTION_ID + idx); action.setJobId(jobId); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java Tue Aug 13 20:51:05 2013 @@ -28,11 +28,11 @@ import org.apache.hadoop.conf.Configurat import org.apache.oozie.DagEngine; import org.apache.oozie.DagEngineException; import org.apache.oozie.ErrorCode; +import org.apache.oozie.WorkflowActionBean; +import org.apache.oozie.WorkflowJobBean; import org.apache.oozie.WorkflowsInfo; import org.apache.oozie.client.WorkflowJob; import org.apache.oozie.client.rest.JMSConnectionInfoBean; -import org.apache.oozie.client.rest.JsonWorkflowAction; -import org.apache.oozie.client.rest.JsonWorkflowJob; import org.apache.oozie.client.rest.RestConstants; import org.apache.oozie.service.DagEngineService; import org.apache.oozie.util.XmlUtils; @@ -240,7 +240,7 @@ public class MockDagEngineService extend } private static WorkflowJob createDummyWorkflow(int idx) { - JsonWorkflowJob workflow = new JsonWorkflowJob(); + WorkflowJobBean workflow = new WorkflowJobBean(); workflow.setId(JOB_ID + idx + JOB_ID_END); workflow.setAppPath("hdfs://blah/blah/" + idx + "-blah"); workflow.setStatus((idx % 2) == 0 ? WorkflowJob.Status.RUNNING : WorkflowJob.Status.SUCCEEDED); @@ -253,7 +253,7 @@ public class MockDagEngineService extend workflow.setGroup(GROUP); workflow.setUser(USER); - List<JsonWorkflowAction> actions = new ArrayList<JsonWorkflowAction>(); + List<WorkflowActionBean> actions = new ArrayList<WorkflowActionBean>(); for (int i = 0; i < idx; i++) { actions.add(createDummyAction(i)); } @@ -263,7 +263,7 @@ public class MockDagEngineService extend } private static WorkflowJob createDummyWorkflow(int idx, String conf) { - JsonWorkflowJob workflow = new JsonWorkflowJob(); + WorkflowJobBean workflow = new WorkflowJobBean(); workflow.setId(JOB_ID + idx + JOB_ID_END); workflow.setAppPath("hdfs://blah/blah/" + idx + "-blah"); workflow.setStatus((idx % 2) == 0 ? WorkflowJob.Status.RUNNING : WorkflowJob.Status.SUCCEEDED); @@ -276,7 +276,7 @@ public class MockDagEngineService extend workflow.setGroup(GROUP); workflow.setUser(USER); - List<JsonWorkflowAction> actions = new ArrayList<JsonWorkflowAction>(); + List<WorkflowActionBean> actions = new ArrayList<WorkflowActionBean>(); for (int i = 0; i < idx; i++) { actions.add(createDummyAction(i)); } @@ -285,8 +285,8 @@ public class MockDagEngineService extend return workflow; } - private static JsonWorkflowAction createDummyAction(int idx) { - JsonWorkflowAction action = new JsonWorkflowAction(); + private static WorkflowActionBean createDummyAction(int idx) { + WorkflowActionBean action = new WorkflowActionBean(); int mod = idx % 5; action.setId(ACTION_ID + idx); action.setExternalId(EXT_ID + idx); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java Tue Aug 13 20:51:05 2013 @@ -419,7 +419,7 @@ public abstract class XDataTestCase exte coordJob.setJobXml(appXml); coordJob.setFrequency("1"); coordJob.setTimeUnit(Timeunit.DAY); - coordJob.setExecution(Execution.FIFO); + coordJob.setExecutionOrder(Execution.FIFO); coordJob.setConcurrency(1); coordJob.setMatThrottling(1); try { Modified: oozie/trunk/core/src/test/java/org/apache/oozie/util/TestGraphGenerator.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/util/TestGraphGenerator.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/util/TestGraphGenerator.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/util/TestGraphGenerator.java Tue Aug 13 20:51:05 2013 @@ -24,7 +24,8 @@ import java.nio.channels.FileChannel; import java.nio.charset.Charset; import javax.imageio.ImageIO; import junit.framework.Assert; -import org.apache.oozie.client.rest.JsonWorkflowJob; + +import org.apache.oozie.WorkflowJobBean; import org.apache.oozie.test.XTestCase; public class TestGraphGenerator extends XTestCase { @@ -42,9 +43,9 @@ public class TestGraphGenerator extends catch (IllegalArgumentException iae) { Assert.assertTrue("Construction with illegal args failed as expected: " + iae.getMessage(), true); } - Assert.assertNotNull(new GraphGenerator("<workflow></workflow>", new JsonWorkflowJob())); - Assert.assertNotNull(new GraphGenerator(null, new JsonWorkflowJob())); - JsonWorkflowJob jsonWFJob = new JsonWorkflowJob(); + Assert.assertNotNull(new GraphGenerator("<workflow></workflow>", new WorkflowJobBean())); + Assert.assertNotNull(new GraphGenerator(null, new WorkflowJobBean())); + WorkflowJobBean jsonWFJob = new WorkflowJobBean(); jsonWFJob.setAppName("My Test App"); jsonWFJob.setId("My Test ID"); Assert.assertNotNull(new GraphGenerator("<workflow></workflow>", jsonWFJob)); @@ -53,7 +54,7 @@ public class TestGraphGenerator extends } public void testWrite() { - JsonWorkflowJob jsonWFJob = new JsonWorkflowJob(); + WorkflowJobBean jsonWFJob = new WorkflowJobBean(); jsonWFJob.setAppName("My Test App"); jsonWFJob.setId("My Test ID"); String png1 = "src/test/resources/tmp1.png"; Modified: oozie/trunk/release-log.txt URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/release-log.txt (original) +++ oozie/trunk/release-log.txt Tue Aug 13 20:51:05 2013 @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1463 Remove discriminator column (virag) OOZIE-1448 A CoordActionUpdateXCommand gets queued for all workflows even if they were not launched by a coordinator (rkanter) OOZIE-1443 forkjoin validation should not allow a fork to go to the same node multiple times (rkanter) OOZIE-1471 Support glob in FS action and prepare blocks (ryota) Modified: oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java URL: http://svn.apache.org/viewvc/oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java?rev=1513647&r1=1513646&r2=1513647&view=diff ============================================================================== --- oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java (original) +++ oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java Tue Aug 13 20:51:05 2013 @@ -834,18 +834,13 @@ public class OozieDBCLI { args.add("-sqlFile"); args.add(sqlFile); } - args.add("org.apache.oozie.client.rest.JsonWorkflowJob"); args.add("org.apache.oozie.WorkflowJobBean"); - args.add("org.apache.oozie.client.rest.JsonWorkflowAction"); args.add("org.apache.oozie.WorkflowActionBean"); - args.add("org.apache.oozie.client.rest.JsonCoordinatorJob"); args.add("org.apache.oozie.CoordinatorJobBean"); - args.add("org.apache.oozie.client.rest.JsonCoordinatorAction"); args.add("org.apache.oozie.CoordinatorActionBean"); args.add("org.apache.oozie.client.rest.JsonSLAEvent"); args.add("org.apache.oozie.SLAEventBean"); args.add("org.apache.oozie.sla.SLARegistrationBean"); - args.add("org.apache.oozie.client.rest.JsonBundleJob"); args.add("org.apache.oozie.BundleJobBean"); args.add("org.apache.oozie.BundleActionBean"); args.add("org.apache.oozie.sla.SLASummaryBean");
