You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/11/19 13:07:28 UTC
ambari git commit: AMBARI-8325. Ambari SCOM doesn't compile in trunk
(jluniya via dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 959525e0e -> 27821a267
AMBARI-8325. Ambari SCOM doesn't compile in trunk (jluniya via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27821a26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27821a26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27821a26
Branch: refs/heads/trunk
Commit: 27821a2677692a889b50603f4f66adc7e5ff1434
Parents: 959525e
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Nov 19 14:06:18 2014 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Nov 19 14:06:18 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/ambari/scom/AmbariServer.java | 6 ++----
.../main/java/org/apache/ambari/scom/SQLProviderModule.java | 8 ++++----
.../test/java/org/apache/ambari/msi/ServiceProviderTest.java | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/27821a26/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
index a5071cb..9b36ca5 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
@@ -311,11 +311,9 @@ public class AmbariServer {
LOG.info("In-memory database is used - creating default users");
Users users = injector.getInstance(Users.class);
- users.createDefaultRoles();
- users.createUser("admin", "admin");
- users.createUser("user", "user");
try {
- users.promoteToAdmin(users.getLocalUser("admin"));
+ users.createUser("admin", "admin", true, true, false);
+ users.createUser("user", "user", true, false, false);
} catch (AmbariException e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/27821a26/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
index 950935c..33d013e 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
@@ -117,11 +117,11 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
SCOMMetricHelper.getJMXPropertyIds(type),
urlStreamProvider,
this,
+ this,
PropertyHelper.getPropertyId("ServiceComponentInfo", "cluster_name"),
null,
PropertyHelper.getPropertyId("ServiceComponentInfo", "component_name"),
- PropertyHelper.getPropertyId("ServiceComponentInfo", "state"),
- Collections.singleton("STARTED")));
+ PropertyHelper.getPropertyId("ServiceComponentInfo", "state")));
providers.add(new SQLPropertyProvider(
SCOMMetricHelper.getSqlServerPropertyIds(type),
@@ -135,11 +135,11 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
SCOMMetricHelper.getJMXPropertyIds(type),
urlStreamProvider,
this,
+ this,
PropertyHelper.getPropertyId("HostRoles", "cluster_name"),
PropertyHelper.getPropertyId("HostRoles", "host_name"),
PropertyHelper.getPropertyId("HostRoles", "component_name"),
- PropertyHelper.getPropertyId("HostRoles", "state"),
- Collections.singleton("STARTED")));
+ PropertyHelper.getPropertyId("HostRoles", "state")));
providers.add(new SQLPropertyProvider(
SCOMMetricHelper.getSqlServerPropertyIds(type),
http://git-wip-us.apache.org/repos/asf/ambari/blob/27821a26/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ServiceProviderTest.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ServiceProviderTest.java b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ServiceProviderTest.java
index 285859f..ba6ac57 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ServiceProviderTest.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ServiceProviderTest.java
@@ -41,7 +41,7 @@ public class ServiceProviderTest {
ClusterDefinition clusterDefinition = new ClusterDefinition(new TestStateProvider(), new TestClusterDefinitionProvider(), new TestHostInfoProvider());
ServiceProvider provider = new ServiceProvider(clusterDefinition);
Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
- Assert.assertEquals(8, resources.size());
+ Assert.assertEquals(7, resources.size());
}
@Test