OOZIE-740 oozie-site.xml should exclude StoreService entries as it is replaced by JPAService.(Mona via Mohammad)
git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/branches/branch-3.1@1298684 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/conf/oozie-site.xml b/core/src/main/conf/oozie-site.xml
index e17ba7b..f26648d 100644
--- a/core/src/main/conf/oozie-site.xml
+++ b/core/src/main/conf/oozie-site.xml
@@ -119,63 +119,6 @@
</property>
<property>
- <name>oozie.service.StoreService.create.db.schema</name>
- <value>true</value>
- <description>
- Creates Oozie DB.
-
- If set to true, it creates the DB schema if it does not exist. If the DB schema exists is a NOP.
- If set to false, it does not create the DB schema. If the DB schema does not exist it fails start up.
- </description>
- </property>
-
- <property>
- <name>oozie.service.StoreService.jdbc.driver</name>
- <value>org.apache.derby.jdbc.EmbeddedDriver</value>
- <description>
- JDBC driver class.
- </description>
- </property>
-
- <property>
- <name>oozie.service.StoreService.jdbc.url</name>
- <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
- <description>
- JDBC URL.
- </description>
- </property>
-
- <property>
- <name>oozie.service.StoreService.jdbc.username</name>
- <value>sa</value>
- <description>
- DB user name.
- </description>
- </property>
-
- <property>
- <name>oozie.service.StoreService.jdbc.password</name>
- <value> </value>
- <description>
- DB user password.
-
- IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
- if empty Configuration assumes it is NULL.
-
- IMPORTANT: if the StoreServicePasswordService is active, it will reset this value with the value given in
- the console.
- </description>
- </property>
-
- <property>
- <name>oozie.service.StoreService.pool.max.active.conn</name>
- <value>10</value>
- <description>
- Max number of connections.
- </description>
- </property>
-
- <property>
<name>oozie.service.HadoopAccessorService.kerberos.enabled</name>
<value>false</value>
<description>
diff --git a/release-log.txt b/release-log.txt
index 8e3021f..c955cc9 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 3.1.4 release
+OOZIE-740 oozie-site.xml should exclude StoreService entries as it is replaced by JPAService.(Mona via Mohammad)
OOZIE-714, 716 and 3.1 Backport of OOZIE-691 - Fix testcases to be compatible with Hadoop 0.23(Mona via Mohammad)
OOZIE-688: POM file changes for oozie version 3.1.4 having Hadoop 23 support(Mona via Mohammad)
OOZIE-733 Script to inject the JARs required by Oozie to run with Hadoop 23 (Mona via Mohammad)
