Author: kamrul
Date: Fri Mar  9 01:35:20 2012
New Revision: 1298684

URL: http://svn.apache.org/viewvc?rev=1298684&view=rev
Log:
OOZIE-740 oozie-site.xml should exclude StoreService entries as it is replaced 
by JPAService.(Mona via Mohammad)

Modified:
    incubator/oozie/branches/branch-3.1/core/src/main/conf/oozie-site.xml
    incubator/oozie/branches/branch-3.1/release-log.txt

Modified: incubator/oozie/branches/branch-3.1/core/src/main/conf/oozie-site.xml
URL: 
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/main/conf/oozie-site.xml?rev=1298684&r1=1298683&r2=1298684&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/core/src/main/conf/oozie-site.xml 
(original)
+++ incubator/oozie/branches/branch-3.1/core/src/main/conf/oozie-site.xml Fri 
Mar  9 01:35:20 2012
@@ -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>

Modified: incubator/oozie/branches/branch-3.1/release-log.txt
URL: 
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/release-log.txt?rev=1298684&r1=1298683&r2=1298684&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.1/release-log.txt Fri Mar  9 01:35:20 2012
@@ -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)


Reply via email to