Author: julien(a)jboss.com Date: 2008-07-24 01:51:21 -0400 (Thu, 24 Jul 2008) New Revision: 11567 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java Log: getPage() must not be exposed on the AliasBindingInfo interface, it's an implementation detail of the POJO Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java 2008-07-23 20:32:41 UTC (rev 11566) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java 2008-07-24 05:51:21 UTC (rev 11567) @@ -22,8 +22,6 @@ package org.jboss.portal.core.controller.coordination; -import org.jboss.portal.core.model.portal.Page; - import javax.xml.namespace.QName; import java.util.Set; @@ -33,7 +31,5 @@ */ public interface AliasBindingInfo extends ParameterBindingInfo { - Page getPage(); - - Set<QName> getQNames(); + Set<QName> getQNames(); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-23 20:32:41 UTC (rev 11566) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-24 05:51:21 UTC (rev 11567) @@ -673,10 +673,13 @@ } // + AliasInfoPOJO alias = (AliasInfoPOJO)aliasInfo; + + // String propName = PREFIX_PARAMETER_ALIAS_NAME + "." + aliasInfo.getName(); - if (aliasInfo.getPage().getProperties().keySet().contains(propName)) + if (alias.page.getProperties().keySet().contains(propName)) { - aliasInfo.getPage().setDeclaredProperty(propName,null); + alias.page.setDeclaredProperty(propName,null); } } @@ -1068,11 +1071,6 @@ return name; } - public Page getPage() - { - return page; - } - public Set<QName> getQNames() { return qnames; Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-07-23 20:32:41 UTC (rev 11566) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-07-24 05:51:21 UTC (rev 11567) @@ -326,7 +326,6 @@ AliasBindingInfo info = bindings1.iterator().next(); assertTrue(info.getName().equals("alias1")); - assertTrue(info.getPage().getId().equals(page1.getId())); assertTrue(info.getQNames().size() == 3); assertTrue(info.getQNames().contains(qname1)); assertTrue(info.getQNames().contains(qname2)); @@ -360,14 +359,12 @@ assertNotNull(info3); assertTrue(info2.getName().equals("alias2")); - assertTrue(info2.getPage().getId().equals(page2.getId())); assertTrue(info2.getQNames().size() == 3); assertTrue(info2.getQNames().contains(qname4)); assertTrue(info2.getQNames().contains(qname5)); assertTrue(info2.getQNames().contains(qname6)); assertTrue(info3.getName().equals("alias3")); - assertTrue(info3.getPage().getId().equals(page2.getId())); assertTrue(info3.getQNames().size() == 3); assertTrue(info3.getQNames().contains(qname7)); assertTrue(info3.getQNames().contains(qname8));