[gatein-commits] gatein SVN: r6631 - portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax.
Author: hoang_to
Date: 2011-06-10 02:45:04 -0400 (Fri, 10 Jun 2011)
New Revision: 6631
Modified:
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java
Log:
GTNPORTAL-1905: Update code on PageStAXParser to support page-id element
Modified:
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java
===================================================================
---
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java 2011-06-10
06:04:24 UTC (rev 6630)
+++
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java 2011-06-10
06:45:04 UTC (rev 6631)
@@ -45,6 +45,9 @@
{
Page page = new Page();
+ page.setPageId(getContent(elementNavigator, StAXElement.page_id));
+ page.setOwnerType(getContent(elementNavigator, StAXElement.owner_type));
+ page.setOwnerId(getContent(elementNavigator, StAXElement.owner_id));
page.setName(getContent(elementNavigator, StAXElement.name));
page.setTitle(getContent(elementNavigator, StAXElement.title));
page.setFactoryId(getContent(elementNavigator, StAXElement.factory_id));
@@ -81,6 +84,9 @@
{
switch(staxElement)
{
+ case page_id:
+ case owner_type:
+ case owner_id:
case title:
case factory_id:
case access_permissions:
Modified:
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java
===================================================================
---
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java 2011-06-10
06:04:24 UTC (rev 6630)
+++
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java 2011-06-10
06:45:04 UTC (rev 6631)
@@ -87,7 +87,7 @@
}
}
- private static final Set<StAXElement> optionalElements =
EnumSet.of(StAXElement.preferences, StAXElement.value, StAXElement.read_only);
+ private static final Set<StAXElement> optionalElements =
EnumSet.of(StAXElement.preferences, StAXElement.value, StAXElement.read_only,
StAXElement.access_permissions, StAXElement.show_info_bar);
@Override
public Set<StAXElement> getOptionalElements()
Modified:
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java
===================================================================
---
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java 2011-06-10
06:04:24 UTC (rev 6630)
+++
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java 2011-06-10
06:45:04 UTC (rev 6631)
@@ -28,6 +28,8 @@
page,
+ page_id,
+
name,
title,