Author: srimanth
Date: Tue Apr 9 20:56:26 2013
New Revision: 1466227
URL: http://svn.apache.org/r1466227
Log:
AMBARI-1848. Install Wizard, Step 7: Oozie Database Derby option should say
"New Derby Database", not "Current Derby Database". (Xi Wang via srimanth)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/trunk/ambari-web/app/data/config_properties.js
incubator/ambari/trunk/ambari-web/app/mappers/dataset_mapper.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1466227&r1=1466226&r2=1466227&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 9 20:56:26 2013
@@ -668,6 +668,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1848. Install Wizard, Step 7: Oozie Database Derby option should say
+ "New Derby Database", not "Current Derby Database". (Xi Wang via srimanth)
+
AMBARI-1860. Master broken - Cannot deploy services. (smohanty)
AMBARI-1859. Cannot load Nagios Alerts due to 400 Bad Request. (smohanty)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js?rev=1466227&r1=1466226&r2=1466227&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
Tue Apr 9 20:56:26 2013
@@ -769,7 +769,7 @@ App.MainServiceInfoConfigsController = E
setOozieHostName: function (globals) {
if (globals.someProperty('name', 'oozie_database')) {
var oozieDb = globals.findProperty('name', 'oozie_database');
- if (oozieDb.value === 'Current Derby Database'){
+ if (oozieDb.value === 'New Derby Database'){
globals = globals.without(globals.findProperty('name',
'oozie_ambari_host'));
globals = globals.without(globals.findProperty('name',
'oozie_ambari_database'));
globals = globals.without(globals.findProperty('name',
'oozie_existing_mysql_host'));
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1466227&r1=1466226&r2=1466227&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
Tue Apr 9 20:56:26 2013
@@ -120,7 +120,7 @@ App.WizardStep8Controller = Em.Controlle
var oozieJdbcDriver = {name: 'oozie_jdbc_driver'};
var oozieJPAServcieURL = {name: 'oozie_JPAService_url'};
- if (oozieDb.value === 'Current Derby Database'){
+ if (oozieDb.value === 'New Derby Database'){
oozieDbType.value = 'derby';
oozieJdbcDriver.value = 'org.apache.derby.jdbc.EmbeddedDriver';
oozieJPAServcieURL.value =
'${oozie.data.dir}/${oozie.db.schema.name}-db;create=true'; ///////
@@ -699,7 +699,7 @@ App.WizardStep8Controller = Em.Controlle
loadOozieDbValue: function (dbComponent) {
var oozieDb = App.db.getServiceConfigProperties().findProperty('name',
'oozie_database');
- if (oozieDb.value === 'Current Derby Database'){
+ if (oozieDb.value === 'New Derby Database'){
var db = App.db.getServiceConfigProperties().findProperty('name',
'oozie_derby_database');
dbComponent.set('component_value', db.value + ' (' + oozieDb.value +
')');
} else if (oozieDb.value === 'New MySQL Database') {
Modified: incubator/ambari/trunk/ambari-web/app/data/config_properties.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_properties.js?rev=1466227&r1=1466226&r2=1466227&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Tue Apr 9
20:56:26 2013
@@ -2254,10 +2254,10 @@ module.exports =
"name": "oozie_database",
"displayName": "Oozie Database",
"value": "",
- "defaultValue": "Current Derby Database",
+ "defaultValue": "New Derby Database",
"options": [
{
- displayName: 'Current Derby Database',
+ displayName: 'New Derby Database',
foreignKeys: ['oozie_derby_database']
},
{
Modified: incubator/ambari/trunk/ambari-web/app/mappers/dataset_mapper.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/mappers/dataset_mapper.js?rev=1466227&r1=1466226&r2=1466227&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/mappers/dataset_mapper.js (original)
+++ incubator/ambari/trunk/ambari-web/app/mappers/dataset_mapper.js Tue Apr 9
20:56:26 2013
@@ -178,8 +178,6 @@ App.dataSetMapper = App.QuickDataMapper.
}
}, this);
-
- debugger;
console.debug('Before load: App.Dataset.find().content : ' +
App.Dataset.find().content);
App.store.loadMany(this.get('model'), dataset_results);
console.debug('After load: App.Dataset.find().content : ' +
App.Dataset.find().content);
