You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/09/22 14:16:19 UTC
ambari git commit: AMBARI-13184 SQLA text in UI should be changed.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 da192f535 -> ed7a9be1e
AMBARI-13184 SQLA text in UI should be changed. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed7a9be1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed7a9be1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed7a9be1
Branch: refs/heads/branch-2.1
Commit: ed7a9be1e7a8792f73c412e61725f9bc6a6ec938
Parents: da192f5
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Sep 14 11:40:26 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Sep 22 15:16:14 2015 +0300
----------------------------------------------------------------------
ambari-web/app/data/HDP2.3/site_properties.js | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 4 ++--
ambari-web/app/data/db_properties_info.js | 2 +-
ambari-web/app/messages.js | 2 +-
ambari-web/app/views/common/controls_view.js | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7a9be1/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index adf8cae..4ea661d 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -82,7 +82,7 @@ hdp23properties.push({
displayName: 'MSSQL'
},
{
- displayName: 'SQLA',
+ displayName: 'SQL Anywhere',
hidden: App.get('currentStackName') !== 'SAPHD' && App.get('currentStackName') !== 'HDP'
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7a9be1/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 3a57e93..d6fdca4 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -476,7 +476,7 @@ var hdp2properties = [
hidden: false
},
{
- displayName: 'Existing SQLA Database',
+ displayName: 'Existing SQL Anywhere Database',
hidden: App.get('currentStackName') !== 'SAPHD' && (App.get('currentStackName') !== 'HDP' || !App.get('isHadoop23Stack'))
}
],
@@ -630,7 +630,7 @@ var hdp2properties = [
hidden: false
},
{
- displayName: 'Existing SQLA Database',
+ displayName: 'Existing SQL Anywhere Database',
hidden: App.get('currentStackName') !== 'SAPHD' && (App.get('currentStackName') !== 'HDP' || !App.get('isHadoop23Stack'))
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7a9be1/ambari-web/app/data/db_properties_info.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/db_properties_info.js b/ambari-web/app/data/db_properties_info.js
index 0477677..6ee7770 100644
--- a/ambari-web/app/data/db_properties_info.js
+++ b/ambari-web/app/data/db_properties_info.js
@@ -98,7 +98,7 @@ module.exports = {
'sql_jar_connector': '/usr/share/java/sqljdbc4.jar',
'db_type': 'mssql'
},
- 'SQLA': {
+ 'ANYWHERE': {
'connection_url': 'jdbc:sqlanywhere:host={0};database={1}',
'driver': 'sap.jdbc4.sqlanywhere.IDriver',
'sql_jar_connector': '/path_to_driver/sqla-client-jdbc.tar.gz',
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7a9be1/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6d5629f..44cb70c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -725,7 +725,7 @@ Em.I18n.translations = {
'installer.step4.ambariMetricsCheck.popup.header':'Limited Functionality Warning',
'installer.step4.ambariMetricsCheck.popup.body':'Ambari Metrics collects metrics from the cluster and makes them available to Ambari. If you do not install Ambari Metrics service, metrics will not be accessible from Ambari. Are you sure you want to proceed without Ambari Metrics?',
'installer.step4.rangerRequirements.popup.header': 'Ranger Requirements',
- 'installer.step4.rangerRequirements.popup.body.requirements': '<ol><li>You must have an <strong>MySQL/Oracle/Postgres/MSSQL/SQLA Server</strong> database instance running to be used by Ranger.</li>' +
+ 'installer.step4.rangerRequirements.popup.body.requirements': '<ol><li>You must have an <strong>MySQL/Oracle/Postgres/MSSQL/SQL Anywhere Server</strong> database instance running to be used by Ranger.</li>' +
'<li>In Assign Masters step of this wizard, you will be prompted to specify which host for the Ranger Admin. On that host, you <strong>must have DB Client installed</strong> for Ranger to access to the database. (Note: This is applicable for only Ranger 0.4.0)</li>' +
'<li>Ensure that the access for the DB Admin user is enabled in DB server from any host.</li>' +
'<li>Execute the following command on the Ambari Server host. Replace <code>database-type</code> with <strong>mysql|oracle|postgres|mssql|sqlanywhere</strong> and <code>/jdbc/driver/path</code> based on the location of corresponding JDBC driver:' +
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7a9be1/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index 73b928e..a6e962b 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -480,7 +480,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
*/
getDbTypeFromRadioValue: function() {
var currentValue = this.get('serviceConfig.value');
- var databases = /MySQL|Postgres|Oracle|Derby|MSSQL|SQLA/gi;
+ var databases = /MySQL|Postgres|Oracle|Derby|MSSQL|Anywhere/gi;
if (this.get('inMSSQLWithIA')) {
return 'MSSQL2';
} else {
@@ -648,9 +648,9 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
}
var handledProperties = ['oozie_database', 'hive_database', 'DB_FLAVOR'];
var currentValue = this.get('serviceConfig.value');
- var databases = /MySQL|PostgreSQL|Postgres|Oracle|Derby|MSSQL|SQLA/gi;
+ var databases = /MySQL|PostgreSQL|Postgres|Oracle|Derby|MSSQL|Anywhere/gi;
var currentDB = currentValue.match(databases)[0];
- var databasesTypes = /MySQL|Postgres|Oracle|Derby|MSSQL|SQLA/gi;
+ var databasesTypes = /MySQL|Postgres|Oracle|Derby|MSSQL|Anywhere/gi;
var currentDBType = currentValue.match(databasesTypes)[0];
var checkDatabase = /existing/gi.test(currentValue);
// db connection check button show up if existed db selected
@@ -1109,7 +1109,7 @@ App.CheckDBConnectionView = Ember.View.extend({
if (this.get('parentView.service.serviceName') === 'RANGER') {
var dbFlavor = this.get('parentView.categoryConfigsAll').findProperty('name','DB_FLAVOR').get('value'),
- databasesTypes = /MYSQL|POSTGRES|ORACLE|MSSQL|SQLA/gi,
+ databasesTypes = /MYSQL|POSTGRES|ORACLE|MSSQL|Anywhere/gi,
dbType = dbFlavor.match(databasesTypes)?dbFlavor.match(databasesTypes)[0].toLowerCase():'';
if (dbType==='oracle') {