Author: julien(a)jboss.com Date: 2007-01-15 18:22:53 -0500 (Mon, 15 Jan 2007) New Revision: 6008 Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml Log: - better name for content type window property - fix minor bug introduced in previous commit (cms object command factory was not targetting the proper window id) Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-01-15 23:10:21 UTC (rev 6007) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-01-15 23:22:53 UTC (rev 6008) @@ -39,7 +39,7 @@ public class WindowImpl extends PortalObjectImpl implements Window, ContextObject { - public static final String blah = "bluh"; + public static final String PORTAL_PROP_WINDOW_CONTENT_TYPE = "portal.windowContentType"; // Persistent state protected String instanceRef; @@ -67,7 +67,7 @@ this.contentType = contentType; // - setDeclaredProperty(blah, contentType.toString()); + setDeclaredProperty(PORTAL_PROP_WINDOW_CONTENT_TYPE, contentType.toString()); } private ContentStateImpl getContentState() @@ -103,7 +103,7 @@ { if (contentType == null) { - String value = getDeclaredProperty(blah); + String value = getDeclaredProperty(PORTAL_PROP_WINDOW_CONTENT_TYPE); if (value == null) { // For legacy content we chose to treat no value as portlet Modified: trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-01-15 23:10:21 UTC (rev 6007) +++ trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-01-15 23:22:53 UTC (rev 6008) @@ -224,7 +224,7 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <attribute name="TargetWindowRef">default.default.DefaultCMSPortletWindow</attribute> + <attribute name="TargetWindowRef">default.default.CMSWindow</attribute> <depends optional-attribute-name="CMSService" proxy-type="attribute">portal:service=CMS</depends> </mbean> <mbean