You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2016/08/02 20:23:17 UTC
oozie git commit: OOZIE-2555 Oozie SSL enable setup does not return
port for admin -servers (abhishekbafna via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master 99a3df568 -> 09cd6042a
OOZIE-2555 Oozie SSL enable setup does not return port for admin -servers (abhishekbafna via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/09cd6042
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/09cd6042
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/09cd6042
Branch: refs/heads/master
Commit: 09cd6042ae2c1222a67aac0b90003d82d39fe33b
Parents: 99a3df5
Author: Robert Kanter <rk...@cloudera.com>
Authored: Tue Aug 2 13:23:00 2016 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Tue Aug 2 13:23:00 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/oozie/service/ConfigurationService.java | 1 +
core/src/main/resources/oozie-default.xml | 8 ++++++++
.../org/apache/oozie/service/TestConfigurationService.java | 2 ++
release-log.txt | 1 +
4 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/09cd6042/core/src/main/java/org/apache/oozie/service/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/ConfigurationService.java b/core/src/main/java/org/apache/oozie/service/ConfigurationService.java
index 7f140d9..524d4d6 100644
--- a/core/src/main/java/org/apache/oozie/service/ConfigurationService.java
+++ b/core/src/main/java/org/apache/oozie/service/ConfigurationService.java
@@ -113,6 +113,7 @@ public class ConfigurationService implements Service, Instrumentable {
CONF_SYS_PROPS.add("oozie.http.hostname");
CONF_SYS_PROPS.add("oozie.http.port");
+ CONF_SYS_PROPS.add("oozie.https.port");
CONF_SYS_PROPS.add(ZKUtils.OOZIE_INSTANCE_ID);
// These properties should be masked when displayed because they contain sensitive info (e.g. password)
http://git-wip-us.apache.org/repos/asf/oozie/blob/09cd6042/core/src/main/resources/oozie-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml
index 530c2ed..6a9d5c4 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -2492,6 +2492,14 @@ will be the requeue interval for the actions which are waiting for a long time w
</property>
<property>
+ <name>oozie.https.port</name>
+ <value>11443</value>
+ <description>
+ Oozie ssl server port.
+ </description>
+ </property>
+
+ <property>
<name>oozie.instance.id</name>
<value>${oozie.http.hostname}</value>
<description>
http://git-wip-us.apache.org/repos/asf/oozie/blob/09cd6042/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java b/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java
index 2153bf1..f18a8c0 100644
--- a/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java
@@ -274,6 +274,8 @@ public class TestConfigurationService extends XTestCase {
assertEquals(7, ConfigurationService.getInt(ShareLibService.LAUNCHERJAR_LIB_RETENTION));
assertEquals(5000, ConfigurationService.getInt(SLAService.CONF_CAPACITY));
+ assertEquals(11000, ConfigurationService.getInt("oozie.http.port"));
+ assertEquals(11443, ConfigurationService.getInt("oozie.https.port"));
cl.destroy();
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/09cd6042/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 5913ab7..0e2cf86 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2555 Oozie SSL enable setup does not return port for admin -servers (abhishekbafna via rkanter)
OOZIE-2440 Exponential re-try policy for workflow action (satishsaley via jaydeepvishwakarma)
OOZIE-2539 Incorrect property key is used for 'hive log4j configuration file for execution mode' (abhishekbafna via jaydeepvishwakarma)
OOZIE-2565 [Oozie web Console] Make the timezones in settings tab to be sorted by default (meetchandan via jaydeepvishwakarma)