Author: julien(a)jboss.com Date: 2007-06-26 17:24:19 -0400 (Tue, 26 Jun 2007) New Revision: 7567 Modified: tags/JBoss_Portal_2_6_0/core/build.xml tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java Log: bug fix for bug introduced by the fix of JBPORTAL-1504, a test case was broken Modified: tags/JBoss_Portal_2_6_0/core/build.xml =================================================================== --- tags/JBoss_Portal_2_6_0/core/build.xml 2007-06-26 19:45:26 UTC (rev 7566) +++ tags/JBoss_Portal_2_6_0/core/build.xml 2007-06-26 21:24:19 UTC (rev 7567) @@ -334,7 +334,6 @@ <fileset dir="${jboss.portal-search.root}/lib" includes="portal-search-lib.jar"/> <fileset dir="${jboss.portal-identity.root}/lib" includes="portal-identity-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> - <fileset dir="${jboss.portal-samples.root}/lib" includes="portal-samples-lib.jar"/> <fileset dir="${ehcache.ehcache.lib}" includes="ehcache.jar"/> <fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/> <fileset dir="${javassist.javassist.lib}" includes="javassist.jar"/> Modified: tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java =================================================================== --- tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java 2007-06-26 19:45:26 UTC (rev 7566) +++ tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java 2007-06-26 21:24:19 UTC (rev 7567) @@ -89,6 +89,7 @@ { WindowImpl window = new WindowImpl(contentType, contentURI); addChild(name, window); + window.setDeclaredProperty(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE, contentType.toString()); return window; } Modified: tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java =================================================================== --- tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-06-26 19:45:26 UTC (rev 7566) +++ tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-06-26 21:24:19 UTC (rev 7567) @@ -236,11 +236,19 @@ { /** . */ - private final Iterator iterator = objectNode.getChildren().values().iterator(); + private final Iterator iterator; /** . */ private PortalObject next = null; + + public ChildrenIterator() + { + Map childrenMap = objectNode.getChildren(); + Collection children = childrenMap.values(); + iterator = children.iterator(); + } + public void remove() { throw new UnsupportedOperationException(); Modified: tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java =================================================================== --- tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-06-26 19:45:26 UTC (rev 7566) +++ tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-06-26 21:24:19 UTC (rev 7567) @@ -83,9 +83,6 @@ // this.contentType = contentType; this.uri = contentURI; - - // - setDeclaredProperty(PORTAL_PROP_WINDOW_CONTENT_TYPE, contentType.toString()); } private ContentStateImpl getContentState()