ambari git commit: AMBARI-11814 - Views : Update view.xml xsd to allow for optional build-number (tbeerbower)

2015-06-09 Thread tbeerbower 
Repository: ambari
Updated Branches:
  refs/heads/trunk 97bf29a35 - 5240ca45e


AMBARI-11814 - Views : Update view.xml xsd to allow for optional build-number 
(tbeerbower)


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

Branch: refs/heads/trunk
Commit: 5240ca45e65a01f4006226aee9a4f6b4e95f9e8d
Parents: 97bf29a
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Tue Jun 9 12:08:26 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Tue Jun 9 12:08:44 2015 -0400

--
 .../internal/ViewVersionResourceProvider.java   |  6 +++---
 .../ambari/server/orm/entities/ViewEntity.java  | 22 
 .../server/upgrade/UpgradeCatalog210.java   |  3 +++
 .../server/view/configuration/ViewConfig.java   | 14 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 +
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql |  1 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 +
 .../server/orm/entities/ViewEntityTest.java |  6 ++
 .../server/upgrade/UpgradeCatalog210Test.java   | 11 ++
 .../view/configuration/ViewConfigTest.java  |  7 +++
 .../phone-list-view/src/main/resources/view.xml |  1 +
 .../org/apache/ambari/view/ViewDefinition.java  |  7 +++
 ambari-views/src/main/resources/view.xsd|  5 +
 15 files changed, 84 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5240ca45/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
