Преглед изворни кода

AMBARI-13184 SQLA text in UI should be changed. (ababiichuk)

aBabiichuk пре 10 година
родитељ
комит
79809b2628

+ 1 - 1
ambari-web/app/data/HDP2.3/site_properties.js

@@ -82,7 +82,7 @@ hdp23properties.push({
         displayName: 'MSSQL'
         displayName: 'MSSQL'
       },
       },
       {
       {
-        displayName: 'SQLA',
+        displayName: 'SQL Anywhere',
         hidden: App.get('currentStackName') !== 'SAPHD' && App.get('currentStackName') !== 'HDP'
         hidden: App.get('currentStackName') !== 'SAPHD' && App.get('currentStackName') !== 'HDP'
       }
       }
     ],
     ],

+ 2 - 2
ambari-web/app/data/HDP2/site_properties.js

@@ -475,7 +475,7 @@ var hdp2properties = [
         hidden: false
         hidden: false
       },
       },
       {
       {
-        displayName: 'Existing SQLA Database',
+        displayName: 'Existing SQL Anywhere Database',
         hidden: App.get('currentStackName') !== 'SAPHD' && (App.get('currentStackName') !== 'HDP' || !App.get('isHadoop23Stack'))
         hidden: App.get('currentStackName') !== 'SAPHD' && (App.get('currentStackName') !== 'HDP' || !App.get('isHadoop23Stack'))
       }
       }
     ],
     ],
@@ -629,7 +629,7 @@ var hdp2properties = [
         hidden: false
         hidden: false
       },
       },
       {
       {
-        displayName: 'Existing SQLA Database',
+        displayName: 'Existing SQL Anywhere Database',
         hidden: App.get('currentStackName') !== 'SAPHD' && (App.get('currentStackName') !== 'HDP' || !App.get('isHadoop23Stack'))
         hidden: App.get('currentStackName') !== 'SAPHD' && (App.get('currentStackName') !== 'HDP' || !App.get('isHadoop23Stack'))
       }
       }
     ],
     ],

+ 1 - 1
ambari-web/app/data/db_properties_info.js

@@ -98,7 +98,7 @@ module.exports = {
       'sql_jar_connector': '/usr/share/java/sqljdbc4.jar',
       'sql_jar_connector': '/usr/share/java/sqljdbc4.jar',
       'db_type': 'mssql'
       'db_type': 'mssql'
     },
     },
-    'SQLA': {
+    'ANYWHERE': {
       'connection_url': 'jdbc:sqlanywhere:host={0};database={1}',
       'connection_url': 'jdbc:sqlanywhere:host={0};database={1}',
       'driver': 'sap.jdbc4.sqlanywhere.IDriver',
       'driver': 'sap.jdbc4.sqlanywhere.IDriver',
       'sql_jar_connector': '/path_to_driver/sqla-client-jdbc.tar.gz',
       'sql_jar_connector': '/path_to_driver/sqla-client-jdbc.tar.gz',

+ 1 - 1
ambari-web/app/messages.js

@@ -726,7 +726,7 @@ Em.I18n.translations = {
   'installer.step4.ambariMetricsCheck.popup.header':'Limited Functionality Warning',
   '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.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.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>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>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:' +
     '<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:' +

+ 4 - 4
ambari-web/app/views/common/controls_view.js

@@ -481,7 +481,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
    */
    */
   getDbTypeFromRadioValue: function() {
   getDbTypeFromRadioValue: function() {
     var currentValue = this.get('serviceConfig.value');
     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')) {
     if (this.get('inMSSQLWithIA')) {
       return 'MSSQL2';
       return 'MSSQL2';
     } else {
     } else {
@@ -649,9 +649,9 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
     }
     }
     var handledProperties = ['oozie_database', 'hive_database', 'DB_FLAVOR'];
     var handledProperties = ['oozie_database', 'hive_database', 'DB_FLAVOR'];
     var currentValue = this.get('serviceConfig.value');
     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 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 currentDBType = currentValue.match(databasesTypes)[0];
     var checkDatabase = /existing/gi.test(currentValue);
     var checkDatabase = /existing/gi.test(currentValue);
     // db connection check button show up if existed db selected
     // db connection check button show up if existed db selected
@@ -1110,7 +1110,7 @@ App.CheckDBConnectionView = Ember.View.extend({
 
 
     if (this.get('parentView.service.serviceName') === 'RANGER') {
     if (this.get('parentView.service.serviceName') === 'RANGER') {
       var dbFlavor = this.get('parentView.categoryConfigsAll').findProperty('name','DB_FLAVOR').get('value'),
       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():'';
         dbType = dbFlavor.match(databasesTypes)?dbFlavor.match(databasesTypes)[0].toLowerCase():'';
 
 
       if (dbType==='oracle') {
       if (dbType==='oracle') {