[gatein-commits] gatein SVN: r5740 - in portal/branches/branch-GTNPORTAL-1745/component/portal/src: test/java/org/exoplatform/portal/config and 1 other directory.

[do-not-reply at jboss.org]

Author: hoang_to
Date: 2011-01-12 22:27:34 -0500 (Wed, 12 Jan 2011)
New Revision: 5740

Modified:
   portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/resources/binding.xml
   portal/branches/branch-GTNPORTAL-1745/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java
Log:
GTNPORTAL-1468: In JIBX binding.xml, some field mappings for PageNavigation is missing

Modified: portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/resources/binding.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/resources/binding.xml	2011-01-13 02:53:29 UTC (rev 5739)
+++ portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/resources/binding.xml	2011-01-13 03:27:34 UTC (rev 5740)
@@ -117,8 +117,8 @@
   </mapping>
 
   <mapping name="node-navigation" class="org.exoplatform.portal.config.model.PageNavigation">
-    <structure name="owner-type" usage="optional"/>
-    <structure name="owner-id" usage="optional"/>
+    <value name="owner-type" field="ownerType" usage="optional"/>
+    <value name="owner-id" field="ownerId" usage="optional"/>
     <value name="priority" field="priority" usage="optional"/>
     <collection name="page-nodes" field="pageNodes" usage="optional"
                 item-type="org.exoplatform.portal.config.model.PageNode"/>

Modified: portal/branches/branch-GTNPORTAL-1745/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java	2011-01-13 02:53:29 UTC (rev 5739)
+++ portal/branches/branch-GTNPORTAL-1745/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java	2011-01-13 03:27:34 UTC (rev 5740)
@@ -85,6 +85,8 @@
       
       PageNavigation pageNavigation = (PageNavigation)obj;
       assertEquals("portal::classic::homepage", pageNavigation.getNode("home").getPageReference());
+      assertEquals("portal", pageNavigation.getOwnerType());
+      assertEquals("classic", pageNavigation.getOwnerId());
 
       IMarshallingContext mctx = bfact.createMarshallingContext();
       mctx.setIndent(2);