From 60b6df17418553408becb339578fbb6512cfae5e Mon Sep 17 00:00:00 2001
From: "shaik.idris" <psychidris@gmail.com>
Date: Mon, 1 Oct 2012 16:33:59 +0530
Subject: [PATCH] Fix for mapred.job.priority, using oozie.launcher suffix

---
 .../resources/config/workflow/replication-workflow.xml    | 8 ++++----
 .../main/resources/config/workflow/retention-workflow.xml | 4 ++--
 .../ivory/oozie/workflow/IvoryPostProcessingTest.java     | 4 ++--
 .../resources/config/workflow/process-parent-workflow.xml | 6 +++---
 .../java/org/apache/ivory/resource/AbstractTestBase.java  | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/feed/src/main/resources/config/workflow/replication-workflow.xml b/feed/src/main/resources/config/workflow/replication-workflow.xml
index 8685f33d..c58e9622 100644
--- a/feed/src/main/resources/config/workflow/replication-workflow.xml
+++ b/feed/src/main/resources/config/workflow/replication-workflow.xml
@@ -35,7 +35,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
@@ -58,7 +58,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
@@ -86,7 +86,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
@@ -132,7 +132,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
diff --git a/feed/src/main/resources/config/workflow/retention-workflow.xml b/feed/src/main/resources/config/workflow/retention-workflow.xml
index d17246f6..4e9ebc0c 100644
--- a/feed/src/main/resources/config/workflow/retention-workflow.xml
+++ b/feed/src/main/resources/config/workflow/retention-workflow.xml
@@ -27,7 +27,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
@@ -53,7 +53,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
diff --git a/oozie/src/test/java/org/apache/ivory/oozie/workflow/IvoryPostProcessingTest.java b/oozie/src/test/java/org/apache/ivory/oozie/workflow/IvoryPostProcessingTest.java
index ec619cc6..0a9c3dc5 100644
--- a/oozie/src/test/java/org/apache/ivory/oozie/workflow/IvoryPostProcessingTest.java
+++ b/oozie/src/test/java/org/apache/ivory/oozie/workflow/IvoryPostProcessingTest.java
@@ -71,10 +71,10 @@ public void setup() throws Exception {
 				"-" + Arg.WF_ENGINE_URL.getOptionName(),
 				"http://localhost:11000/oozie/",
 				"-" + Arg.LOG_DIR.getOptionName(), "target/log",
-				"-" + Arg.USER_SUBFLOW_ID.getOptionName(), "userflow@wf-id" };
+				"-" + Arg.USER_SUBFLOW_ID.getOptionName(), "userflow@wf-id"+"test" };
 		broker = new BrokerService();
-		broker.setDataDirectory("target/activemq");
 		broker.addConnector(BROKER_URL);
+		broker.setDataDirectory("target/activemq");
 		broker.setBrokerName("localhost");
 		broker.start();
 	}
diff --git a/process/src/main/resources/config/workflow/process-parent-workflow.xml b/process/src/main/resources/config/workflow/process-parent-workflow.xml
index d6c5701f..82024a41 100644
--- a/process/src/main/resources/config/workflow/process-parent-workflow.xml
+++ b/process/src/main/resources/config/workflow/process-parent-workflow.xml
@@ -35,7 +35,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
@@ -68,7 +68,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
@@ -114,7 +114,7 @@
 					<value>${wf:conf('mapred.job.queue.name')}</value>
 				</property>
 				<property>
-					<name>mapred.job.priority</name>
+					<name>oozie.launcher.mapred.job.priority</name>
 					<value>${wf:conf('mapred.job.priority')}</value>
 				</property>
 			</configuration>
diff --git a/webapp/src/test/java/org/apache/ivory/resource/AbstractTestBase.java b/webapp/src/test/java/org/apache/ivory/resource/AbstractTestBase.java
index 52013dc9..e864c6a1 100644
--- a/webapp/src/test/java/org/apache/ivory/resource/AbstractTestBase.java
+++ b/webapp/src/test/java/org/apache/ivory/resource/AbstractTestBase.java
@@ -68,7 +68,7 @@ public class AbstractTestBase {
     protected static final String PROCESS_TEMPLATE = "/process-template.xml";
 
     protected static final String BASE_URL = "http://localhost:15000/";
-    protected static final String REMOTE_USER="guest";
+    protected static final String REMOTE_USER=System.getProperty("user.name");
 
     protected EmbeddedServer server;