Author: tucu
Date: Wed Apr 4 18:28:35 2012
New Revision: 1309520
URL: http://svn.apache.org/viewvc?rev=1309520&view=rev
Log:
Merge -r 1309516:1309517 from trunk to branch. FIXES: OOZIE-803
Removed:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestReRunCommand.java
Modified:
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestDagEngine.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestPurgeService.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java
incubator/oozie/branches/branch-3.2/release-log.txt
Modified:
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
Wed Apr 4 18:28:35 2012
@@ -386,7 +386,7 @@ public class JavaActionExecutor extends
String user = conf.get("user.name");
String group = conf.get("group.name");
FileSystem fs =
-
Services.get().get(HadoopAccessorService.class).createFileSystem(user, conf);
+
Services.get().get(HadoopAccessorService.class).createFileSystem(user,
appPath.toUri(), conf);
if (fs.exists(actionLibPath)) {
FileStatus[] files = fs.listStatus(actionLibPath);
for (FileStatus file : files) {
Modified:
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
Wed Apr 4 18:28:35 2012
@@ -132,8 +132,7 @@ public class LauncherMapper<K1, V1, K2,
Path recoveryFile = new Path(actionDir, recoveryId);
//FileSystem fs = FileSystem.get(launcherConf);
FileSystem fs = Services.get().get(HadoopAccessorService.class)
- .createFileSystem(launcherConf.get("user.name"),
- launcherConf);
+
.createFileSystem(launcherConf.get("user.name"),recoveryFile.toUri(),
launcherConf);
if (fs.exists(recoveryFile)) {
InputStream is = fs.open(recoveryFile);
@@ -197,8 +196,9 @@ public class LauncherMapper<K1, V1, K2,
actionConf.set(OOZIE_JOB_ID, jobId);
actionConf.set(OOZIE_ACTION_ID, actionId);
- FileSystem fs =
Services.get().get(HadoopAccessorService.class).createFileSystem(launcherConf.get("user.name"),
-
launcherConf);
+ FileSystem fs =
+
Services.get().get(HadoopAccessorService.class).createFileSystem(launcherConf.get("user.name"),
+
actionDir.toUri(), launcherConf);
fs.mkdirs(actionDir);
OutputStream os = fs.create(new Path(actionDir, ACTION_CONF_XML));
Modified:
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
Wed Apr 4 18:28:35 2012
@@ -350,25 +350,7 @@ public class HadoopAccessorService imple
}
/**
- * Return a FileSystem created with the provided user/group.
- *
- *
- * @param conf Configuration with all necessary information to create the
FileSystem.
- * @return FileSystem created with the provided user/group.
- * @throws HadoopAccessorException if the filesystem could not be created.
- */
- public FileSystem createFileSystem(String user, final Configuration conf)
- throws HadoopAccessorException {
- try {
- return createFileSystem(user, new
URI(conf.get("fs.default.name")), conf);
- }
- catch (URISyntaxException ex) {
- throw new HadoopAccessorException(ErrorCode.E0902, ex);
- }
- }
-
- /**
- * Return a FileSystem created with the provided user/group for the
specified URI.
+ * Return a FileSystem created with the provided user for the specified
URI.
*
*
* @param uri file system URI.
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
Wed Apr 4 18:28:35 2012
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URI;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
@@ -50,7 +51,7 @@ public class TestCoordinatorEngine exten
}
public void testEngine() throws Exception {
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String jobId = _testSubmitJob(appPath);
_testGetJob(jobId, appPath);
_testGetJobs(jobId);
@@ -66,7 +67,7 @@ public class TestCoordinatorEngine exten
*/
public void testDoneFlag() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-01T02:00Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.1\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
@@ -122,7 +123,7 @@ public class TestCoordinatorEngine exten
*/
public void testCustomDoneFlag() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-01T02:00Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.1\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -176,7 +177,7 @@ public class TestCoordinatorEngine exten
*/
public void testEmptyDoneFlag() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-01T02:00Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.1\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -230,7 +231,7 @@ public class TestCoordinatorEngine exten
*/
public void testDoneFlagCreation() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-01T02:00Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.1\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -408,8 +409,8 @@ public class TestCoordinatorEngine exten
}
}
- private void writeToFile(String appXml, String appPath) throws IOException
{
- File wf = new File(appPath);
+ private void writeToFile(String appXml, String appPath) throws Exception {
+ File wf = new File(new URI(appPath).getPath());
PrintWriter out = null;
try {
out = new PrintWriter(new FileWriter(wf));
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestDagEngine.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestDagEngine.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestDagEngine.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/TestDagEngine.java
Wed Apr 4 18:28:35 2012
@@ -102,7 +102,7 @@ public class TestDagEngine extends XTest
final DagEngine engine = new DagEngine(getTestUser(), "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -151,7 +151,7 @@ public class TestDagEngine extends XTest
final DagEngine engine = new DagEngine(getTestUser(), "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -172,7 +172,7 @@ public class TestDagEngine extends XTest
final DagEngine engine = new DagEngine(getTestUser(), "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
Wed Apr 4 18:28:35 2012
@@ -663,12 +663,32 @@ public class TestJavaActionExecutor exte
assertTrue(DistributedCache.getSymlink(jobConf));
- // 1 launcher JAR, 1 wf lib JAR, 2 <file> JARs
- assertEquals(4, DistributedCache.getFileClassPaths(jobConf).length);
-
- // #CLASSPATH_ENTRIES# 4, 1 wf lib sos, 4 <file> sos, 2 <file> files
- assertEquals(11, DistributedCache.getCacheFiles(jobConf).length);
-
+ Path[] filesInClasspath = DistributedCache.getFileClassPaths(jobConf);
+ boolean hasMrappsJar = false;
+ for (Path path : filesInClasspath) {
+ if (path.getName().equals("MRAppJar.jar")) {
+ hasMrappsJar = true;
+ }
+ }
+ if (hasMrappsJar) {
+ // we need to do this because of MR2 injecting a JAR on the client
side.
+ // MRAppJar JAR, 1 launcher JAR, 1 wf lib JAR, 2 <file> JARs
+ assertEquals(5, filesInClasspath.length);
+ }
+ else {
+ // 1 launcher JAR, 1 wf lib JAR, 2 <file> JARs
+ assertEquals(4, filesInClasspath.length);
+
+ }
+ if (hasMrappsJar) {
+ // we need to do this because of MR2 injecting a JAR on the client
side.
+ // #CLASSPATH_ENTRIES# 5 (4+MRAppJar), 1 wf lib sos, 4 <file> sos,
2 <file> files
+ assertEquals(12, DistributedCache.getCacheFiles(jobConf).length);
+ }
+ else {
+ // #CLASSPATH_ENTRIES# 4, 1 wf lib sos, 4 <file> sos, 2 <file>
files
+ assertEquals(11, DistributedCache.getCacheFiles(jobConf).length);
+ }
// 2 <archive> files
assertEquals(2, DistributedCache.getCacheArchives(jobConf).length);
}
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
Wed Apr 4 18:28:35 2012
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
+import java.net.URI;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.CoordinatorJobBean;
@@ -63,7 +64,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testBasicSubmit() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -103,11 +104,11 @@ public class TestCoordSubmitXCommand ext
*/
public void testBasicSubmitWithMultipleInstancesInputEvent() throws
Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
// CASE 1: Failure case i.e. multiple data-in instances
Reader reader =
IOUtils.getResourceAsReader("coord-multiple-input-instance1.xml", -1);
- Writer writer = new FileWriter(appPath);
+ Writer writer = new FileWriter(new URI(appPath).getPath());
IOUtils.copyCharStream(reader, writer);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
@@ -125,7 +126,7 @@ public class TestCoordSubmitXCommand ext
// CASE 2: Multiple data-in instances specified as separate <instance>
tags, but one or more tags are empty. Check works for whitespace in the tags too
reader =
IOUtils.getResourceAsReader("coord-multiple-input-instance2.xml", -1);
- writer = new FileWriter(appPath);
+ writer = new FileWriter(new URI(appPath).getPath());
IOUtils.copyCharStream(reader, writer);
sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
@@ -141,7 +142,7 @@ public class TestCoordSubmitXCommand ext
// CASE 3: Success case i.e. Multiple data-in instances specified
correctly as separate <instance> tags
reader =
IOUtils.getResourceAsReader("coord-multiple-input-instance3.xml", -1);
- writer = new FileWriter(appPath);
+ writer = new FileWriter(new URI(appPath).getPath());
IOUtils.copyCharStream(reader, writer);
sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
@@ -174,11 +175,11 @@ public class TestCoordSubmitXCommand ext
*/
public void testBasicSubmitWithMultipleInstancesOutputEvent() throws
Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
// CASE 1: Failure case i.e. multiple data-out instances
Reader reader =
IOUtils.getResourceAsReader("coord-multiple-output-instance1.xml", -1);
- Writer writer = new FileWriter(appPath);
+ Writer writer = new FileWriter(new URI(appPath).getPath());
IOUtils.copyCharStream(reader, writer);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
@@ -197,7 +198,7 @@ public class TestCoordSubmitXCommand ext
// CASE 2: Data-out instance tag is empty. Check works for whitespace
in the tag too
reader =
IOUtils.getResourceAsReader("coord-multiple-output-instance2.xml", -1);
- writer = new FileWriter(appPath);
+ writer = new FileWriter(new URI(appPath).getPath());
IOUtils.copyCharStream(reader, writer);
sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
@@ -213,7 +214,7 @@ public class TestCoordSubmitXCommand ext
// CASE 3: Multiple <instance> tags within data-out should fail
coordinator schema validation - different error than above is expected
reader =
IOUtils.getResourceAsReader("coord-multiple-output-instance3.xml", -1);
- writer = new FileWriter(appPath);
+ writer = new FileWriter(new URI(appPath).getPath());
IOUtils.copyCharStream(reader, writer);
sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
@@ -248,7 +249,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testBasicSubmitWithBundleId() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> <controls>
<concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -291,7 +292,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testBasicSubmitWithWrongNamespace() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.1\"> <controls>
<concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -331,7 +332,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testBasicSubmitWithSLA() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
xmlns='uri:oozie:coordinator:0.2' xmlns:sla='uri:oozie:sla:0.1'> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -376,7 +377,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitFixedValues() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\"
start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -409,7 +410,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSchemaError() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\" frequencyERROR=\"10\"
start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -445,7 +446,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitNoDatasets() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\"
start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> "
+ "<controls> <timeout>10</timeout>
<concurrency>2</concurrency> "
@@ -470,7 +471,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitNoUsername() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\"
start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> "
+ "<controls> <timeout>10</timeout>
<concurrency>2</concurrency> "
@@ -498,7 +499,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitNoControls() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\"
start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> "
+ "<action> <workflow>
<app-path>hdfs:///tmp/workflows/</app-path> "
@@ -522,7 +523,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitWithDoneFlag() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -561,7 +562,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitWithVarAppName() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"${NAME}\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.3\"> <controls>
<timeout>10</timeout> <concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -604,7 +605,7 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitReservedVars() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\"
start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> "
+ "<action> <workflow>
<app-path>hdfs:///tmp/workflows/</app-path> "
@@ -631,9 +632,9 @@ public class TestCoordSubmitXCommand ext
*/
public void testSubmitDatasetInitialInstance() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
Reader reader =
IOUtils.getResourceAsReader("coord-dataset-initial-instance.xml", -1);
- Writer writer = new FileWriter(appPath);
+ Writer writer = new FileWriter(new URI(appPath).getPath());
IOUtils.copyCharStream(reader, writer);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
@@ -654,7 +655,7 @@ public class TestCoordSubmitXCommand ext
private void _testConfigDefaults(boolean withDefaults) throws Exception {
Configuration conf = new XConfiguration();
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"${startTime}\" end=\"2009-02-03T23:59Z\"
timezone=\"UTC\" "
+ "xmlns=\"uri:oozie:coordinator:0.2\"> <controls>
<concurrency>2</concurrency> "
+ "<execution>LIFO</execution> </controls> <datasets> "
@@ -722,8 +723,8 @@ public class TestCoordSubmitXCommand ext
return null;
}
- private void writeToFile(String appXml, String appPath) throws IOException
{
- File wf = new File(appPath);
+ private void writeToFile(String appXml, String appPath) throws Exception {
+ File wf = new File(new URI(appPath).getPath());
PrintWriter out = null;
try {
out = new PrintWriter(new FileWriter(wf));
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java
Wed Apr 4 18:28:35 2012
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URI;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -58,7 +59,7 @@ public class TestFutureActionsTimeOut ex
}
public void testEngine() throws Exception {
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String jobId = _testSubmitJob(appPath);
Date createDate = new Date();
_testTimeout(jobId, createDate);
@@ -141,9 +142,9 @@ public class TestFutureActionsTimeOut ex
}
}
- private void writeToFile(String appXml, String appPath) throws IOException
{
+ private void writeToFile(String appXml, String appPath) throws Exception {
// TODO Auto-generated method stub
- File wf = new File(appPath);
+ File wf = new File(new URI(appPath).getPath());
PrintWriter out = null;
try {
out = new PrintWriter(new FileWriter(wf));
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java
Wed Apr 4 18:28:35 2012
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URL;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
@@ -54,7 +55,7 @@ public class TestPastActionsTimeOut exte
}
public void testEngine() throws Exception {
- String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = "file://" + getTestCaseDir() + File.separator +
"coordinator.xml";
String jobId = _testSubmitJob(appPath);
_testTimeout(jobId);
}
@@ -105,9 +106,9 @@ public class TestPastActionsTimeOut exte
}
}
- private void writeToFile(String appXml, String appPath) throws IOException
{
+ private void writeToFile(String appXml, String appPath) throws Exception {
// TODO Auto-generated method stub
- File wf = new File(appPath);
+ File wf = new File(new URL(appPath).getPath());
PrintWriter out = null;
try {
out = new PrintWriter(new FileWriter(wf));
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
Wed Apr 4 18:28:35 2012
@@ -251,7 +251,7 @@ public class TestActionErrors extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -299,7 +299,7 @@ public class TestActionErrors extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -370,7 +370,7 @@ public class TestActionErrors extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -434,7 +434,7 @@ public class TestActionErrors extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -512,7 +512,7 @@ public class TestActionErrors extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -550,7 +550,7 @@ public class TestActionErrors extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -591,7 +591,7 @@ public class TestActionErrors extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
Wed Apr 4 18:28:35 2012
@@ -60,7 +60,7 @@ public class TestReRunXCommand extends X
final OozieClient wfClient = LocalOozie.getClient();
Properties conf = wfClient.createConfiguration();
- conf.setProperty(OozieClient.APP_PATH, getTestCaseDir() +
File.separator + "workflow.xml");
+ conf.setProperty(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
@@ -114,7 +114,7 @@ public class TestReRunXCommand extends X
final OozieClient wfClient = LocalOozie.getClient();
Properties conf = wfClient.createConfiguration();
- conf.setProperty(OozieClient.APP_PATH, getTestCaseDir() +
File.separator + "workflow.xml");
+ conf.setProperty(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
@@ -157,7 +157,7 @@ public class TestReRunXCommand extends X
final OozieClient wfClient = LocalOozie.getClient();
Properties conf = wfClient.createConfiguration();
- conf.setProperty(OozieClient.APP_PATH, getTestCaseDir() +
File.separator + "workflow.xml");
+ conf.setProperty(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
@@ -193,7 +193,7 @@ public class TestReRunXCommand extends X
final OozieClient wfClient = LocalOozie.getClient();
Properties conf = wfClient.createConfiguration();
- conf.setProperty(OozieClient.APP_PATH, getTestCaseDir() +
File.separator + "workflow.xml");
+ conf.setProperty(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
Wed Apr 4 18:28:35 2012
@@ -51,7 +51,7 @@ public class TestSubmitXCommand extends
+ "<end name='end' /> " + "</workflow-app>";
writeToFile(appXml, appPath + "/workflow.xml");
- conf.set(OozieClient.APP_PATH, appPath + "/workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + appPath + "/workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set("GB", "5");
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -72,7 +72,7 @@ public class TestSubmitXCommand extends
+ "<end name='end' /> " + "</workflow-app>";
writeToFile(appXml, appPath + "/workflow.xml");
- conf.set(OozieClient.APP_PATH, appPath);
+ conf.set(OozieClient.APP_PATH, "file://" + appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -92,7 +92,7 @@ public class TestSubmitXCommand extends
+ "<end name='end' /> " + "</workflow-app>";
writeToFile(appXml, appPath + "/workflow.xml");
- conf.set(OozieClient.APP_PATH, appPath + "/workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + appPath + "/workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -112,7 +112,7 @@ public class TestSubmitXCommand extends
+ "<end name='end' /> " + "</workflow-app>";
writeToFile(appXml, appPath + "/test.xml");
- conf.set(OozieClient.APP_PATH, appPath + "/test.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + appPath + "/test.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -132,7 +132,7 @@ public class TestSubmitXCommand extends
+ "<end name='end' /> " + "</workflow-app>";
writeToFile(appXml, appPath + "/test.xml");
- conf.set(OozieClient.APP_PATH, appPath + "/does_not_exist.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + appPath +
"/does_not_exist.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java
Wed Apr 4 18:28:35 2012
@@ -85,7 +85,7 @@ public class TestActionCheckerService ex
final DagEngine engine = new DagEngine(getTestUser(), "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(WorkflowAppService.HADOOP_USER, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -141,7 +141,7 @@ public class TestActionCheckerService ex
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.setStrings(WorkflowAppService.HADOOP_USER, getTestUser());
conf.setStrings(OozieClient.GROUP_NAME, getTestGroup());
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
Wed Apr 4 18:28:35 2012
@@ -118,7 +118,7 @@ public class TestAuthorizationService ex
final DagEngine engine = new DagEngine(getTestUser(), "a");
Configuration jobConf = new XConfiguration();
- jobConf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
if (useDefaultGroup) {
jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
Wed Apr 4 18:28:35 2012
@@ -89,7 +89,7 @@ public class TestHadoopAccessorService e
JobClient jc = has.createJobClient(user, conf);
assertNotNull(jc);
- FileSystem fs = has.createFileSystem(user, conf);
+ FileSystem fs = has.createFileSystem(user, new URI(getNameNodeUri()),
conf);
assertNotNull(fs);
fs = has.createFileSystem(user, uri, conf);
assertNotNull(fs);
@@ -106,13 +106,6 @@ public class TestHadoopAccessorService e
}
try {
- has.createFileSystem(user, conf);
- fail();
- }
- catch (Throwable ex) {
- }
-
- try {
has.createFileSystem(user, uri, conf);
fail();
}
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestPurgeService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestPurgeService.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestPurgeService.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestPurgeService.java
Wed Apr 4 18:28:35 2012
@@ -95,7 +95,7 @@ public class TestPurgeService extends XD
final DagEngine engine = new DagEngine("u", "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.setStrings(OozieClient.USER_NAME, getTestUser());
conf.setStrings(OozieClient.GROUP_NAME, getTestGroup());
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
Wed Apr 4 18:28:35 2012
@@ -107,7 +107,7 @@ public class TestRecoveryService extends
final DagEngine engine = new DagEngine(getTestUser(), "a");
Configuration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator +
"workflow.xml");
+ conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() +
File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.LOG_TOKEN, "t");
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java
Wed Apr 4 18:28:35 2012
@@ -125,13 +125,13 @@ public class TestDBWorkflowStore extends
conf1.set(OozieClient.APP_PATH, "testPath");
conf1.set(OozieClient.LOG_TOKEN, "testToken");
- conf1.set(OozieClient.USER_NAME, "testUser1");
+ conf1.set(OozieClient.USER_NAME, getTestUser());
wfBean1 = createWorkflow(app, conf1, "auth");
Configuration conf2 = new Configuration();
conf2.set(OozieClient.APP_PATH, "testPath");
conf2.set(OozieClient.LOG_TOKEN, "testToken");
- conf2.set(OozieClient.USER_NAME, "testUser2");
+ conf2.set(OozieClient.USER_NAME, getTestUser2());
wfBean2 = createWorkflow(app, conf2, "auth");
store.insertWorkflow(wfBean1);
@@ -412,19 +412,19 @@ public class TestDBWorkflowStore extends
assertEquals(2, wfBeans.size());
filter = new HashMap<String, List<String>>();
- filter.put("user", Arrays.asList("testUser1"));
+ filter.put("user", Arrays.asList(getTestUser()));
wfInfo = store.getWorkflowsInfo(filter, 1, 2);
wfBeans = wfInfo.getWorkflows();
assertEquals(1, wfBeans.size());
filter = new HashMap<String, List<String>>();
- filter.put("user", Arrays.asList("testUser1", "testUser2"));
+ filter.put("user", Arrays.asList(getTestUser(), getTestUser2()));
wfInfo = store.getWorkflowsInfo(filter, 1, 2);
wfBeans = wfInfo.getWorkflows();
assertEquals(2, wfBeans.size());
filter = new HashMap<String, List<String>>();
- filter.put("user", Arrays.asList("testUser1"));
+ filter.put("user", Arrays.asList(getTestUser()));
filter.put("status", Arrays.asList("succeeded"));
wfInfo = store.getWorkflowsInfo(filter, 1, 2);
@@ -432,7 +432,7 @@ public class TestDBWorkflowStore extends
assertEquals(1, wfBeans.size());
filter = new HashMap<String, List<String>>();
- filter.put("user", Arrays.asList("testUser1", "testUser2"));
+ filter.put("user", Arrays.asList(getTestUser(), getTestUser2()));
filter.put("name", Arrays.asList("testApp"));
wfInfo = store.getWorkflowsInfo(filter, 1, 2);
wfBeans = wfInfo.getWorkflows();
@@ -442,7 +442,7 @@ public class TestDBWorkflowStore extends
assertEquals(2, wfInfo.getLen());
filter = new HashMap<String, List<String>>();
- filter.put("user", Arrays.asList("testUser1", "testUser2"));
+ filter.put("user", Arrays.asList(getTestUser(), getTestUser2()));
filter.put("name", Arrays.asList("testApp"));
wfInfo = store.getWorkflowsInfo(filter, 1, 1);
wfBeans = wfInfo.getWorkflows();
@@ -461,7 +461,7 @@ public class TestDBWorkflowStore extends
Configuration conf2 = new Configuration();
conf2.set(OozieClient.APP_PATH, "testPath");
conf2.set(OozieClient.LOG_TOKEN, "testToken");
- conf2.set(OozieClient.USER_NAME, "testUser2");
+ conf2.set(OozieClient.USER_NAME, getTestUser2());
WorkflowJobBean wfBean3 = createWorkflow(app, conf2, "auth");
store.insertWorkflow(wfBean3);
Modified: incubator/oozie/branches/branch-3.2/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/release-log.txt?rev=1309520&r1=1309519&r2=1309520&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.2/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.2/release-log.txt Wed Apr 4 18:28:35 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-803 UP Remove HadoopAccessorService createFileSystem() method that takes
config only (tucu)
OOZIE-802 Add minicluster config as hadoop-site.xml for testcases (tucu)
OOZIE-796 Making the maximum number of job retrials configurable (Mohamed via
Mohammad)
OOZIE-741: the size of the workflow definition file (Mohamed via Mohammad)
