You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2012/07/23 08:56:03 UTC

svn commit: r1364519 - in /incubator/oozie/trunk: ./ client/src/main/java/org/apache/oozie/client/ core/src/main/java/org/apache/oozie/action/hadoop/ core/src/test/java/org/apache/oozie/command/coord/ examples/src/main/java/org/apache/oozie/example/

Author: virag
Date: Mon Jul 23 06:56:02 2012
New Revision: 1364519

URL: http://svn.apache.org/viewvc?rev=1364519&view=rev
Log:
OOZIE-915 Obsolete NN/JT kerberos principal property names not removed from some places (mona via virag)

Modified:
    incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/XOozieClient.java
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
    incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
    incubator/oozie/trunk/examples/src/main/java/org/apache/oozie/example/LocalOozieExample.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/XOozieClient.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/XOozieClient.java?rev=1364519&r1=1364518&r2=1364519&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/XOozieClient.java (original)
+++ incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/XOozieClient.java Mon Jul 23 06:56:02 2012
@@ -36,10 +36,6 @@ public class XOozieClient extends OozieC
 
     public static final String NN = "fs.default.name";
 
-    public static final String JT_PRINCIPAL = "mapreduce.jobtracker.kerberos.principal";
-
-    public static final String NN_PRINCIPAL = "dfs.namenode.kerberos.principal";
-
     public static final String PIG_SCRIPT = "oozie.pig.script";
 
     public static final String PIG_OPTIONS = "oozie.pig.options";

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=1364519&r1=1364518&r2=1364519&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 Mon Jul 23 06:56:02 2012
@@ -514,8 +514,6 @@ public class JavaActionExecutor extends 
 
     static {
         SPECIAL_PROPERTIES.add(QUEUE_NAME);
-        SPECIAL_PROPERTIES.add("mapreduce.jobtracker.kerberos.principal");
-        SPECIAL_PROPERTIES.add("dfs.namenode.kerberos.principal");
         SPECIAL_PROPERTIES.add(ACL_VIEW_JOB);
         SPECIAL_PROPERTIES.add(ACL_MODIFY_JOB);
     }

Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java?rev=1364519&r1=1364518&r2=1364519&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java Mon Jul 23 06:56:02 2012
@@ -244,8 +244,6 @@ public class TestCoordActionStartXComman
         createdConf += "<value>localhost:9001</value></property>";
         createdConf += "<property> <name>nameNode</name> <value>hdfs://localhost:9000</value></property>";
         createdConf += "<property> <name>queueName</name> <value>default</value></property>";
-        createdConf += "<property> <name>mapreduce.jobtracker.kerberos.principal</name> <value>default</value></property>";
-        createdConf += "<property> <name>dfs.namenode.kerberos.principal</name> <value>default</value></property>";
         createdConf += "</configuration> ";
 
         action.setCreatedConf(createdConf);

Modified: incubator/oozie/trunk/examples/src/main/java/org/apache/oozie/example/LocalOozieExample.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/examples/src/main/java/org/apache/oozie/example/LocalOozieExample.java?rev=1364519&r1=1364518&r2=1364519&view=diff
==============================================================================
--- incubator/oozie/trunk/examples/src/main/java/org/apache/oozie/example/LocalOozieExample.java (original)
+++ incubator/oozie/trunk/examples/src/main/java/org/apache/oozie/example/LocalOozieExample.java Mon Jul 23 06:56:02 2012
@@ -65,8 +65,6 @@ public class LocalOozieExample {
             // create a workflow job configuration and set the workflow application path
             Properties conf = wc.createConfiguration();
             conf.setProperty(OozieClient.APP_PATH, appUri + File.separator + "workflow.xml");
-            conf.setProperty("mapreduce.jobtracker.kerberos.principal", "mapred/localhost@LOCALHOST");
-            conf.setProperty("dfs.namenode.kerberos.principal", "hdfs/localhost@LOCALHOST");
             // load additional workflow job parameters from properties file
             if (propertiesFile != null) {
                 conf.load(new FileInputStream(propertiesFile));

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1364519&r1=1364518&r2=1364519&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Jul 23 06:56:02 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (trunk - unreleased)
 
+OOZIE-915 Obsolete NN/JT kerberos principal property names not removed from some places (mona via virag)
 OOZIE-707 Suspending a paused coordinator job suspends the children but the status of job remains unchanged (virag)
 OOZIE-917 Coordinator Job from 'KILLED' or 'FAILED' doesn't move to 'DONEWITHERROR' if the job materialization is not done(virag)
 OOZIE-916 aggregator example uses hardcoded 'examples' value instead of parameterized (examplesRoot) value in path (wypoon via virag)