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/03/10 05:33:42 UTC
svn commit: r1299149 - in /incubator/oozie/trunk: ./
core/src/main/java/org/apache/oozie/action/hadoop/
core/src/main/java/org/apache/oozie/command/bundle/
core/src/main/java/org/apache/oozie/command/coord/
core/src/main/java/org/apache/oozie/coord/ co...
Author: tucu
Date: Sat Mar 10 04:33:40 2012
New Revision: 1299149
URL: http://svn.apache.org/viewvc?rev=1299149&view=rev
Log:
OOZIE-752 if group.name/oozie.job.acl is not defined in job.properties job submission fails (tucu)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagELFunctions.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagEngine.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/ActionExecutorTestCase.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestFsELFunctions.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestPurgeXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowIdGetForExternalIdJPAExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobsGetForPurgeJPAExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.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/TestV1JobsServlet.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -190,7 +190,6 @@ public class JavaActionExecutor extends
conf.set(WorkflowAppService.HADOOP_NN_KERBEROS_NAME, context.getProtoActionConf().get(
WorkflowAppService.HADOOP_NN_KERBEROS_NAME));
}
- conf.set(OozieClient.GROUP_NAME, context.getProtoActionConf().get(OozieClient.GROUP_NAME));
conf.set(HADOOP_JOB_TRACKER, jobTracker);
conf.set(HADOOP_NAME_NODE, nameNode);
conf.set("mapreduce.fileoutputcommitter.marksuccessfuljobs", "true");
@@ -548,9 +547,11 @@ public class JavaActionExecutor extends
// to disable cancelation of delegation token on launcher job end
launcherJobConf.setBoolean("mapreduce.job.complete.cancel.delegation.tokens", false);
- // setting the group owning the Oozie job to allow anybody in that
- // group to kill the jobs.
- launcherJobConf.set("mapreduce.job.acl-modify-job", context.getWorkflow().getAcl());
+ if (context.getWorkflow().getAcl() != null) {
+ // setting the group owning the Oozie job to allow anybody in that
+ // group to kill the jobs.
+ launcherJobConf.set("mapreduce.job.acl-modify-job", context.getWorkflow().getAcl());
+ }
return launcherJobConf;
}
@@ -598,9 +599,11 @@ public class JavaActionExecutor extends
actionConf.set("mapred.job.name", jobName);
injectActionCallback(context, actionConf);
- // setting the group owning the Oozie job to allow anybody in that
- // group to kill the jobs.
- actionConf.set("mapreduce.job.acl-modify-job", context.getWorkflow().getGroup());
+ if (context.getWorkflow().getAcl() != null) {
+ // setting the group owning the Oozie job to allow anybody in that
+ // group to kill the jobs.
+ actionConf.set("mapreduce.job.acl-modify-job", context.getWorkflow().getAcl());
+ }
// Setting the credential properties in launcher conf
HashMap<String, CredentialsProperties> credentialsProperties = setCredentialPropertyToActionConf(context,
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java Sat Mar 10 04:33:40 2012
@@ -270,10 +270,9 @@ public class BundleSubmitXCommand extend
String bundleAppPathStr = conf.get(OozieClient.BUNDLE_APP_PATH);
Path bundleAppPath = new Path(bundleAppPathStr);
String user = ParamChecker.notEmpty(conf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String group = ParamChecker.notEmpty(conf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(bundleAppPath.toUri().getAuthority());
- FileSystem fs = has.createFileSystem(user, group, bundleAppPath.toUri(), fsConf);
+ FileSystem fs = has.createFileSystem(user, null, bundleAppPath.toUri(), fsConf);
// app path could be a directory
if (!fs.isFile(bundleAppPath)) {
@@ -327,14 +326,13 @@ public class BundleSubmitXCommand extend
*/
protected String readDefinition(String appPath) throws BundleJobException {
String user = ParamChecker.notEmpty(conf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String group = ParamChecker.notEmpty(conf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
//Configuration confHadoop = CoordUtils.getHadoopConf(conf);
try {
URI uri = new URI(appPath);
- LOG.debug("user =" + user + " group =" + group);
+ LOG.debug("user =" + user);
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, group, uri, fsConf);
+ FileSystem fs = has.createFileSystem(user, null, uri, fsConf);
Path appDefPath = null;
// app path could be a directory
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java Sat Mar 10 04:33:40 2012
@@ -409,11 +409,10 @@ public class CoordActionInputCheckXComma
LOG.debug("checking for the file " + sPath);
Path path = new Path(sPath);
String user = ParamChecker.notEmpty(actionConf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String group = ParamChecker.notEmpty(actionConf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
try {
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(path.toUri().getAuthority());
- return has.createFileSystem(user, group, path.toUri(), fsConf).exists(path);
+ return has.createFileSystem(user, null, path.toUri(), fsConf).exists(path);
}
catch (HadoopAccessorException e) {
throw new IOException(e);
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java Sat Mar 10 04:33:40 2012
@@ -406,10 +406,9 @@ public class CoordSubmitXCommand extends
String coordAppPathStr = conf.get(OozieClient.COORDINATOR_APP_PATH);
Path coordAppPath = new Path(coordAppPathStr);
String user = ParamChecker.notEmpty(conf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String group = ParamChecker.notEmpty(conf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(coordAppPath.toUri().getAuthority());
- FileSystem fs = has.createFileSystem(user, group, coordAppPath.toUri(), fsConf);
+ FileSystem fs = has.createFileSystem(user, null, coordAppPath.toUri(), fsConf);
// app path could be a directory
if (!fs.isFile(coordAppPath)) {
@@ -935,14 +934,13 @@ public class CoordSubmitXCommand extends
*/
protected String readDefinition(String appPath) throws CoordinatorJobException {
String user = ParamChecker.notEmpty(conf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String group = ParamChecker.notEmpty(conf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
// Configuration confHadoop = CoordUtils.getHadoopConf(conf);
try {
URI uri = new URI(appPath);
- LOG.debug("user =" + user + " group =" + group);
+ LOG.debug("user =" + user);
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, group, uri, fsConf);
+ FileSystem fs = has.createFileSystem(user, null, uri, fsConf);
Path appDefPath = null;
// app path could be a directory
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java Sat Mar 10 04:33:40 2012
@@ -58,9 +58,8 @@ public class CoordUtils {
Configuration conf = new Configuration();
ParamChecker.notNull(jobConf, "Configuration to be used for hadoop setup ");
String user = ParamChecker.notEmpty(jobConf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String group = ParamChecker.notEmpty(jobConf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
conf.set(HADOOP_USER, user);
- conf.set(HADOOP_UGI, user + "," + group);
+ conf.set(HADOOP_UGI, user + "," + null);
return conf;
}
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java Sat Mar 10 04:33:40 2012
@@ -363,7 +363,7 @@ public class AuthorizationService implem
private boolean isUserInAcl(String user, String aclStr) throws IOException {
boolean userInAcl = false;
- if (aclStr.trim().length() > 0) {
+ if (aclStr != null && aclStr.trim().length() > 0) {
GroupsService groupsService = Services.get().get(GroupsService.class);
String[] acl = aclStr.split(",");
for (int i = 0; !userInAcl && i < acl.length; i++) {
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java Sat Mar 10 04:33:40 2012
@@ -39,8 +39,7 @@ public class LiteWorkflowAppService exte
public WorkflowApp parseDef(Configuration jobConf, String authToken) throws WorkflowException {
String appPath = ParamChecker.notEmpty(jobConf.get(OozieClient.APP_PATH), OozieClient.APP_PATH);
String user = ParamChecker.notEmpty(jobConf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String group = ParamChecker.notEmpty(jobConf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
- String workflowXml = readDefinition(appPath, user, group, authToken, jobConf);
+ String workflowXml = readDefinition(appPath, user, null, authToken, jobConf);
return parseDef(workflowXml);
}
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java Sat Mar 10 04:33:40 2012
@@ -156,7 +156,6 @@ public abstract class WorkflowAppService
String hadoopUgi = user + "," + group;
conf.set(OozieClient.USER_NAME, user);
- conf.set(OozieClient.GROUP_NAME, group);
conf.set(HADOOP_UGI, hadoopUgi);
conf.set(HADOOP_JT_KERBEROS_NAME, jobConf.get(HADOOP_JT_KERBEROS_NAME));
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java Sat Mar 10 04:33:40 2012
@@ -84,7 +84,6 @@ public class TestCoordinatorEngine exten
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
final CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING");
@@ -139,7 +138,6 @@ public class TestCoordinatorEngine exten
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
final CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING");
@@ -194,7 +192,6 @@ public class TestCoordinatorEngine exten
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
final CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING");
@@ -249,7 +246,6 @@ public class TestCoordinatorEngine exten
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
final CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING");
@@ -319,7 +315,6 @@ public class TestCoordinatorEngine exten
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
final CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagELFunctions.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagELFunctions.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagELFunctions.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagELFunctions.java Sat Mar 10 04:33:40 2012
@@ -50,7 +50,6 @@ public class TestDagELFunctions extends
XConfiguration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, "appPath");
conf.set(OozieClient.USER_NAME, "user");
- conf.set(OozieClient.GROUP_NAME, "group");
conf.set("a", "A");
LiteWorkflowApp def =
new LiteWorkflowApp("name", "<workflow-app/>", new StartNodeDef("end")).addNode(new EndNodeDef("end"));
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagEngine.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagEngine.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagEngine.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestDagEngine.java Sat Mar 10 04:33:40 2012
@@ -104,7 +104,6 @@ public class TestDagEngine extends XTest
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set(OozieClient.ACTION_NOTIFICATION_URL, container.getServletURL("/callback") +
@@ -154,7 +153,6 @@ public class TestDagEngine extends XTest
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("signal-value", "OK");
@@ -176,7 +174,6 @@ public class TestDagEngine extends XTest
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("signal-value", "OK");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/ActionExecutorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/ActionExecutorTestCase.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/ActionExecutorTestCase.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/ActionExecutorTestCase.java Sat Mar 10 04:33:40 2012
@@ -207,7 +207,6 @@ public abstract class ActionExecutorTest
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
return protoConf;
}
@@ -232,7 +231,6 @@ public abstract class ActionExecutorTest
.addNode(new EndNodeDef("end"));
XConfiguration wfConf = new XConfiguration();
wfConf.set(OozieClient.USER_NAME, getTestUser());
- wfConf.set(OozieClient.GROUP_NAME, getTestGroup());
wfConf.set(OozieClient.APP_PATH, appUri.toString());
injectKerberosInfo(wfConf);
@@ -266,7 +264,6 @@ public abstract class ActionExecutorTest
"end"));
XConfiguration wfConf = new XConfiguration();
wfConf.set(OozieClient.USER_NAME, getTestUser());
- wfConf.set(OozieClient.GROUP_NAME, getTestGroup());
wfConf.set(OozieClient.APP_PATH, appUri.toString());
injectKerberosInfo(wfConf);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -79,7 +79,6 @@ public class TestDistCpActionExecutor ex
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
protoConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST, appJarPath.toString(), appSoPath.toString());
injectKerberosInfo(protoConf);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestFsELFunctions.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestFsELFunctions.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestFsELFunctions.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestFsELFunctions.java Sat Mar 10 04:33:40 2012
@@ -48,7 +48,6 @@ public class TestFsELFunctions extends X
String dir = new Path(getFsTestCaseDir(), "dir").toString();
Configuration protoConf = new Configuration();
protoConf.set(OozieClient.USER_NAME, getTestUser());
- protoConf.set(OozieClient.GROUP_NAME, "group");
protoConf.set("hadoop.job.ugi", getTestUser() + "," + "group");
injectKerberosInfo(protoConf);
@@ -67,7 +66,6 @@ public class TestFsELFunctions extends X
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, "appPath");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "group");
injectKerberosInfo(protoConf);
conf.set("test.dir", getTestCaseDir());
conf.set("file1", file1);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -237,7 +237,6 @@ public class TestHiveActionExecutor exte
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
SharelibUtils.addToDistributedCache("hive", getFileSystem(), getFsTestCaseDir(), protoConf);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -169,7 +169,6 @@ public class TestJavaActionExecutor exte
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
protoConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST, appJarPath.toString(), appSoPath.toString());
injectKerberosInfo(protoConf);
@@ -305,7 +304,6 @@ public class TestJavaActionExecutor exte
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
protoConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST, appJarPath.toString(), appSoPath.toString());
injectKerberosInfo(protoConf);
@@ -770,7 +768,6 @@ public class TestJavaActionExecutor exte
conf.set(OozieClient.APP_PATH, getNameNodeUri() + "/testPath");
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
WorkflowJobBean wfBean = createWorkflow(app, conf, "auth");
wfBean.setId(wfId);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java Sat Mar 10 04:33:40 2012
@@ -93,7 +93,6 @@ public class TestMapReduceActionError ex
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
@@ -171,7 +170,6 @@ public class TestMapReduceActionError ex
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
protoConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST, appJarPath.toString());
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -94,7 +94,6 @@ public class TestMapReduceActionExecutor
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
WorkflowJobBean wf = createBaseWorkflow(protoConf, "mr-action");
@@ -154,7 +153,6 @@ public class TestMapReduceActionExecutor
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
injectKerberosInfo(protoConf);
protoConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST, appJarPath.toString());
@@ -179,7 +177,6 @@ public class TestMapReduceActionExecutor
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
protoConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST, appJarPath.toString());
injectKerberosInfo(protoConf);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -112,7 +112,6 @@ public class TestPigActionExecutor exten
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
WorkflowJobBean wf = createBaseWorkflow(protoConf, "pig-action");
@@ -137,7 +136,6 @@ public class TestPigActionExecutor exten
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
SharelibUtils.addToDistributedCache("pig", fs, getFsTestCaseDir(), protoConf);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -99,7 +99,6 @@ public class TestShellActionExecutor ext
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
WorkflowJobBean wf = createBaseWorkflow(protoConf, "pig-action");
@@ -246,7 +245,6 @@ public class TestShellActionExecutor ext
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
// Make sure Kerbores prinicpal is in the conf
injectKerberosInfo(protoConf);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java Sat Mar 10 04:33:40 2012
@@ -287,7 +287,6 @@ public class TestSqoopActionExecutor ext
XConfiguration protoConf = new XConfiguration();
protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
- protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(protoConf);
FileSystem fs = getFileSystem();
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=1299149&r1=1299148&r2=1299149&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 Sat Mar 10 04:33:40 2012
@@ -62,7 +62,6 @@ public class TestOozieCLI extends DagSer
private String createConfigFile(String appPath) throws Exception {
String path = getTestCaseDir() + "/" + getName() + ".xml";
Configuration conf = new Configuration(false);
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
conf.set(OozieClient.APP_PATH, appPath);
conf.set(OozieClient.RERUN_SKIP_NODES, "node");
injectKerberosInfo(conf);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java Sat Mar 10 04:33:40 2012
@@ -253,7 +253,6 @@ public class TestCoordActionInputCheckXC
XConfiguration jobConf = new XConfiguration();
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(jobConf);
String confStr = jobConf.toXmlString(false);
coordJob.setConf(confStr);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java Sat Mar 10 04:33:40 2012
@@ -82,7 +82,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
String jobId = sc.call();
@@ -110,7 +109,6 @@ public class TestCoordSubmitXCommand ext
IOUtils.copyCharStream(reader, writer);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
try {
@@ -170,7 +168,6 @@ public class TestCoordSubmitXCommand ext
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
try {
@@ -242,7 +239,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
this.addRecordToBundleActionTable("OOZIE-B", "COORD-NAME", 0, Job.Status.PREP);
@@ -286,7 +282,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
this.addRecordToBundleActionTable("OOZIE-B", "COORD-NAME", 0, Job.Status.PREP);
@@ -339,7 +334,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
String jobId = sc.call();
@@ -373,7 +367,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
String jobId = sc.call();
@@ -407,7 +400,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
try {
sc.call();
@@ -436,7 +428,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
String jobId = sc.call();
@@ -462,7 +453,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
// conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
try {
sc.call();
@@ -489,7 +479,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
String jobId = sc.call();
@@ -529,7 +518,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
conf.set("MY_DONE_FLAG", "complete");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
String jobId = sc.call();
@@ -569,7 +557,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
conf.set("MY_DONE_FLAG", "complete");
conf.set("NAME", "test_app_name");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
@@ -598,7 +585,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
conf.set("MINUTES", "1");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
@@ -624,7 +610,6 @@ public class TestCoordSubmitXCommand ext
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
try {
sc.call();
@@ -660,7 +645,6 @@ public class TestCoordSubmitXCommand ext
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java Sat Mar 10 04:33:40 2012
@@ -116,7 +116,6 @@ public class TestFutureActionsTimeOut ex
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING");
String jobId = ce.submitJob(conf, true);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java Sat Mar 10 04:33:40 2012
@@ -80,7 +80,6 @@ public class TestPastActionsTimeOut exte
writeToFile(appXml, appPath);
conf.set(OozieClient.COORDINATOR_APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING");
String jobId = ce.submitJob(conf, true);
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java Sat Mar 10 04:33:40 2012
@@ -253,7 +253,6 @@ public class TestActionErrors extends XD
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("error", "end.error");
@@ -302,7 +301,6 @@ public class TestActionErrors extends XD
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("signal-value", "OK");
@@ -374,7 +372,6 @@ public class TestActionErrors extends XD
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("signal-value", "OK");
@@ -439,7 +436,6 @@ public class TestActionErrors extends XD
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("signal-value", "OK");
@@ -518,7 +514,6 @@ public class TestActionErrors extends XD
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("error", errorType);
@@ -557,7 +552,6 @@ public class TestActionErrors extends XD
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("error", errorType);
@@ -599,7 +593,6 @@ public class TestActionErrors extends XD
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
conf.set("external-status", "ok");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java Sat Mar 10 04:33:40 2012
@@ -255,7 +255,6 @@ public class TestActionStartXCommand ext
conf.set(OozieClient.APP_PATH, appUri.toString());
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus);
@@ -432,7 +431,6 @@ public class TestActionStartXCommand ext
conf.set(OozieClient.APP_PATH, appUri.toString());
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
// The properties should not be escaped here. It will be escaped when set to configuration.
conf.set("testAmpSign", "http://test.apache.com/a-webservices?urlSigner=signUrl&namespace=nova.proxy");
conf.set("testCDATA",
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestPurgeXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestPurgeXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestPurgeXCommand.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestPurgeXCommand.java Sat Mar 10 04:33:40 2012
@@ -242,7 +242,6 @@ public class TestPurgeXCommand extends X
conf.set(OozieClient.APP_PATH, appUri.toString());
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus);
wfBean.setStartTime(DateUtils.parseDateUTC("2015-12-18T01:00Z"));
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java Sat Mar 10 04:33:40 2012
@@ -53,7 +53,6 @@ public class TestSubmitXCommand extends
writeToFile(appXml, appPath + "/workflow.xml");
conf.set(OozieClient.APP_PATH, appPath + "/workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
conf.set("GB", "5");
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -75,7 +74,6 @@ public class TestSubmitXCommand extends
writeToFile(appXml, appPath + "/workflow.xml");
conf.set(OozieClient.APP_PATH, appPath);
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -96,7 +94,6 @@ public class TestSubmitXCommand extends
writeToFile(appXml, appPath + "/workflow.xml");
conf.set(OozieClient.APP_PATH, appPath + "/workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -117,7 +114,6 @@ public class TestSubmitXCommand extends
writeToFile(appXml, appPath + "/test.xml");
conf.set(OozieClient.APP_PATH, appPath + "/test.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
injectKerberosInfo(conf);
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
@@ -138,7 +134,6 @@ public class TestSubmitXCommand extends
writeToFile(appXml, appPath + "/test.xml");
conf.set(OozieClient.APP_PATH, appPath + "/does_not_exist.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, "other");
SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING");
try {
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowIdGetForExternalIdJPAExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowIdGetForExternalIdJPAExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowIdGetForExternalIdJPAExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowIdGetForExternalIdJPAExecutor.java Sat Mar 10 04:33:40 2012
@@ -71,7 +71,6 @@ public class TestWorkflowIdGetForExterna
conf.set(OozieClient.APP_PATH, "testPath");
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus);
wfBean.setExternalId("external-id");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobsGetForPurgeJPAExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobsGetForPurgeJPAExecutor.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobsGetForPurgeJPAExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobsGetForPurgeJPAExecutor.java Sat Mar 10 04:33:40 2012
@@ -77,7 +77,6 @@ public class TestWorkflowJobsGetForPurge
conf.set(OozieClient.APP_PATH, appUri.toString());
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus);
Timestamp startTS = new Timestamp(System.currentTimeMillis() - (3 * DAY_IN_MS));
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java Sat Mar 10 04:33:40 2012
@@ -87,7 +87,6 @@ public class TestActionCheckerService ex
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(WorkflowAppService.HADOOP_USER, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
conf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java Sat Mar 10 04:33:40 2012
@@ -124,7 +124,6 @@ public class TestLiteWorkflowAppService
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, "group");
injectKerberosInfo(jobConf);
WorkflowApp app = wps.parseDef(jobConf, "authToken");
@@ -165,7 +164,6 @@ public class TestLiteWorkflowAppService
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, "group");
injectKerberosInfo(jobConf);
LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf, "authToken");
@@ -204,7 +202,6 @@ public class TestLiteWorkflowAppService
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, "group");
injectKerberosInfo(jobConf);
try {
@@ -234,7 +231,6 @@ public class TestLiteWorkflowAppService
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, "group");
injectKerberosInfo(jobConf);
LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf, "authToken");
@@ -290,11 +286,9 @@ public class TestLiteWorkflowAppService
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(jobConf);
Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true);
assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME));
- assertEquals(getTestGroup(), protoConf.get(OozieClient.GROUP_NAME));
assertEquals(2, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length);
String f1 = protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST)[0];
@@ -334,11 +328,9 @@ public class TestLiteWorkflowAppService
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + "/workflow.xml");
jobConf.set(OozieClient.LIBPATH, "file://" + getTestCaseDir() + "/libx");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(jobConf);
Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true);
assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME));
- assertEquals(getTestGroup(), protoConf.get(OozieClient.GROUP_NAME));
assertEquals(3, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length);
List<String> found = new ArrayList<String>();
@@ -395,11 +387,9 @@ public class TestLiteWorkflowAppService
jobConf.setStrings(OozieClient.LIBPATH, "file://" + getTestCaseDir() + "/libx",
"file://" + getTestCaseDir() + "/liby", "file://" + getTestCaseDir() + "/libz");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(jobConf);
Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true);
assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME));
- assertEquals(getTestGroup(), protoConf.get(OozieClient.GROUP_NAME));
assertEquals(6, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length);
List<String> found = new ArrayList<String>();
@@ -447,12 +437,10 @@ public class TestLiteWorkflowAppService
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
jobConf.set(WorkflowAppService.APP_LIB_PATH_LIST, "parentdependency1.jar");
injectKerberosInfo(jobConf);
Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true);
assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME));
- assertEquals(getTestGroup(), protoConf.get(OozieClient.GROUP_NAME));
assertEquals(3, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length);
String f1 = protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST)[0];
@@ -500,11 +488,9 @@ public class TestLiteWorkflowAppService
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(jobConf);
Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true);
assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME));
- assertEquals(getTestGroup(), protoConf.get(OozieClient.GROUP_NAME));
assertEquals(2, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length);
String f1 = protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST)[0];
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java Sat Mar 10 04:33:40 2012
@@ -111,7 +111,6 @@ public class TestRecoveryService extends
Configuration conf = new XConfiguration();
conf.set(OozieClient.APP_PATH, getTestCaseDir() + File.separator + "workflow.xml");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
conf.set(OozieClient.LOG_TOKEN, "t");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java Sat Mar 10 04:33:40 2012
@@ -753,7 +753,6 @@ public class TestStatusTransitService ex
conf.set(OozieClient.APP_PATH, appUri.toString());
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus);
wfBean.setId(wfId);
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=1299149&r1=1299148&r2=1299149&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 Sat Mar 10 04:33:40 2012
@@ -71,7 +71,6 @@ public class TestJobsServlet extends Dag
int wfCount = MockDagEngineService.workflows.size();
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
jobConf.set(OozieClient.APP_PATH, appPath);
injectKerberosInfo(jobConf);
Map<String, String> params = new HashMap<String, String>();
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=1299149&r1=1299148&r2=1299149&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 Sat Mar 10 04:33:40 2012
@@ -69,7 +69,6 @@ public class TestV1JobsServlet extends D
int wfCount = MockDagEngineService.workflows.size();
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
jobConf.set(OozieClient.APP_PATH, appPath);
injectKerberosInfo(jobConf);
Map<String, String> params = new HashMap<String, String>();
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java Sat Mar 10 04:33:40 2012
@@ -126,7 +126,6 @@ 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.GROUP_NAME, "testGroup1");
conf1.set(WorkflowAppService.HADOOP_JT_KERBEROS_NAME, "JT");
conf1.set(WorkflowAppService.HADOOP_NN_KERBEROS_NAME, "NN");
wfBean1 = createWorkflow(app, conf1, "auth");
@@ -135,7 +134,6 @@ public class TestDBWorkflowStore extends
conf2.set(OozieClient.APP_PATH, "testPath");
conf2.set(OozieClient.LOG_TOKEN, "testToken");
conf2.set(OozieClient.USER_NAME, "testUser2");
- conf2.set(OozieClient.GROUP_NAME, "testGroup2");
conf2.set(WorkflowAppService.HADOOP_JT_KERBEROS_NAME, "JT");
conf2.set(WorkflowAppService.HADOOP_NN_KERBEROS_NAME, "NN");
wfBean2 = createWorkflow(app, conf2, "auth");
@@ -468,7 +466,6 @@ public class TestDBWorkflowStore extends
conf2.set(OozieClient.APP_PATH, "testPath");
conf2.set(OozieClient.LOG_TOKEN, "testToken");
conf2.set(OozieClient.USER_NAME, "testUser2");
- conf2.set(OozieClient.GROUP_NAME, "testGroup2");
conf2.set(WorkflowAppService.HADOOP_JT_KERBEROS_NAME, "JT");
conf2.set(WorkflowAppService.HADOOP_NN_KERBEROS_NAME, "NN");
WorkflowJobBean wfBean3 = createWorkflow(app, conf2, "auth");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java Sat Mar 10 04:33:40 2012
@@ -545,7 +545,6 @@ public abstract class XDataTestCase exte
conf.set(OozieClient.APP_PATH, appUri.toString());
conf.set(OozieClient.LOG_TOKEN, "testToken");
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
injectKerberosInfo(conf);
WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus);
@@ -856,7 +855,6 @@ public abstract class XDataTestCase exte
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.COORDINATOR_APP_PATH, appPath.toString());
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set(OozieClient.GROUP_NAME, getTestGroup());
jobConf.set("jobTracker", getJobTrackerUri());
jobConf.set("nameNode", getNameNodeUri());
jobConf.set("wfAppPath", wfAppPath.toString());
@@ -1006,7 +1004,6 @@ public abstract class XDataTestCase exte
Configuration conf = new XConfiguration();
conf.set(OozieClient.BUNDLE_APP_PATH, bundleAppPath.toString());
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
conf.set("jobTracker", getJobTrackerUri());
conf.set("nameNode", getNameNodeUri());
injectKerberosInfo(conf);
@@ -1062,7 +1059,6 @@ public abstract class XDataTestCase exte
Configuration conf = new XConfiguration();
conf.set(OozieClient.BUNDLE_APP_PATH, bundleAppPath.toString());
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.GROUP_NAME, getTestGroup());
conf.set("jobTracker", getJobTrackerUri());
conf.set("nameNode", getNameNodeUri());
injectKerberosInfo(conf);
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1299149&r1=1299148&r2=1299149&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Sat Mar 10 04:33:40 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-752 if group.name/oozie.job.acl is not defined in job.properties job submission fails (tucu)
OOZIE-753 default hadoop config file does not endup in the distro and hadoop config doc typo (tucu)
OOZIE-747 HadoopAccessorService hadoop-configs should be loaded from Hadoop -site.xml files (tucu)
OOZIE-746 JobConf/Configuration creation is inconsistent and makes things fail in odd ways (tucu)