You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/05/14 03:05:28 UTC
ambari git commit: AMBARI-9030. Remove temporary api fields for
obtaining kerberos descriptors for stacks and stack services (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 153895e11 -> 9fab4435c
AMBARI-9030. Remove temporary api fields for obtaining kerberos descriptors for stacks and stack services (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9fab4435
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9fab4435
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9fab4435
Branch: refs/heads/trunk
Commit: 9fab4435c946a1c3ca1fdab196cef19b905114b7
Parents: 153895e
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed May 13 21:05:34 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed May 13 21:05:40 2015 -0400
----------------------------------------------------------------------
.../internal/StackServiceResourceProvider.java | 18 ------------------
.../internal/StackVersionResourceProvider.java | 13 -------------
ambari-server/src/main/resources/properties.json | 2 --
3 files changed, 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9fab4435/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
index c80913e..130129a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
@@ -71,9 +71,6 @@ public class StackServiceResourceProvider extends ReadOnlyResourceProvider {
private static final String CUSTOM_COMMANDS_PROPERTY_ID = PropertyHelper.getPropertyId(
"StackServices", "custom_commands");
- private static final String KERBEROS_DESCRIPTOR_PROPERTY_ID = PropertyHelper.getPropertyId(
- "StackServices", "kerberos_descriptor");
-
private static Set<String> pkPropertyIds = new HashSet<String>(
Arrays.asList(new String[] { STACK_NAME_PROPERTY_ID,
STACK_VERSION_PROPERTY_ID, SERVICE_NAME_PROPERTY_ID }));
@@ -152,21 +149,6 @@ public class StackServiceResourceProvider extends ReadOnlyResourceProvider {
setResourceProperty(resource, CUSTOM_COMMANDS_PROPERTY_ID,
response.getCustomCommands(), requestedIds);
- // TODO (rlevas): Convert this to an official resource
- File kerberosDescriptorFile = response.getKerberosDescriptorFile();
- if (kerberosDescriptorFile != null) {
- KerberosServiceDescriptor descriptor;
- try {
- descriptor = kerberosServiceDescriptorFactory.createInstance(kerberosDescriptorFile, response.getServiceName());
- } catch (IOException e) {
- throw new SystemException("Failed to parse the service's Kerberos descriptor", e);
- }
-
- if (descriptor != null) {
- setResourceProperty(resource, KERBEROS_DESCRIPTOR_PROPERTY_ID, descriptor.toMap(), requestedIds);
- }
- }
-
resources.add(resource);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9fab4435/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
index ca66819..adc3a45 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
@@ -59,7 +59,6 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
public static final String STACK_ERROR_SET = PropertyHelper.getPropertyId("Versions", "stack-errors");
public static final String STACK_CONFIG_TYPES = PropertyHelper.getPropertyId("Versions", "config_types");
public static final String STACK_PARENT_PROPERTY_ID = PropertyHelper.getPropertyId("Versions", "parent_stack_version");
- public static final String KERBEROS_DESCRIPTOR_PROPERTY_ID = PropertyHelper.getPropertyId("Versions", "kerberos_descriptor");
public static final String UPGRADE_PACKS_PROPERTY_ID = PropertyHelper.getPropertyId("Versions", "upgrade_packs");
private static Set<String> pkPropertyIds = new HashSet<String>(
@@ -139,18 +138,6 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
setResourceProperty(resource, UPGRADE_PACKS_PROPERTY_ID,
response.getUpgradePacks(), requestedIds);
- // TODO (rlevas): Convert this to an official resource
- KerberosDescriptor kerberosDescriptor;
- try {
- kerberosDescriptor = buildKerberosDescriptor(response);
- } catch (IOException e) {
- throw new SystemException("Failed to build composite Kerberos descriptor data", e);
- }
- if (kerberosDescriptor != null) {
- setResourceProperty(resource, KERBEROS_DESCRIPTOR_PROPERTY_ID,
- kerberosDescriptor.toMap(), requestedIds);
- }
-
resources.add(resource);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9fab4435/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/properties.json b/ambari-server/src/main/resources/properties.json
index 38fbb65..2dc1af5 100644
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@ -193,7 +193,6 @@
"Versions/stack-errors",
"Versions/parent_stack_version",
"Versions/config_types",
- "Versions/kerberos_descriptor",
"Versions/upgrade_packs",
"_"
],
@@ -209,7 +208,6 @@
"StackServices/service_check_supported",
"StackServices/custom_commands",
"StackServices/required_services",
- "StackServices/kerberos_descriptor",
"_"
],
"StackConfiguration":[