You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/02/27 23:26:17 UTC
svn commit: r1294369 - in /incubator/oozie/trunk: ./
core/src/main/java/org/apache/oozie/servlet/
core/src/test/java/org/apache/oozie/client/
core/src/test/java/org/apache/oozie/servlet/
Author: tucu
Date: Mon Feb 27 22:26:16 2012
New Revision: 1294369
URL: http://svn.apache.org/viewvc?rev=1294369&view=rev
Log:
OOZIE-721 remove obsolete/not-used JobServlet and JobsServlet code (tucu)
Removed:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JobServlet.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JobsServlet.java
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowXClient.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV0JobServlet.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java Mon Feb 27 22:26:16 2012
@@ -28,11 +28,11 @@ import org.apache.hadoop.fs.Path;
import org.apache.oozie.cli.OozieCLI;
import org.apache.oozie.client.rest.RestConstants;
import org.apache.oozie.servlet.DagServletTestCase;
-import org.apache.oozie.servlet.JobServlet;
-import org.apache.oozie.servlet.JobsServlet;
import org.apache.oozie.servlet.MockCoordinatorEngineService;
import org.apache.oozie.servlet.MockDagEngineService;
import org.apache.oozie.servlet.V1AdminServlet;
+import org.apache.oozie.servlet.V1JobServlet;
+import org.apache.oozie.servlet.V1JobsServlet;
import org.apache.oozie.util.XConfiguration;
//hardcoding options instead using constants on purpose, to detect changes to option names if any and correct docs.
@@ -40,8 +40,8 @@ public class TestOozieCLI extends DagSer
static {
new HeaderTestingVersionServlet();
- new JobServlet();
- new JobsServlet();
+ new V1JobServlet();
+ new V1JobsServlet();
new V1AdminServlet();
}
@@ -49,7 +49,7 @@ public class TestOozieCLI extends DagSer
static final String VERSION = "/v" + OozieClient.WS_PROTOCOL_VERSION;
static final String[] END_POINTS = {"/versions", VERSION + "/jobs", VERSION + "/job/*", VERSION + "/admin/*"};
static final Class[] SERVLET_CLASSES =
- { HeaderTestingVersionServlet.class, JobsServlet.class, JobServlet.class,
+ { HeaderTestingVersionServlet.class, V1JobsServlet.class, V1JobServlet.class,
V1AdminServlet.class };
@Override
@@ -209,7 +209,8 @@ public class TestOozieCLI extends DagSer
runTest(END_POINTS, SERVLET_CLASSES, IS_SECURITY_ENABLED, new Callable<Void>() {
public Void call() throws Exception {
String oozieUrl = getContextURL();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-start", MockDagEngineService.JOB_ID + "1"};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-start", MockDagEngineService.JOB_ID + "1" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_ACTION_START, MockDagEngineService.did);
assertTrue(MockDagEngineService.started.get(1));
@@ -226,7 +227,8 @@ public class TestOozieCLI extends DagSer
runTest(END_POINTS, SERVLET_CLASSES, IS_SECURITY_ENABLED, new Callable<Void>() {
public Void call() throws Exception {
String oozieUrl = getContextURL();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-suspend", MockDagEngineService.JOB_ID + 1};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-suspend", MockDagEngineService.JOB_ID + "1" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_ACTION_SUSPEND, MockDagEngineService.did);
@@ -242,7 +244,8 @@ public class TestOozieCLI extends DagSer
runTest(END_POINTS, SERVLET_CLASSES, IS_SECURITY_ENABLED, new Callable<Void>() {
public Void call() throws Exception {
String oozieUrl = getContextURL();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-resume", MockDagEngineService.JOB_ID + 1};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-resume", MockDagEngineService.JOB_ID + "1" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_ACTION_RESUME, MockDagEngineService.did);
@@ -258,7 +261,8 @@ public class TestOozieCLI extends DagSer
runTest(END_POINTS, SERVLET_CLASSES, IS_SECURITY_ENABLED, new Callable<Void>() {
public Void call() throws Exception {
String oozieUrl = getContextURL();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-kill", MockDagEngineService.JOB_ID + 1};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-kill", MockDagEngineService.JOB_ID + "1" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_ACTION_KILL, MockDagEngineService.did);
@@ -278,7 +282,7 @@ public class TestOozieCLI extends DagSer
getFileSystem().create(new Path(appPath, "workflow.xml")).close();
String oozieUrl = getContextURL();
String[] args = new String[]{"job", "-oozie", oozieUrl, "-config", createConfigFile(appPath.toString()),
- "-rerun", MockDagEngineService.JOB_ID + "1"};
+ "-rerun", MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_ACTION_RERUN, MockDagEngineService.did);
assertTrue(MockDagEngineService.started.get(1));
@@ -346,7 +350,7 @@ public class TestOozieCLI extends DagSer
getFileSystem().create(new Path(appPath, "coordinator.xml")).close();
String oozieUrl = getContextURL();
String[] args = new String[] { "job", "-oozie", oozieUrl, "-rerun",
- MockCoordinatorEngineService.JOB_ID + "1",
+ MockCoordinatorEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END,
"-date", "2009-12-15T01:00Z", "-action", "1" };
assertEquals(-1, new OozieCLI().run(args));
assertNull(MockCoordinatorEngineService.did);
@@ -369,7 +373,7 @@ public class TestOozieCLI extends DagSer
getFileSystem().create(new Path(appPath, "coordinator.xml")).close();
String oozieUrl = getContextURL();
String[] args = new String[] { "job", "-oozie", oozieUrl, "-rerun",
- MockCoordinatorEngineService.JOB_ID + "1" };
+ MockCoordinatorEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END};
assertEquals(-1, new OozieCLI().run(args));
assertNull(MockCoordinatorEngineService.did);
assertFalse(MockCoordinatorEngineService.started.get(1));
@@ -383,15 +387,18 @@ public class TestOozieCLI extends DagSer
public Void call() throws Exception {
String oozieUrl = getContextURL();
MockDagEngineService.reset();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + 0};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + "0" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
- args = new String[]{"job", "-localtime", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + 1};
+ args = new String[]{"job", "-localtime", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID +
+ "1" + MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
- args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + 2};
+ args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + "2" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
@@ -431,7 +438,8 @@ public class TestOozieCLI extends DagSer
setSystemProperty(OozieCLI.WS_HEADER_PREFIX + "header", "test");
String oozieUrl = getContextURL();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-start", MockDagEngineService.JOB_ID + 1};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-start", MockDagEngineService.JOB_ID + "1" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_ACTION_START, MockDagEngineService.did);
assertTrue(HeaderTestingVersionServlet.OOZIE_HEADERS.containsKey("header"));
@@ -482,19 +490,23 @@ public class TestOozieCLI extends DagSer
public Void call() throws Exception {
String oozieUrl = getContextURL();
MockDagEngineService.reset();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + 0};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + "0" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
- args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + 1, "-len", "3", "-offset", "1"};
+ args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + "1" +
+ MockDagEngineService.JOB_ID_END, "-len", "3", "-offset", "1"};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
- args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + 2, "-len", "2"};
+ args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + "2" +
+ MockDagEngineService.JOB_ID_END, "-len", "2"};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
- args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + 3, "-offset", "3"};
+ args = new String[]{"job", "-oozie", oozieUrl, "-info", MockDagEngineService.JOB_ID + "3" +
+ MockDagEngineService.JOB_ID_END, "-offset", "3"};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
@@ -508,7 +520,8 @@ public class TestOozieCLI extends DagSer
public Void call() throws Exception {
String oozieUrl = getContextURL();
MockDagEngineService.reset();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-log", MockDagEngineService.JOB_ID + 0};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-log", MockDagEngineService.JOB_ID + "0" +
+ MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_LOG, MockDagEngineService.did);
@@ -523,7 +536,8 @@ public class TestOozieCLI extends DagSer
public Void call() throws Exception {
String oozieUrl = getContextURL();
MockDagEngineService.reset();
- String[] args = new String[]{"job", "-oozie", oozieUrl, "-definition", MockDagEngineService.JOB_ID + 0};
+ String[] args = new String[]{"job", "-oozie", oozieUrl, "-definition", MockDagEngineService.JOB_ID +
+ "0" + MockDagEngineService.JOB_ID_END};
assertEquals(0, new OozieCLI().run(args));
assertEquals(RestConstants.JOB_SHOW_DEFINITION, MockDagEngineService.did);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java Mon Feb 27 22:26:16 2012
@@ -115,7 +115,7 @@ public class TestWorkflowClient extends
getFileSystem().create(new Path(appPath, "workflow.xml")).close();
conf.setProperty(OozieClient.APP_PATH, appPath.toString());
injectKerberosInfo(conf);
- assertEquals(MockDagEngineService.JOB_ID + wfCount, wc.submit(conf));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END, wc.submit(conf));
assertFalse(MockDagEngineService.started.get(wfCount));
return null;
}
@@ -134,7 +134,7 @@ public class TestWorkflowClient extends
getFileSystem().create(new Path(appPath, "workflow.xml")).close();
conf.setProperty(OozieClient.APP_PATH, appPath.toString());
injectKerberosInfo(conf);
- assertEquals(MockDagEngineService.JOB_ID + wfCount, wc.run(conf));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END, wc.run(conf));
assertTrue(MockDagEngineService.started.get(wfCount));
return null;
}
@@ -148,7 +148,7 @@ public class TestWorkflowClient extends
OozieClient wc = new OozieClient(oozieUrl);
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.USER_NAME, "x");
- wc.start(MockDagEngineService.JOB_ID + 1);
+ wc.start(MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END);
assertEquals(RestConstants.JOB_ACTION_START, MockDagEngineService.did);
return null;
}
@@ -162,7 +162,7 @@ public class TestWorkflowClient extends
OozieClient wc = new OozieClient(oozieUrl);
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.USER_NAME, "x");
- wc.suspend(MockDagEngineService.JOB_ID + 1);
+ wc.suspend(MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END);
assertEquals(RestConstants.JOB_ACTION_SUSPEND, MockDagEngineService.did);
return null;
}
@@ -176,7 +176,7 @@ public class TestWorkflowClient extends
OozieClient wc = new OozieClient(oozieUrl);
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.USER_NAME, "x");
- wc.resume(MockDagEngineService.JOB_ID + 1);
+ wc.resume(MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END);
assertEquals(RestConstants.JOB_ACTION_RESUME, MockDagEngineService.did);
return null;
}
@@ -190,7 +190,7 @@ public class TestWorkflowClient extends
OozieClient wc = new OozieClient(oozieUrl);
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.USER_NAME, "x");
- wc.kill(MockDagEngineService.JOB_ID + 1);
+ wc.kill(MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END);
assertEquals(RestConstants.JOB_ACTION_KILL, MockDagEngineService.did);
return null;
}
@@ -209,7 +209,7 @@ public class TestWorkflowClient extends
getFileSystem().create(new Path(appPath, "workflow.xml")).close();
conf.setProperty(OozieClient.APP_PATH, appPath.toString());
injectKerberosInfo(conf);
- wc.reRun(MockDagEngineService.JOB_ID + 1, conf);
+ wc.reRun(MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END, conf);
assertEquals(RestConstants.JOB_ACTION_RERUN, MockDagEngineService.did);
assertTrue(MockDagEngineService.started.get(1));
return null;
@@ -222,9 +222,9 @@ public class TestWorkflowClient extends
public Void call() throws Exception {
String oozieUrl = getContextURL();
OozieClient wc = new OozieClient(oozieUrl);
- WorkflowJob wf = wc.getJobInfo(MockDagEngineService.JOB_ID + 1);
+ WorkflowJob wf = wc.getJobInfo(MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END);
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
- assertEquals(MockDagEngineService.JOB_ID + 1, wf.getId());
+ assertEquals(MockDagEngineService.JOB_ID + "1" + MockDagEngineService.JOB_ID_END, wf.getId());
return null;
}
});
@@ -240,7 +240,7 @@ public class TestWorkflowClient extends
assertEquals(MockDagEngineService.INIT_WF_COUNT, list.size());
for (int i = 0; i < MockDagEngineService.INIT_WF_COUNT; i++) {
assertNotNull(list.get(i).getAppPath());
- assertEquals(MockDagEngineService.JOB_ID + i, list.get(i).getId());
+ assertEquals(MockDagEngineService.JOB_ID + i + MockDagEngineService.JOB_ID_END, list.get(i).getId());
}
MockDagEngineService.reset();
@@ -248,7 +248,7 @@ public class TestWorkflowClient extends
assertEquals(MockDagEngineService.INIT_WF_COUNT, list.size());
for (int i = 0; i < MockDagEngineService.INIT_WF_COUNT; i++) {
assertNotNull(list.get(i).getAppPath());
- assertEquals(MockDagEngineService.JOB_ID + i, list.get(i).getId());
+ assertEquals(MockDagEngineService.JOB_ID + i + MockDagEngineService.JOB_ID_END, list.get(i).getId());
}
return null;
}
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowXClient.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowXClient.java?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowXClient.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestWorkflowXClient.java Mon Feb 27 22:26:16 2012
@@ -66,7 +66,8 @@ public class TestWorkflowXClient extends
BufferedWriter writer = new BufferedWriter(new FileWriter(pigScriptFile));
writer.write("a = load 'input.txt';\n dump a;");
writer.close();
- assertEquals(MockDagEngineService.JOB_ID + wfCount, wc.submitPig(conf, pigScriptFile, null));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
+ wc.submitPig(conf, pigScriptFile, null));
assertTrue(MockDagEngineService.started.get(wfCount));
return null;
@@ -88,7 +89,8 @@ public class TestWorkflowXClient extends
conf.setProperty(XOozieClient.NN, "hdfs://localhost:9000");
injectKerberosInfo(conf);
- assertEquals(MockDagEngineService.JOB_ID + wfCount, wc.submitMapReduce(conf));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
+ wc.submitMapReduce(conf));
assertTrue(MockDagEngineService.started.get(wfCount));
return null;
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java Mon Feb 27 22:26:16 2012
@@ -37,7 +37,7 @@ import org.apache.oozie.service.DagEngin
import org.apache.oozie.util.XmlUtils;
public class MockDagEngineService extends DagEngineService {
- public static final String JOB_ID = "job-W-";
+ public static final String JOB_ID = "job-";
public static final String JOB_ID_END = "-W";
public static final String ACTION_ID = "action-";
public static final String EXT_ID = "ext-";
@@ -96,10 +96,11 @@ public class MockDagEngineService extend
did = "submit";
submittedConf = conf;
int idx = workflows.size();
- workflows.add(createDummyWorkflow(idx, XmlUtils.prettyPrint(conf).toString()));
+ WorkflowJob job = createDummyWorkflow(idx, XmlUtils.prettyPrint(conf).toString());
+ workflows.add(job);
started.add(startJob);
MockDagEngineService.user = getUser();
- return JOB_ID + idx;
+ return job.getId();
}
@Override
@@ -111,9 +112,10 @@ public class MockDagEngineService extend
did = "submitMR";
}
int idx = workflows.size();
- workflows.add(createDummyWorkflow(idx, XmlUtils.prettyPrint(conf).toString()));
+ WorkflowJob job = createDummyWorkflow(idx, XmlUtils.prettyPrint(conf).toString());
+ workflows.add(job);
started.add(true);
- return JOB_ID + idx;
+ return job.getId();
}
@Override
@@ -169,6 +171,11 @@ public class MockDagEngineService extend
}
@Override
+ public WorkflowJob getJob(String jobId, int start, int length) throws DagEngineException {
+ return getJob(jobId);
+ }
+
+ @Override
public String getDefinition(String jobId) throws DagEngineException {
did = RestConstants.JOB_SHOW_DEFINITION;
int idx = validateWorkflowIdx(jobId);
@@ -222,7 +229,7 @@ public class MockDagEngineService extend
private static WorkflowJob createDummyWorkflow(int idx) {
JsonWorkflowJob workflow = new JsonWorkflowJob();
- workflow.setId(JOB_ID + idx);
+ 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);
workflow.setRun(idx);
@@ -245,7 +252,7 @@ public class MockDagEngineService extend
private static WorkflowJob createDummyWorkflow(int idx, String conf) {
JsonWorkflowJob workflow = new JsonWorkflowJob();
- workflow.setId(JOB_ID + idx);
+ 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);
workflow.setRun(idx);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java Mon Feb 27 22:26:16 2012
@@ -83,7 +83,8 @@ public class TestJobsServlet extends Dag
jobConf.writeXml(conn.getOutputStream());
assertEquals(HttpServletResponse.SC_CREATED, conn.getResponseCode());
JSONObject obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream()));
- assertEquals(MockDagEngineService.JOB_ID + wfCount, obj.get(JsonTags.JOB_ID));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
+ obj.get(JsonTags.JOB_ID));
assertFalse(MockDagEngineService.started.get(wfCount));
wfCount++;
@@ -101,7 +102,8 @@ public class TestJobsServlet extends Dag
jobConf.writeXml(conn.getOutputStream());
assertEquals(HttpServletResponse.SC_CREATED, conn.getResponseCode());
obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream()));
- assertEquals(MockDagEngineService.JOB_ID + wfCount, obj.get(JsonTags.JOB_ID));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
+ obj.get(JsonTags.JOB_ID));
assertTrue(MockDagEngineService.started.get(wfCount));
Services services = Services.get();
DagEngine de = services.get(DagEngineService.class).getDagEngine(getTestUser(), "undef");
@@ -131,7 +133,8 @@ public class TestJobsServlet extends Dag
JSONArray array = (JSONArray) json.get(JsonTags.WORKFLOWS_JOBS);
assertEquals(MockDagEngineService.INIT_WF_COUNT, array.size());
for (int i = 0; i < MockDagEngineService.INIT_WF_COUNT; i++) {
- assertEquals(MockDagEngineService.JOB_ID + i, ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
+ assertEquals(MockDagEngineService.JOB_ID + i + MockDagEngineService.JOB_ID_END,
+ ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
assertNotNull(((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_APP_PATH));
}
@@ -149,7 +152,8 @@ public class TestJobsServlet extends Dag
assertEquals(MockDagEngineService.INIT_WF_COUNT, array.size());
for (int i = 0; i < MockDagEngineService.INIT_WF_COUNT; i++) {
- assertEquals(MockDagEngineService.JOB_ID + i, ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
+ assertEquals(MockDagEngineService.JOB_ID + i + MockDagEngineService.JOB_ID_END,
+ ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
assertNotNull(((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_APP_PATH));
}
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV0JobServlet.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV0JobServlet.java?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV0JobServlet.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV0JobServlet.java Mon Feb 27 22:26:16 2012
@@ -73,7 +73,8 @@ public class TestV0JobServlet extends Da
MockDagEngineService.reset();
params = new HashMap<String, String>();
params.put(RestConstants.ACTION_PARAM, action);
- url = createURL(MockDagEngineService.JOB_ID + (MockDagEngineService.workflows.size() + 1), params);
+ url = createURL(MockDagEngineService.JOB_ID + (MockDagEngineService.workflows.size() + 1) +
+ MockDagEngineService.JOB_ID_END, params);
conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("PUT");
conn.setRequestProperty("content-type", RestConstants.XML_CONTENT_TYPE);
@@ -136,7 +137,7 @@ public class TestV0JobServlet extends Da
MockDagEngineService.reset();
Map<String, String> params = new HashMap<String, String>();
params.put(RestConstants.JOB_SHOW_PARAM, show);
- URL url = createURL(MockDagEngineService.JOB_ID + 1, params);
+ URL url = createURL(MockDagEngineService.JOB_ID + 1 + MockDagEngineService.JOB_ID_END, params);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
@@ -148,7 +149,8 @@ public class TestV0JobServlet extends Da
MockDagEngineService.reset();
params = new HashMap<String, String>();
params.put(RestConstants.JOB_SHOW_PARAM, show);
- url = createURL(MockDagEngineService.JOB_ID + (MockDagEngineService.workflows.size() + 1), params);
+ url = createURL(MockDagEngineService.JOB_ID + (MockDagEngineService.workflows.size() + 1) +
+ MockDagEngineService.JOB_ID_END, params);
conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
assertEquals(HttpServletResponse.SC_BAD_REQUEST, conn.getResponseCode());
@@ -174,19 +176,21 @@ public class TestV0JobServlet extends Da
MockDagEngineService.reset();
Map<String, String> params = new HashMap<String, String>();
params.put(RestConstants.JOB_SHOW_PARAM, RestConstants.JOB_SHOW_INFO);
- URL url = createURL(MockDagEngineService.JOB_ID + 1, params);
+ URL url = createURL(MockDagEngineService.JOB_ID + 1 + MockDagEngineService.JOB_ID_END, params);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
JSONObject obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream()));
- assertEquals(MockDagEngineService.JOB_ID + 1, obj.get(JsonTags.WORKFLOW_ID));
+ assertEquals(MockDagEngineService.JOB_ID + 1 + MockDagEngineService.JOB_ID_END,
+ obj.get(JsonTags.WORKFLOW_ID));
assertEquals(RestConstants.JOB_SHOW_INFO, MockDagEngineService.did);
MockDagEngineService.reset();
params = new HashMap<String, String>();
params.put(RestConstants.JOB_SHOW_PARAM, RestConstants.JOB_SHOW_INFO);
- url = createURL(MockDagEngineService.JOB_ID + (MockDagEngineService.workflows.size() + 1), params);
+ url = createURL(MockDagEngineService.JOB_ID + (MockDagEngineService.workflows.size() + 1) +
+ MockDagEngineService.JOB_ID_END, params);
conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
assertEquals(HttpServletResponse.SC_BAD_REQUEST, conn.getResponseCode());
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java Mon Feb 27 22:26:16 2012
@@ -81,7 +81,8 @@ public class TestV1JobsServlet extends D
jobConf.writeXml(conn.getOutputStream());
assertEquals(HttpServletResponse.SC_CREATED, conn.getResponseCode());
JSONObject obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream()));
- assertEquals(MockDagEngineService.JOB_ID + wfCount, obj.get(JsonTags.JOB_ID));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
+ obj.get(JsonTags.JOB_ID));
assertFalse(MockDagEngineService.started.get(wfCount));
wfCount++;
@@ -99,7 +100,8 @@ public class TestV1JobsServlet extends D
jobConf.writeXml(conn.getOutputStream());
assertEquals(HttpServletResponse.SC_CREATED, conn.getResponseCode());
obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream()));
- assertEquals(MockDagEngineService.JOB_ID + wfCount, obj.get(JsonTags.JOB_ID));
+ assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
+ obj.get(JsonTags.JOB_ID));
assertTrue(MockDagEngineService.started.get(wfCount));
Services services = Services.get();
DagEngine de = services.get(DagEngineService.class).getDagEngine(getTestUser(), "undef");
@@ -128,7 +130,8 @@ public class TestV1JobsServlet extends D
JSONArray array = (JSONArray) json.get(JsonTags.WORKFLOWS_JOBS);
assertEquals(MockDagEngineService.INIT_WF_COUNT, array.size());
for (int i = 0; i < MockDagEngineService.INIT_WF_COUNT; i++) {
- assertEquals(MockDagEngineService.JOB_ID + i, ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
+ assertEquals(MockDagEngineService.JOB_ID + i + MockDagEngineService.JOB_ID_END,
+ ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
assertNotNull(((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_APP_PATH));
}
@@ -146,7 +149,8 @@ public class TestV1JobsServlet extends D
assertEquals(MockDagEngineService.INIT_WF_COUNT, array.size());
for (int i = 0; i < MockDagEngineService.INIT_WF_COUNT; i++) {
- assertEquals(MockDagEngineService.JOB_ID + i, ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
+ assertEquals(MockDagEngineService.JOB_ID + i + MockDagEngineService.JOB_ID_END,
+ ((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_ID));
assertNotNull(((JSONObject) array.get(i)).get(JsonTags.WORKFLOW_APP_PATH));
}
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1294369&r1=1294368&r2=1294369&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Feb 27 22:26:16 2012
@@ -1,6 +1,7 @@
-- Oozie 3.2.0 release
-Oozie-626 Roll the oozie log file in GZ format (Kiran Nagasubramanian via Angelo)
+OOZIE-721 remove obsolete/not-used JobServlet and JobsServlet code (tucu)
+OOZIE-626 Roll the oozie log file in GZ format (Kiran Nagasubramanian via Angelo)
OOZIE-693 Fork-join validation doesn't check for the 'error to' transition of nodes (Virag Kothari via Angelo)
OOZIE-616 Moving action prepare FS execution to LauncherMapper ( Kiran Nagasubramanian via Angelo)
OOZIE-687 The start time of the action is set after the job is already submitted to hadoop (Mohamed Battisha vis Angelo)