You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/04/16 18:24:53 UTC
ambari git commit: AMBARI-10511 - Use Stack Table For Entity
Relationships (part2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 40e4b807d -> d3e647a90
AMBARI-10511 - Use Stack Table For Entity Relationships (part2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3e647a9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3e647a9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3e647a9
Branch: refs/heads/trunk
Commit: d3e647a9020c09c90d9e211e706cd190d0eaff06
Parents: 40e4b80
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Apr 16 12:00:32 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu Apr 16 12:12:23 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/ambari/server/controller/AmbariServer.java | 5 +++++
.../server/controller/internal/BlueprintResourceProvider.java | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3e647a9/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 2451438..8b767d7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -47,6 +47,7 @@ import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.internal.AbstractControllerResourceProvider;
import org.apache.ambari.server.controller.internal.AmbariPrivilegeResourceProvider;
+import org.apache.ambari.server.controller.internal.BlueprintResourceProvider;
import org.apache.ambari.server.controller.internal.ClusterPrivilegeResourceProvider;
import org.apache.ambari.server.controller.internal.ClusterResourceProvider;
import org.apache.ambari.server.controller.internal.PermissionResourceProvider;
@@ -67,6 +68,7 @@ import org.apache.ambari.server.orm.dao.PermissionDAO;
import org.apache.ambari.server.orm.dao.PrincipalDAO;
import org.apache.ambari.server.orm.dao.PrivilegeDAO;
import org.apache.ambari.server.orm.dao.ResourceDAO;
+import org.apache.ambari.server.orm.dao.StackDAO;
import org.apache.ambari.server.orm.dao.UserDAO;
import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
import org.apache.ambari.server.orm.entities.MetainfoEntity;
@@ -601,6 +603,9 @@ public class AmbariServer {
SecurityFilter.init(injector.getInstance(Configuration.class));
StackDefinedPropertyProvider.init(injector);
AbstractControllerResourceProvider.init(injector.getInstance(ResourceProviderFactory.class));
+ BlueprintResourceProvider.init(injector.getInstance(BlueprintDAO.class),
+ injector.getInstance(StackDAO.class),
+ injector.getInstance(Gson.class), ambariMetaInfo);
StackDependencyResourceProvider.init(ambariMetaInfo);
ClusterResourceProvider.init(injector.getInstance(BlueprintDAO.class), ambariMetaInfo, injector.getInstance(ConfigHelper.class));
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3e647a9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
index 29a95c4..03acd40 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
@@ -30,7 +30,6 @@ import java.util.Set;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.DuplicateResourceException;
-import org.apache.ambari.server.StaticallyInject;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
@@ -61,7 +60,6 @@ import com.google.gson.Gson;
/**
* Resource Provider for Blueprint resources.
*/
-@StaticallyInject
public class BlueprintResourceProvider extends BaseBlueprintProcessor {
// ----- Property ID constants ---------------------------------------------