index 6352817..570766d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
@@ -46,9 +46,9 @@ public class ViewVersionResourceProvider extends 
AbstractResourceProvider {
*/
   public static final String VIEW_NAME_PROPERTY_ID  = 
ViewVersionInfo/view_name;
   public static final String VIEW_VERSION_PROPERTY_ID   = 
ViewVersionInfo/version;
+  public static final String VIEW_BUILD_PROPERTY_ID = 
ViewVersionInfo/build_number;
   public static final String LABEL_PROPERTY_ID  = 
ViewVersionInfo/label;
   public static final String DESCRIPTION_PROPERTY_ID= 
ViewVersionInfo/description;
-  public static final String VERSION_PROPERTY_ID= 
ViewVersionInfo/version;
   public static final String MIN_AMBARI_VERSION_PROPERTY_ID = 
ViewVersionInfo/min_ambari_version;
   public static final String MAX_AMBARI_VERSION_PROPERTY_ID = 
ViewVersionInfo/max_ambari_version;
   public static final String PARAMETERS_PROPERTY_ID = 
ViewVersionInfo/parameters;
@@ -75,9 +75,9 @@ public class ViewVersionResourceProvider extends 
AbstractResourceProvider {
   static {
 propertyIds.add(VIEW_NAME_PROPERTY_ID);
 propertyIds.add(VIEW_VERSION_PROPERTY_ID);
+propertyIds.add(VIEW_BUILD_PROPERTY_ID);
 propertyIds.add(LABEL_PROPERTY_ID);
 propertyIds.add(DESCRIPTION_PROPERTY_ID);
-propertyIds.add(VERSION_PROPERTY_ID);
 propertyIds.add(MIN_AMBARI_VERSION_PROPERTY_ID);
 propertyIds.add(MAX_AMBARI_VERSION_PROPERTY_ID);
 propertyIds.add(PARAMETERS_PROPERTY_ID);
@@ -134,9 +134,9 @@ public class ViewVersionResourceProvider extends 
AbstractResourceProvider {
 
 setResourceProperty(resource, VIEW_NAME_PROPERTY_ID, 
viewDefinition.getCommonName(), requestedIds);
 setResourceProperty(resource, VIEW_VERSION_PROPERTY_ID, 
viewDefinition.getVersion(), requestedIds);
+setResourceProperty(resource, VIEW_BUILD_PROPERTY_ID, 
viewDefinition.getBuild(), requestedIds);
 setResourceProperty(resource, LABEL_PROPERTY_ID, 
viewDefinition.getLabel(), requestedIds);
 setResourceProperty(resource, DESCRIPTION_PROPERTY_ID, 
viewDefinition.getDescription(), requestedIds);
-setResourceProperty(resource, VERSION_PROPERTY_ID, 
viewDefinition.getVersion(), requestedIds);
 setResourceProperty(resource, MIN_AMBARI_VERSION_PROPERTY_ID,
 viewDefinition.getConfiguration().getMinAmbariVersion(), 
requestedIds);
 setResourceProperty(resource,

ambari git commit: AMBARI-11814 - Views : Update view.xml xsd to allow for optional build-number (tbeerbower)

2015-06-09 Thread tbeerbower 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2552deba3 - 0fa830d92


AMBARI-11814 - Views : Update view.xml xsd to allow for optional build-number 
(tbeerbower)


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

Branch: refs/heads/branch-2.1
Commit: 0fa830d922a1174c5ffb247ee0eb175a45e8ecf0
Parents: 2552deb
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Tue Jun 9 12:08:26 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Tue Jun 9 12:09:54 2015 -0400

--
 .../internal/ViewVersionResourceProvider.java   |  6 +++---
 .../ambari/server/orm/entities/ViewEntity.java  | 22 
 .../server/upgrade/UpgradeCatalog210.java   |  3 +++
 .../server/view/configuration/ViewConfig.java   | 14 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 +
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql |  1 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 +
 .../server/orm/entities/ViewEntityTest.java |  6 ++
 .../server/upgrade/UpgradeCatalog210Test.java   | 11 ++
 .../view/configuration/ViewConfigTest.java  |  7 +++
 .../phone-list-view/src/main/resources/view.xml |  1 +
 .../org/apache/ambari/view/ViewDefinition.java  |  7 +++
 ambari-views/src/main/resources/view.xsd|  5 +
 15 files changed, 84 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0fa830d9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
index 6352817..570766d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
@@ -46,9 +46,9 @@ public class ViewVersionResourceProvider extends 
AbstractResourceProvider {
*/
   public static final String VIEW_NAME_PROPERTY_ID  = 
ViewVersionInfo/view_name;
   public static final String VIEW_VERSION_PROPERTY_ID   = 
ViewVersionInfo/version;
+  public static final String VIEW_BUILD_PROPERTY_ID = 
ViewVersionInfo/build_number;
   public static final String LABEL_PROPERTY_ID  = 
ViewVersionInfo/label;
   public static final String DESCRIPTION_PROPERTY_ID= 
ViewVersionInfo/description;
-  public static final String VERSION_PROPERTY_ID= 
ViewVersionInfo/version;
   public static final String MIN_AMBARI_VERSION_PROPERTY_ID = 
ViewVersionInfo/min_ambari_version;
   public static final String MAX_AMBARI_VERSION_PROPERTY_ID = 
ViewVersionInfo/max_ambari_version;
   public static final String PARAMETERS_PROPERTY_ID = 
ViewVersionInfo/parameters;
@@ -75,9 +75,9 @@ public class ViewVersionResourceProvider extends 
AbstractResourceProvider {
   static {
 propertyIds.add(VIEW_NAME_PROPERTY_ID);
 propertyIds.add(VIEW_VERSION_PROPERTY_ID);
+propertyIds.add(VIEW_BUILD_PROPERTY_ID);
 propertyIds.add(LABEL_PROPERTY_ID);
 propertyIds.add(DESCRIPTION_PROPERTY_ID);
-propertyIds.add(VERSION_PROPERTY_ID);
 propertyIds.add(MIN_AMBARI_VERSION_PROPERTY_ID);
 propertyIds.add(MAX_AMBARI_VERSION_PROPERTY_ID);
 propertyIds.add(PARAMETERS_PROPERTY_ID);
@@ -134,9 +134,9 @@ public class ViewVersionResourceProvider extends 
AbstractResourceProvider {
 
 setResourceProperty(resource, VIEW_NAME_PROPERTY_ID, 
viewDefinition.getCommonName(), requestedIds);
 setResourceProperty(resource, VIEW_VERSION_PROPERTY_ID, 
viewDefinition.getVersion(), requestedIds);
+setResourceProperty(resource, VIEW_BUILD_PROPERTY_ID, 
viewDefinition.getBuild(), requestedIds);
 setResourceProperty(resource, LABEL_PROPERTY_ID, 
viewDefinition.getLabel(), requestedIds);
 setResourceProperty(resource, DESCRIPTION_PROPERTY_ID, 
viewDefinition.getDescription(), requestedIds);
-setResourceProperty(resource, VERSION_PROPERTY_ID, 
viewDefinition.getVersion(), requestedIds);
 setResourceProperty(resource, MIN_AMBARI_VERSION_PROPERTY_ID,
 viewDefinition.getConfiguration().getMinAmbariVersion(), 
requestedIds);
 setResourceProperty(resource,