ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [11/11] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Tue, 02 Feb 2016 12:40:56 GMT
Merge branch 'trunk' into branch-dev-patch-upgrade


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c5d2bd0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c5d2bd0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c5d2bd0

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4c5d2bd0a927f45f99c4045c4c9036859f0d19c8
Parents: 77af8e5 8ba3d0b
Author: Nate Cole <ncole@hortonworks.com>
Authored: Tue Feb 2 07:40:38 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Tue Feb 2 07:40:38 2016 -0500

----------------------------------------------------------------------
 .../src/main/python/ambari_agent/HostInfo.py    |   4 +-
 ambari-server/conf/unix/ambari.properties       |   3 +
 ambari-server/conf/windows/ambari.properties    |   3 +
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +-
 .../api/services/AdminSettingService.java       | 148 --------
 .../server/api/services/SettingService.java     | 148 ++++++++
 .../StackAdvisorBlueprintProcessor.java         |  66 +++-
 .../server/configuration/Configuration.java     |  20 ++
 .../server/controller/KerberosHelperImpl.java   |  16 +-
 .../internal/AbstractProviderModule.java        | 187 ++++++----
 .../internal/AdminSettingResourceProvider.java  | 250 -------------
 .../internal/DefaultProviderModule.java         |   4 +-
 .../internal/SettingResourceProvider.java       | 251 +++++++++++++
 .../internal/UpgradeResourceProvider.java       |   2 +-
 .../server/controller/jmx/JMXHostProvider.java  |   8 +-
 .../controller/jmx/JMXPropertyProvider.java     |  15 +-
 .../ambari/server/controller/spi/Resource.java  |   4 +-
 .../ambari/server/orm/dao/AdminSettingDAO.java  | 100 ------
 .../ambari/server/orm/dao/SettingDAO.java       | 100 ++++++
 .../server/orm/entities/AdminSettingEntity.java | 149 --------
 .../server/orm/entities/SettingEntity.java      | 149 ++++++++
 .../authorization/RoleAuthorization.java        |   2 +-
 .../serveraction/ServerActionExecutor.java      |  25 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   8 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   8 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   8 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   8 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |  10 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   8 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   8 +-
 .../src/main/resources/META-INF/persistence.xml |   2 +-
 .../HAWQ/2.0.0/package/scripts/params.py        |  21 --
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   5 +
 .../RANGER/configuration/ranger-admin-site.xml  |  10 +
 .../stacks/HDP/2.3/services/stack_advisor.py    |  11 +
 .../api/services/AdminSettingServiceTest.java   | 101 ------
 .../server/api/services/SettingServiceTest.java | 101 ++++++
 .../StackAdvisorBlueprintProcessorTest.java     | 100 +++++-
 .../server/configuration/ConfigurationTest.java |  15 +
 .../AdminSettingResourceProviderTest.java       | 356 -------------------
 .../internal/JMXHostProviderTest.java           | 130 +++++--
 .../internal/SettingResourceProviderTest.java   | 355 ++++++++++++++++++
 .../metrics/JMXPropertyProviderTest.java        |   6 +-
 .../server/orm/dao/AdminSettingDAOTest.java     |  93 -----
 .../ambari/server/orm/dao/SettingDAOTest.java   |  93 +++++
 .../orm/entities/AdminSettingEntityTest.java    |  91 -----
 .../server/orm/entities/SettingEntityTest.java  |  90 +++++
 .../stacks/2.3/common/test_stack_advisor.py     |   3 +-
 ambari-web/app/messages.js                      |   3 +-
 .../main/alerts/definition_details.hbs          |   6 +
 .../main/alerts/definition_details_view.js      |   6 +
 .../global/cluster_controller_test.js           |   4 +-
 .../progress_controller_test.js                 |   4 +-
 .../admin/kerberos/step4_controller_test.js     |   7 +-
 ...anage_alert_notifications_controller_test.js |  85 +++--
 .../main/host/add_controller_test.js            |   2 +
 .../test/controllers/wizard/step3_test.js       |  43 +--
 .../test/controllers/wizard/step4_test.js       |  19 +-
 .../test/controllers/wizard/step5_test.js       |   7 +-
 .../test/controllers/wizard/step6_test.js       |   6 +-
 .../test/controllers/wizard/step7_test.js       |  13 +-
 .../test/controllers/wizard/step8_test.js       |  19 +-
 .../test/controllers/wizard/step9_test.js       |  23 +-
 ambari-web/test/controllers/wizard_test.js      |   8 +-
 ambari-web/test/mappers/service_mapper_test.js  |   8 +-
 .../common/configs/toggle_isrequired_test.js    |  12 +-
 .../kdc_credentials_controller_mixin_test.js    |  29 +-
 .../test/mixins/common/serverValidator_test.js  |  14 +-
 ambari-web/test/models/cluster_states_test.js   |  20 +-
 .../objects/service_config_property_test.js     |  38 +-
 ambari-web/test/router_test.js                  |  84 ++---
 ambari-web/test/utils/ajax/ajax_queue_test.js   |   2 +-
 ambari-web/test/utils/config_test.js            |  32 +-
 ambari-web/test/utils/date/timezone_test.js     |  24 +-
 ambari-web/test/utils/helper_test.js            |   6 +-
 .../test/views/common/chart/linear_time_test.js |  16 +-
 .../common/configs/service_config_view_test.js  |  18 +-
 .../modal_popups/cluster_check_popup_test.js    |  12 +-
 .../manage_alert_notifications_view_test.js     |  17 +-
 ambari-web/test/views/wizard/step3_view_test.js |  31 +-
 ambari-web/test/views/wizard/step9_view_test.js |  71 ++--
 81 files changed, 2235 insertions(+), 1753 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index 987c11b,4c12094..da00d55
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@@ -408,14 -408,10 +408,14 @@@ public class ResourceInstanceFactoryImp
          resourceDefinition = new SimpleResourceDefinition(Resource.Type.UserAuthorization,
"authorization", "authorizations");
          break;
  
-       case AdminSetting:
-         resourceDefinition = new SimpleResourceDefinition(Resource.Type.AdminSetting, "admin-setting",
"admin-settings");
+       case Setting:
+         resourceDefinition = new SimpleResourceDefinition(Resource.Type.Setting, "setting",
"settings");
          break;
  
 +      case VersionDefinition:
 +        resourceDefinition = new VersionDefinitionResourceDefinition();
 +        break;
 +
        default:
          throw new IllegalArgumentException("Unsupported resource type: " + type);
      }

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5d2bd0/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------


Mime
View raw message