Merge PR#19 from 'sieverssj/RAVE-1275'
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/b39c6a12 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/b39c6a12 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/b39c6a12 Branch: refs/heads/master Commit: b39c6a12398f8e145b04c8287f3847243e39b5bc Parents: cba342c fd0a9f7 Author: Matt Franklin <[email protected]> Authored: Tue Aug 12 17:36:26 2014 -0500 Committer: Matt Franklin <[email protected]> Committed: Tue Aug 12 17:36:26 2014 -0500 ---------------------------------------------------------------------- .../org/apache/rave/model/PageTemplateRegion.java | 16 ++++++++++++++++ .../org/apache/rave/model/PageTemplateWidget.java | 17 +++++++++++++++++ .../main/java/org/apache/rave/model/Region.java | 17 +++++++++++++++++ .../java/org/apache/rave/model/RegionWidget.java | 17 +++++++++++++++++ .../java/org/apache/rave/rest/model/Region.java | 13 +++++++++++++ .../org/apache/rave/rest/model/RegionWidget.java | 12 ++++++++++++ .../portal/model/impl/PageTemplateRegionImpl.java | 12 ++++++++++++ .../portal/model/impl/PageTemplateWidgetImpl.java | 13 +++++++++++++ .../apache/rave/portal/model/impl/RegionImpl.java | 12 ++++++++++++ .../rave/portal/model/impl/RegionWidgetImpl.java | 12 ++++++++++++ .../java/org/apache/rave/portal/util/PageUtil.java | 2 ++ .../rave/portal/model/JpaPageTemplateRegion.java | 12 ++++++++++++ .../rave/portal/model/JpaPageTemplateWidget.java | 12 ++++++++++++ .../org/apache/rave/portal/model/JpaRegion.java | 12 ++++++++++++ .../apache/rave/portal/model/JpaRegionWidget.java | 12 ++++++++++++ .../conversion/impl/MongoDbPageConverter.java | 1 + .../impl/MongoDbPageTemplateConverterTest.java | 13 ++++++++++++- .../web/model/OpenSocialRegionWidget.java | 1 + .../renderer/OpenSocialWidgetWrapperRenderer.java | 8 ++++++-- .../web/renderer/OpenSocialWidgetRendererTest.java | 11 +++++++++-- 20 files changed, 220 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
