March 2009 - portal-commits - Jboss List Archives

JBoss Portal SVN: r12960 - in modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata: portal/object and 2 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 11:37:06 -0500 (Fri, 06 Mar 2009) New Revision: 12960 Removed: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java Log: Fixes to some method names to function correctly with the microcontainer. Remove broken DisplayNameMetaData class and use LocalizedDescriptionMetaData instead. Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -35,7 +35,7 @@ protected Boolean partialRefresh; @XmlElement(name = "partial-refresh") - public void setPartialRefresh (Boolean partialRefresh) + public void setPartialRefresh (boolean partialRefresh) { this.partialRefresh = partialRefresh; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -39,19 +39,19 @@ protected List<MetaMetaData> metas; @XmlElement (name = "link") - public void setLink (List<LinkMetaData> links) + public void setLinks (List<LinkMetaData> links) { this.links = links; } @XmlElement (name="script") - public void setScript (List<ScriptMetaData> scripts) + public void setScripts (List<ScriptMetaData> scripts) { this.scripts = scripts; } @XmlElement (name="meta") - public void setMeta (List<MetaMetaData> metas) + public void setMetas (List<MetaMetaData> metas) { this.metas = metas; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -55,9 +55,9 @@ } @XmlElement(name = "remotable") - public void setRemotable(String remotable) + public void setRemotable(boolean remotable) { - this.remotable = Boolean.valueOf(remotable); + this.remotable = remotable; } @XmlElement(name = "portlet") @@ -67,7 +67,7 @@ } @XmlElement(name = "service") - public void setService(List<ServiceMetaData> services) + public void setServices(List<ServiceMetaData> services) { this.services = services; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -47,9 +47,9 @@ } @XmlElement (name = "remotable") - public void setRemotable (String remotable) + public void setRemotable (boolean remotable) { - this.remotable = Boolean.valueOf(remotable); + this.remotable = remotable; } @XmlElement (name = "ajax") Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -35,7 +35,7 @@ protected Boolean distributed; @XmlElement (name = "distributed") - public void setDistributed(Boolean distributed) + public void setDistributed(boolean distributed) { this.distributed = distributed; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -32,7 +32,7 @@ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> * @version $Revision$ */ -public class AliasBindingMetaData extends IdMetaDataImplWithDescriptionGroup +public class AliasBindingMetaData { protected String id; Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -48,13 +48,13 @@ } @XmlElement(name = "parameter-binding") - public void setParameterBinding(List<ParameterBindingMetaData> parameterBindings) + public void setParameterBindings(List<ParameterBindingMetaData> parameterBindings) { this.parameterBindings = parameterBindings; } @XmlElement(name = "alias-binding") - public void setAliasBinding(List<AliasBindingMetaData> aliasBinding) + public void setAliasBindings(List<AliasBindingMetaData> aliasBinding) { this.aliasBindings = aliasBinding; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlElement; import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; -import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData; +import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData; /** @@ -44,7 +44,7 @@ protected String resourceBundle; protected List<Locale> supportedLocales; protected SecurityConstraintMetaData securityConstraint; - protected List<DisplayNameMetaData> displayNames; + protected List<LocalizedDescriptionMetaData> displayNames; abstract public void setName(String name); @@ -54,12 +54,12 @@ } @XmlElement(name = "display-name") - public void SetDisplayNames(List<DisplayNameMetaData> displayNames) + public void setDisplayNames(List<LocalizedDescriptionMetaData> displayNames) { this.displayNames = displayNames; } - public List<DisplayNameMetaData> getDisplayNames() + public List<LocalizedDescriptionMetaData> getDisplayNames() { return displayNames; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -49,12 +49,12 @@ this.uri = uri; } - public String getContextType() + public String getContentType() { return type; } - public String getContextUri() + public String getContentURI() { return uri; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlElement; import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; -import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData; import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData; /** @@ -46,7 +45,7 @@ } @XmlElement(name = "portal") - public void setPortal(List<PortalMetaData> portals) + public void setPortals(List<PortalMetaData> portals) { this.portals = portals; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -54,7 +54,7 @@ } @XmlElement(name = "destinations") - public void setDestination(List<WindowCoordinationMetaData> destination) + public void setDestinations(List<WindowCoordinationMetaData> destination) { this.destinations = destination; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -38,7 +38,7 @@ protected List<String> modes; @XmlElement(name = "mode") - public void setMode(List<String> mode) + public void setModes(List<String> mode) { this.modes = modes; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlElement; import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; -import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData; import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData; /** Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -45,7 +45,7 @@ } @XmlElement(name = "window-coordination") - public void setWindowCoordintation(List<WindowCoordinationMetaData> windowCoordinations) + public void setWindowCoordination(List<WindowCoordinationMetaData> windowCoordinations) { this.windowCoordinations = windowCoordinations; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlElement; import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; -import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData; import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData; /** @@ -53,7 +52,7 @@ } @XmlElement(name = "supported-modes") - public void setPortalModes(ModeMetaData modes) + public void setModes(ModeMetaData modes) { this.modes = modes; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -68,6 +68,11 @@ } } + public String getIfExists() + { + return Boolean.toString(overwrite); + } + @XmlElement(name = "context") public void setContext(ContextMetaData context) { Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -47,12 +47,6 @@ this.windowName = windowName; } - @XmlElement(name = "qname") - public void setQName(String qName) - { - this.qName = qName; - } - @XmlElement(name="qname") public void setQNames(List<String> qNames) { @@ -63,15 +57,20 @@ { return windowName; } - + public String getQName() { - return qName; + if (qNames != null && qNames.size()>1) + { + return qNames.get(0); + } + return null; } public List<String> getQNames() { return qNames; } + } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlElement; import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; -import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData; /** * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -31,6 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.jboss.portal.metadata.portlet.PortletMetaDataConstants; +import org.jboss.portal.metadata.portlet.adapter.LifeCycleStringAdapter; import org.jboss.portal.metadata.portlet.common.DescribableMetaData; import org.jboss.portal.metadata.portlet.common.InitParamMetaData; import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; @@ -84,6 +85,7 @@ } @XmlElement(name = "lifecycle", required = true) + @XmlJavaTypeAdapter(LifeCycleStringAdapter.class) public List<String> getLifecycle() { return lifecycle; Deleted: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -1,63 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.metadata.portlet.instances; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; - -import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; - -/** - * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> - * @version $Revision$ - */ -public class DisplayNameMetaData extends IdMetaDataImplWithDescriptionGroup -{ - - protected String lang; - - protected String displayName; - - @XmlAttribute(name = "xml:lang") - public void setLang(String lang) - { - this.lang = lang; - } - - @XmlElement(name = "display-name") - public void setDisplayName(String displayName) - { - this.displayName = displayName; - } - - public String getLang() - { - return lang; - } - - public String getDisplayName() - { - return displayName; - } - -} Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlElement; import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; +import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; /** * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> @@ -39,7 +40,7 @@ protected String portletRef; - protected List<DisplayNameMetaData> displayNames; + protected List<LocalizedDescriptionMetaData> displayNames; protected PortletPreferencesMetaData portletPreferences; @@ -58,13 +59,13 @@ } @XmlElement(name = "display-name") - public void setDisplayName(List<DisplayNameMetaData> displayNames) + public void setDisplayNames(List<LocalizedDescriptionMetaData> displayNames) { this.displayNames = displayNames; } @XmlElement(name = "perferences") - public void setPreferences(PortletPreferencesMetaData preferences) + public void setPortletPreferences(PortletPreferencesMetaData preferences) { this.portletPreferences = preferences; } @@ -85,7 +86,7 @@ return portletRef; } - public List<DisplayNameMetaData> getDisplayNames() + public List<LocalizedDescriptionMetaData> getDisplayNames() { return displayNames; } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -75,16 +75,4 @@ return unchecked; } -// public boolean isUnchecked() -// { -// if (unchecked == null) -// { -// return false; -// } -// else -// { -// return true; -// } -// } - } Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -61,6 +61,11 @@ } } + public String getIfExists() + { + return Boolean.toString(overwrite); + } + public boolean getOverwrite() { return this.overwrite; Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java 2009-03-06 16:32:40 UTC (rev 12959) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java 2009-03-06 16:37:06 UTC (rev 12960) @@ -38,7 +38,7 @@ protected List<PortletPreferenceMetaData> preferences; @XmlElement(name = "preference") - public void setPreference(List<PortletPreferenceMetaData> preferences) + public void setPreferences(List<PortletPreferenceMetaData> preferences) { this.preferences = preferences; }

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12959 - in modules/deployer/trunk/deployer/src/main: deployer/dtd and 1 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 11:32:40 -0500 (Fri, 06 Mar 2009) New Revision: 12959 Modified: modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml modules/deployer/trunk/deployer/src/main/deployer/dtd/portal-object_2_6.dtd modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/CommandServletDeployer.java modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java Log: Add initial service deployer implementation. Fix issue with null appId not being defaulted to the context path. Modified: modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml =================================================================== --- modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml 2009-03-06 16:30:08 UTC (rev 12958) +++ modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml 2009-03-06 16:32:40 UTC (rev 12959) @@ -135,6 +135,9 @@ <property name="MBeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="TLDDirectory">tld</property> </bean> + <bean name="PortletServiceInjectionDeployer" class="org.jboss.portal.deployer.portlet.ServiceInjectorDeployer"> + <property name="MBeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean>  <bean name="CommandServletDeployer" class="org.jboss.portal.deployer.portlet.CommandServletDeployer"> Modified: modules/deployer/trunk/deployer/src/main/deployer/dtd/portal-object_2_6.dtd =================================================================== --- modules/deployer/trunk/deployer/src/main/deployer/dtd/portal-object_2_6.dtd 2009-03-06 16:30:08 UTC (rev 12958) +++ modules/deployer/trunk/deployer/src/main/deployer/dtd/portal-object_2_6.dtd 2009-03-06 16:32:40 UTC (rev 12959) @@ -380,8 +380,6 @@ This element defines window for coordination. It can be either source or destination window for event distribution or participate in parameter binding --> -<!ELEMENT window-coordination (window-name, qname)> - <!ELEMENT window-coordination (window-name, qname+)> <!-- Modified: modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/CommandServletDeployer.java =================================================================== --- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/CommandServletDeployer.java 2009-03-06 16:30:08 UTC (rev 12958) +++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/CommandServletDeployer.java 2009-03-06 16:32:40 UTC (rev 12959) @@ -43,7 +43,7 @@ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> * @version $Revision$ */ -public class CommandServletDeployer extends AbstractSimpleVFSRealDeployer<AnnotationPortletApplication10MetaData> +public class CommandServletDeployer extends AbstractSimpleVFSRealDeployer<PortletApplication10MetaData> { //the name of the CommandServlet class to use. Set initially to default value @@ -51,7 +51,7 @@ public CommandServletDeployer() { - super(AnnotationPortletApplication10MetaData.class); + super(PortletApplication10MetaData.class); setStage(DeploymentStages.POST_PARSE); } @@ -61,7 +61,7 @@ } @Override - public void deploy(VFSDeploymentUnit unit, AnnotationPortletApplication10MetaData deployment) throws DeploymentException + public void deploy(VFSDeploymentUnit unit, PortletApplication10MetaData deployment) throws DeploymentException { JBossWebMetaData jbossWebMetaData = (JBossWebMetaData) unit.getAttachment(JBossWebMetaData.class); Modified: modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java =================================================================== --- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java 2009-03-06 16:30:08 UTC (rev 12958) +++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java 2009-03-06 16:32:40 UTC (rev 12959) @@ -78,6 +78,11 @@ ServletContext servletContext = unit.getAttachment(WebAppContextDeployer.PORTLET_APP_SERVLET_CONTEXT_ATTACHMENT, ServletContext.class); WebApplication webapp = unit.getAttachment(WebApplication.class); + if (jbossPortletMetaData.getAppId() == null) + { + jbossPortletMetaData.setAppId(contextPath); + } + this.deployment.deployPortlets(servletContext, webapp.getURL(), webapp.getClassLoader(), contextPath, jbossPortletMetaData, portletMetaData); unit.addAttachment(PORLET_DEPLOYED, "deployed"); Modified: modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java =================================================================== --- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java 2009-03-06 16:30:08 UTC (rev 12958) +++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java 2009-03-06 16:32:40 UTC (rev 12959) @@ -1,64 +1,112 @@ -///****************************************************************************** -// * JBoss, a division of Red Hat * -// * Copyright 2008, Red Hat Middleware, LLC, and individual * -// * contributors as indicated by the @authors tag. See the * -// * copyright.txt in the distribution for a full listing of * -// * individual contributors. * -// * * -// * This is free software; you can redistribute it and/or modify it * -// * under the terms of the GNU Lesser General Public License as * -// * published by the Free Software Foundation; either version 2.1 of * -// * the License, or (at your option) any later version. * -// * * -// * This software is distributed in the hope that it will be useful, * -// * but WITHOUT ANY WARRANTY; without even the implied warranty of * -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -// * Lesser General Public License for more details. * -// * * -// * You should have received a copy of the GNU Lesser General Public * -// * License along with this software; if not, write to the Free * -// * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * -// * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * -// ******************************************************************************/ -//package org.jboss.portal.deployer.portlet; -// -//import java.util.Iterator; -// -//import org.jboss.deployers.spi.DeploymentException; -//import org.jboss.deployers.spi.deployer.DeploymentStages; -//import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer; -//import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -//import org.jboss.portal.core.metadata.ServiceMetaData; -//import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData; -// -///** -// * This class injects portlet specific services into the war -// * -// * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> -// * @version $Revision$ -// */ -//public class ServiceInjectorDeployer extends AbstractSimpleVFSRealDeployer<JBossApplicationMetaData> -//{ -// -// public ServiceInjectorDeployer() -// { -// super(JBossApplicationMetaData.class); -// setStage(DeploymentStages.POST_PARSE); -// } -// -// @Override -// public void deploy(VFSDeploymentUnit unit, JBossApplicationMetaData deployment) throws DeploymentException -// { -// Iterator<ServiceMetaData> iterator = deployment.getServices().values().iterator(); -// while (iterator.hasNext()) -// { -// ServiceMetaData serviceMD = iterator.next(); -// //TODO: finish this deployer. This deployer needs to inject the services into the portlet servlets -// // need to figure out if this can be done with an xml file or if this is going to need to have -// // access to the server like the tld deployer. -// } -// } -// -// -//} -// +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.deployer.portlet; + +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.servlet.ServletContext; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentStages; +import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.mx.util.MBeanProxyExt; +import org.jboss.portal.deployer.parsing.MergedPortletParsingDeployer; +import org.jboss.portal.deployer.webapp.WebAppContextDeployer; +import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData; +import org.jboss.portal.metadata.jboss.portlet.ServiceMetaData; + +/** + * This class injects portlet specific services into the war + * + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class ServiceInjectorDeployer extends AbstractDeployer +{ + + protected MBeanServer mbeanServer; + protected String serverDomain = "portal"; + + public void setMBeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } + + public void setServerDomain(String serverDomain) + { + this.serverDomain = serverDomain; + } + + public ServiceInjectorDeployer() + { + this.setAllInputs(false); + this.setInput(JBossPortletAppMetaData.class); + this.addInput(WebAppContextDeployer.PORTLET_APP_SERVLET_CONTEXT_ATTACHMENT); + this.setStage(DeploymentStages.INSTALLED); + } + + public void deploy(DeploymentUnit unit) throws DeploymentException + { + JBossPortletAppMetaData jbossPortletMD = unit.getAttachment(MergedPortletParsingDeployer.PORTLET_MERGED_ATTACHMENT_NAME, JBossPortletAppMetaData.class); + ServletContext servletContext = unit.getAttachment(WebAppContextDeployer.PORTLET_APP_SERVLET_CONTEXT_ATTACHMENT, ServletContext.class); + + if (jbossPortletMD.getServices() != null) + { + for (ServiceMetaData serviceMetaData : jbossPortletMD.getServices()) + { + injectService(serviceMetaData, servletContext, unit.getClassLoader()); + } + } + + } + + public void injectService (ServiceMetaData serviceMetaData ,ServletContext servletContext, ClassLoader classloader) + { + try + { + String serviceClass = serviceMetaData.getServiceClass(); + String serviceRef = serviceMetaData.getServiceRef(); + String serviceName = serviceMetaData.getServiceName(); + + if (serviceRef.startsWith(":")) + { + log.debug("Detecting a relative service reference " + serviceRef + " prepending it with " + serverDomain); + serviceRef = serverDomain + serviceRef; + } + + Class proxyClass = classloader.loadClass(serviceClass); + ObjectName objectName = ObjectName.getInstance(serviceRef); + Object proxy = MBeanProxyExt.create(proxyClass, objectName, this.mbeanServer, true); + + servletContext.setAttribute(serviceName, proxy); + } + catch (Exception e) + { + log.error("Was not able to create service proxy", e); + } + } + + +} +

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12958 - in tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core: controller/portlet and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-03-06 11:30:08 -0500 (Fri, 06 Mar 2009) New Revision: 12958 Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java Log: - JBPORTAL-2326: needs to be tested + If no parameters is passed to a page to be displayed, erased previous page navigational state + If we have a PNS, pass the current state as parameters to ViewPageCommand before full refresh in AJAX context (hackish) + Improved getPortletPublicNavigationalState method to avoid unnecessary work Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2009-03-06 16:26:22 UTC (rev 12957) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2009-03-06 16:30:08 UTC (rev 12958) @@ -71,10 +71,13 @@ import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.web.ServletContextDispatcher; +import javax.xml.namespace.QName; import java.io.StringWriter; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.Map; import java.util.Set; /** @@ -157,7 +160,8 @@ // Whether we need a full refresh or not boolean fullRefresh = false; - // + // in case we have we have a page navigational state... + Map<String, String[]> parameters = null; if (ctx.getChanges() == null) { @@ -213,20 +217,33 @@ } else if (type == PageNavigationalState.class) { - // force full refresh for now... + // force full refresh for now... for JBPORTAL-2326 fullRefresh = true; // TODO: implement proper propagation of PRPs and events - /*PageNavigationalState pns = (PageNavigationalState)update.getNewValue(); + PageNavigationalState pns = (PageNavigationalState)update.getNewValue(); if (pns != null) { - CoordinationManager coordinationManager = controllerContext.getController().getCoordinationManager(); + + // todo: fix-me, this is a hack to copy PRPs when we force the full refresh as parameters to ViewPageCommand... + Map<QName, String[]> qNameMap = pns.getParameters(); + if (qNameMap != null && !qNameMap.isEmpty()) + { + parameters = new HashMap<String, String[]>(qNameMap.size()); + + for (Map.Entry<QName, String[]> entry : qNameMap.entrySet()) + { + parameters.put(entry.getKey().toString(), entry.getValue()); + } + } + + /*CoordinationManager coordinationManager = controllerContext.getController().getCoordinationManager(); for (QName qName : pns.getParameters().keySet()) { // - } - }*/ + }*/ + } } } } @@ -358,7 +375,17 @@ } // We perform a full refresh - ViewPageCommand rpc = new ViewPageCommand(page.getId()); + ViewPageCommand rpc; + if (parameters == null) + { + rpc = new ViewPageCommand(page.getId()); + } + else + { + // if we have parameters from a PNS, feed them to ViewPageCommand (this is rather hackish) + rpc = new ViewPageCommand(page.getId(), parameters); + } + String url = controllerContext.renderURL(rpc, null, null); UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url); return new AjaxResponse(dresp); Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-03-06 16:26:22 UTC (rev 12957) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-03-06 16:30:08 UTC (rev 12958) @@ -20,6 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ + package org.jboss.portal.core.controller.portlet; import org.jboss.portal.core.CoreConstants; @@ -136,7 +137,6 @@ // windowPublicNavigationalStateUpdate.clear(); - } if (updates != null) @@ -191,8 +191,6 @@ // pageUpdates.clear(); } - - } /** @@ -332,78 +330,84 @@ { PortletInfo info = controllerContext.getPortletInfo(windowName); - CoordinationManager manager = getCoordinationManager(); - - // For explicit initiate windowPublicNavigationStateUpdate with previous state - if (windowPublicNavigationalStateUpdate == null) - { - initiateWindowPublicNavigationalStateUpdate(); - } - if (info != null) { NavigationInfo navigation = info.getNavigation(); if (navigation != null) { - Map<String, String[]> publicNavigationalState = new HashMap<String, String[]>(); - for (ParameterInfo parameterInfo : navigation.getPublicParameters()) + Map<String, String[]> publicNavigationalState = null; + + // first make sure that we actually have public parameters before actually doing anything + Collection<? extends ParameterInfo> publicParameters = navigation.getPublicParameters(); + if (publicParameters != null && !publicParameters.isEmpty()) { + publicNavigationalState = new HashMap<String, String[]>(); + CoordinationManager manager = getCoordinationManager(); - QName parameterName = parameterInfo.getName(); - Collection<String> bindings = manager.getBindingNames(getWindow(windowName), parameterName); + // For explicit initiate windowPublicNavigationStateUpdate with previous state + if (windowPublicNavigationalStateUpdate == null) + { + initiateWindowPublicNavigationalStateUpdate(); + } - // Don't store the URI as a page scoped public render parameter but window scoped - // Also for explicit and parameter with no bindings - if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterName) || (!implicitMode && bindings.size() == 0)) + for (ParameterInfo parameterInfo : publicParameters) { - String[] parameterValue = getWindowPublicNavigationalState(windowName, parameterName); - if (parameterValue != null) + QName parameterName = parameterInfo.getName(); + Collection<String> bindings = manager.getBindingNames(getWindow(windowName), parameterName); + + // Don't store the URI as a page scoped public render parameter but window scoped + // Also for explicit and parameter with no bindings + if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterName) || (!implicitMode && bindings.size() == 0)) { - String parameterId = parameterInfo.getId(); + String[] parameterValue = getWindowPublicNavigationalState(windowName, parameterName); - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); + if (parameterValue != null) + { + String parameterId = parameterInfo.getId(); + + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); + } } - } - else - { - String[] parameterValue = getPublicNavigationalState(parameterName); + else + { + String[] parameterValue = getPublicNavigationalState(parameterName); - // Explicit binding - String[] explicitParameterValue = null; + // Explicit binding + String[] explicitParameterValue = null; - // Check all bindings for this window/qname pair - // If this window/qname is bound several times with different updated params value will be unpredictable... - for (String binding : bindings) - { - explicitParameterValue = getPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding)); + // Check all bindings for this window/qname pair + // If this window/qname is bound several times with different updated params value will be unpredictable... + for (String binding : bindings) + { + explicitParameterValue = getPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding)); - // if a PNS has been found for a binding, use it and do not look further + // if a PNS has been found for a binding, use it and do not look further + if (explicitParameterValue != null) + { + break; + } + } + + // + String parameterId = parameterInfo.getId(); + + // if (explicitParameterValue != null) { - break; + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, explicitParameterValue.clone()); } + else if (implicitMode && parameterValue != null) + { + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); + } } - - // - String parameterId = parameterInfo.getId(); - - // - if (explicitParameterValue != null) - { - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, explicitParameterValue.clone()); - } - else if (implicitMode && parameterValue != null) - { - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); - } } } - // return publicNavigationalState; } } @@ -629,11 +633,11 @@ throw new IllegalStateException("Was called with a non null windowPublicNavigationalStateUpdate field"); } - // - windowPublicNavigationalStateUpdate = new HashMap<String, HashMap<QName, String[]>>(); + Set<String> windowNames = controllerContext.getWindowNames(); + windowPublicNavigationalStateUpdate = new HashMap<String, HashMap<QName, String[]>>(windowNames.size()); // Initial state for all windows on this page - for (String windowName : controllerContext.getWindowNames()) + for (String windowName : windowNames) { HashMap<QName, String[]> publicContentStateParams = getWindowPublicContentStateParameters(windowName); windowPublicNavigationalStateUpdate.put(windowName, publicContentStateParams); Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-03-06 16:26:22 UTC (rev 12957) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-03-06 16:30:08 UTC (rev 12958) @@ -93,25 +93,25 @@ public ControllerResponse execute() throws ControllerException { + NavigationalStateContext nsContext = (NavigationalStateContext)context.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); + + String pageId = getPage().getId().toString(); + if (parameters.size() > 0) { - NavigationalStateContext nsContext = (NavigationalStateContext)context.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); - - // - String pageId = getPage().getId().toString(); - - // Map<QName, String[]> state = new HashMap<QName, String[]>(); - // for (Map.Entry<String, String[]> entry : parameters.entrySet()) { state.put(new QName(XMLConstants.DEFAULT_NS_PREFIX, entry.getKey()), entry.getValue()); } - // nsContext.setPageNavigationalState(pageId, new PageNavigationalState(state)); } + else + { + nsContext.setPageNavigationalState(pageId, null); + } // return new UpdatePageResponse(page.getId()); Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2009-03-06 16:26:22 UTC (rev 12957) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2009-03-06 16:30:08 UTC (rev 12958) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -135,7 +135,7 @@ { PortalObjectId id = (PortalObjectId)wantedKey.getId(); Object storedNS = store.getAttribute(id.toString()); - if (storedNS instanceof WindowNavigationalState) + if (storedNS instanceof WindowNavigationalState || storedNS instanceof PageNavigationalState) { oldNS = storedNS; }

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12957 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: controller/portlet and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-03-06 11:26:22 -0500 (Fri, 06 Mar 2009) New Revision: 12957 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java Log: - JBPORTAL-2326: needs to be tested + If no parameters is passed to a page to be displayed, erased previous page navigational state + If we have a PNS, pass the current state as parameters to ViewPageCommand before full refresh in AJAX context (hackish) + Improved getPortletPublicNavigationalState method to avoid unnecessary work Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2009-03-06 15:35:06 UTC (rev 12956) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2009-03-06 16:26:22 UTC (rev 12957) @@ -71,10 +71,13 @@ import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.web.ServletContextDispatcher; +import javax.xml.namespace.QName; import java.io.StringWriter; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.Map; import java.util.Set; /** @@ -157,7 +160,8 @@ // Whether we need a full refresh or not boolean fullRefresh = false; - // + // in case we have we have a page navigational state... + Map<String, String[]> parameters = null; if (ctx.getChanges() == null) { @@ -213,20 +217,33 @@ } else if (type == PageNavigationalState.class) { - // force full refresh for now... + // force full refresh for now... for JBPORTAL-2326 fullRefresh = true; // TODO: implement proper propagation of PRPs and events - /*PageNavigationalState pns = (PageNavigationalState)update.getNewValue(); + PageNavigationalState pns = (PageNavigationalState)update.getNewValue(); if (pns != null) { - CoordinationManager coordinationManager = controllerContext.getController().getCoordinationManager(); + + // todo: fix-me, this is a hack to copy PRPs when we force the full refresh as parameters to ViewPageCommand... + Map<QName, String[]> qNameMap = pns.getParameters(); + if (qNameMap != null && !qNameMap.isEmpty()) + { + parameters = new HashMap<String, String[]>(qNameMap.size()); + + for (Map.Entry<QName, String[]> entry : qNameMap.entrySet()) + { + parameters.put(entry.getKey().toString(), entry.getValue()); + } + } + + /*CoordinationManager coordinationManager = controllerContext.getController().getCoordinationManager(); for (QName qName : pns.getParameters().keySet()) { // - } - }*/ + }*/ + } } } } @@ -358,7 +375,17 @@ } // We perform a full refresh - ViewPageCommand rpc = new ViewPageCommand(page.getId()); + ViewPageCommand rpc; + if (parameters == null) + { + rpc = new ViewPageCommand(page.getId()); + } + else + { + // if we have parameters from a PNS, feed them to ViewPageCommand (this is rather hackish) + rpc = new ViewPageCommand(page.getId(), parameters); + } + String url = controllerContext.renderURL(rpc, null, null); UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url); return new AjaxResponse(dresp); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-03-06 15:35:06 UTC (rev 12956) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-03-06 16:26:22 UTC (rev 12957) @@ -20,6 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ + package org.jboss.portal.core.controller.portlet; import org.jboss.portal.core.CoreConstants; @@ -136,7 +137,6 @@ // windowPublicNavigationalStateUpdate.clear(); - } if (updates != null) @@ -191,8 +191,6 @@ // pageUpdates.clear(); } - - } /** @@ -332,78 +330,84 @@ { PortletInfo info = controllerContext.getPortletInfo(windowName); - CoordinationManager manager = getCoordinationManager(); - - // For explicit initiate windowPublicNavigationStateUpdate with previous state - if (windowPublicNavigationalStateUpdate == null) - { - initiateWindowPublicNavigationalStateUpdate(); - } - if (info != null) { NavigationInfo navigation = info.getNavigation(); if (navigation != null) { - Map<String, String[]> publicNavigationalState = new HashMap<String, String[]>(); - for (ParameterInfo parameterInfo : navigation.getPublicParameters()) + Map<String, String[]> publicNavigationalState = null; + + // first make sure that we actually have public parameters before actually doing anything + Collection<? extends ParameterInfo> publicParameters = navigation.getPublicParameters(); + if (publicParameters != null && !publicParameters.isEmpty()) { + publicNavigationalState = new HashMap<String, String[]>(); + CoordinationManager manager = getCoordinationManager(); - QName parameterName = parameterInfo.getName(); - Collection<String> bindings = manager.getBindingNames(getWindow(windowName), parameterName); + // For explicit initiate windowPublicNavigationStateUpdate with previous state + if (windowPublicNavigationalStateUpdate == null) + { + initiateWindowPublicNavigationalStateUpdate(); + } - // Don't store the URI as a page scoped public render parameter but window scoped - // Also for explicit and parameter with no bindings - if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterName) || (!implicitMode && bindings.size() == 0)) + for (ParameterInfo parameterInfo : publicParameters) { - String[] parameterValue = getWindowPublicNavigationalState(windowName, parameterName); - if (parameterValue != null) + QName parameterName = parameterInfo.getName(); + Collection<String> bindings = manager.getBindingNames(getWindow(windowName), parameterName); + + // Don't store the URI as a page scoped public render parameter but window scoped + // Also for explicit and parameter with no bindings + if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterName) || (!implicitMode && bindings.size() == 0)) { - String parameterId = parameterInfo.getId(); + String[] parameterValue = getWindowPublicNavigationalState(windowName, parameterName); - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); + if (parameterValue != null) + { + String parameterId = parameterInfo.getId(); + + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); + } } - } - else - { - String[] parameterValue = getPublicNavigationalState(parameterName); + else + { + String[] parameterValue = getPublicNavigationalState(parameterName); - // Explicit binding - String[] explicitParameterValue = null; + // Explicit binding + String[] explicitParameterValue = null; - // Check all bindings for this window/qname pair - // If this window/qname is bound several times with different updated params value will be unpredictable... - for (String binding : bindings) - { - explicitParameterValue = getPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding)); + // Check all bindings for this window/qname pair + // If this window/qname is bound several times with different updated params value will be unpredictable... + for (String binding : bindings) + { + explicitParameterValue = getPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding)); - // if a PNS has been found for a binding, use it and do not look further + // if a PNS has been found for a binding, use it and do not look further + if (explicitParameterValue != null) + { + break; + } + } + + // + String parameterId = parameterInfo.getId(); + + // if (explicitParameterValue != null) { - break; + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, explicitParameterValue.clone()); } + else if (implicitMode && parameterValue != null) + { + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); + } } - - // - String parameterId = parameterInfo.getId(); - - // - if (explicitParameterValue != null) - { - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, explicitParameterValue.clone()); - } - else if (implicitMode && parameterValue != null) - { - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); - } } } - // return publicNavigationalState; } } @@ -629,11 +633,11 @@ throw new IllegalStateException("Was called with a non null windowPublicNavigationalStateUpdate field"); } - // - windowPublicNavigationalStateUpdate = new HashMap<String, HashMap<QName, String[]>>(); + Set<String> windowNames = controllerContext.getWindowNames(); + windowPublicNavigationalStateUpdate = new HashMap<String, HashMap<QName, String[]>>(windowNames.size()); // Initial state for all windows on this page - for (String windowName : controllerContext.getWindowNames()) + for (String windowName : windowNames) { HashMap<QName, String[]> publicContentStateParams = getWindowPublicContentStateParameters(windowName); windowPublicNavigationalStateUpdate.put(windowName, publicContentStateParams); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-03-06 15:35:06 UTC (rev 12956) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-03-06 16:26:22 UTC (rev 12957) @@ -93,25 +93,25 @@ public ControllerResponse execute() throws ControllerException { + NavigationalStateContext nsContext = (NavigationalStateContext)context.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); + + String pageId = getPage().getId().toString(); + if (parameters.size() > 0) { - NavigationalStateContext nsContext = (NavigationalStateContext)context.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); - - // - String pageId = getPage().getId().toString(); - - // Map<QName, String[]> state = new HashMap<QName, String[]>(); - // for (Map.Entry<String, String[]> entry : parameters.entrySet()) { state.put(new QName(XMLConstants.DEFAULT_NS_PREFIX, entry.getKey()), entry.getValue()); } - // nsContext.setPageNavigationalState(pageId, new PageNavigationalState(state)); } + else + { + nsContext.setPageNavigationalState(pageId, null); + } // return new UpdatePageResponse(page.getId()); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2009-03-06 15:35:06 UTC (rev 12956) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2009-03-06 16:26:22 UTC (rev 12957) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -135,7 +135,7 @@ { PortalObjectId id = (PortalObjectId)wantedKey.getId(); Object storedNS = store.getAttribute(id.toString()); - if (storedNS instanceof WindowNavigationalState) + if (storedNS instanceof WindowNavigationalState || storedNS instanceof PageNavigationalState) { oldNS = storedNS; }

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12956 - branches/JBoss_Portal_Branch_2_7/build.

by portal-commits＠lists.jboss.org

Author: prabhat.jha(a)jboss.com Date: 2009-03-06 10:35:06 -0500 (Fri, 06 Mar 2009) New Revision: 12956 Modified: branches/JBoss_Portal_Branch_2_7/build/distrib.xml Log: stupid me..added the target but did not call it Modified: branches/JBoss_Portal_Branch_2_7/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2009-03-06 11:08:35 UTC (rev 12955) +++ branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2009-03-06 15:35:06 UTC (rev 12956) @@ -382,6 +382,9 @@ <antcall target="patch-run.conf"> <param name="todir" value="${portal.build.normal.bundled}"/> </antcall> + <antcall target="patch-run.bat"> + <param name="todir" value="${portal.build.normal.bundled}"/> + </antcall> </target> <!--

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12955 - in tags/JBoss_Portal_2_7_2: core/src/resources/portal-server-war and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-03-06 06:08:35 -0500 (Fri, 06 Mar 2009) New Revision: 12955 Modified: tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp Log: - Synchronization with trunk: + JBPORTAL-2227 - setTimeout is evil + Improved rewording and minor re-formatting of PageParameterPortlet. Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js 2009-03-06 07:56:26 UTC (rev 12954) +++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/js/login.js 2009-03-06 11:08:35 UTC (rev 12955) @@ -32,6 +32,15 @@ //namespace login functions and variables var isModal = true; + /** + * Delay for a number of milliseconds + */ + function sleep(delay) + { + var start = new Date().getTime(); + while (new Date().getTime() < start + delay); + } + return{ /** * Gets the current display status of the login box (modal or page) sets global variable and @@ -59,7 +68,7 @@ } catch(e) { - //swallow + //swallow } //give the cancel button back button functionality (hackish) but there is no other way //to get returning page @@ -99,17 +108,20 @@ * @name validate * @return {void} */ - validate : function() { + validate : function(delay) { try { - - if (document.getElementById('j_username').value.length < 1 || document.getElementById('j_password').value.length < 1){ - document.getElementById('login-submit').disabled = true; - document.getElementById('login-submit').className = 'login-button disabled-button'; - }else{ - document.getElementById('login-submit').disabled = false; - document.getElementById('login-submit').className = 'login-button'; - } + //delay for cached browser credentials + if (delay != undefined) { + sleep(delay); + } + if (document.getElementById('j_username').value.length < 1 || document.getElementById('j_password').value.length < 1) { + document.getElementById('login-submit').disabled = true; + document.getElementById('login-submit').className = 'login-button disabled-button'; + } else { + document.getElementById('login-submit').disabled = false; + document.getElementById('login-submit').className = 'login-button'; + } } catch (e) { @@ -119,7 +131,7 @@ highlight : function(id) { var el = document.getElementById(id); - if ( el.className != 'highlight' ) { + if (el.className != 'highlight') { el.className = 'highlight'; } else { Modified: tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-03-06 07:56:26 UTC (rev 12954) +++ tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-03-06 11:08:35 UTC (rev 12955) @@ -39,7 +39,7 @@ <link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/> </head> -<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();setTimeout('JBossPortal.login.validate()',10);"> +<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();JBossPortal.login.validate(10);"> <div class="login-container"> Modified: tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java =================================================================== --- tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java 2009-03-06 07:56:26 UTC (rev 12954) +++ tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java 2009-03-06 11:08:35 UTC (rev 12955) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -24,11 +24,11 @@ import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; +import org.jboss.portlet.JBossActionRequest; +import org.jboss.portlet.JBossActionResponse; +import org.jboss.portlet.JBossPortlet; import org.jboss.portlet.JBossRenderRequest; -import org.jboss.portlet.JBossPortlet; import org.jboss.portlet.JBossRenderResponse; -import org.jboss.portlet.JBossActionRequest; -import org.jboss.portlet.JBossActionResponse; import javax.portlet.PortletException; import javax.portlet.PortletSecurityException; @@ -64,7 +64,7 @@ PrintWriter writer = resp.getWriter(); // - for (Enumeration<String> e = getPortletConfig().getPublicRenderParameterNames();e.hasMoreElements();) + for (Enumeration<String> e = getPortletConfig().getPublicRenderParameterNames(); e.hasMoreElements();) { String parameterName = e.nextElement(); @@ -74,9 +74,9 @@ // writer.println("<div class=\"portlet-font\">Page parameters can be bound to coordination aliases. Out of the box, the request parameters" + - " are themselves bound to page parameters. Setting a value below, will modify the URL by adding a request parameter.<br/>" + - "This can be particulary intersting to use URL request parameters to set values usable by a portlet.</div>"); - + " are themselves bound to page parameters. Setting a value below, will modify the URL by adding a request parameter.<br/>" + + "This can be particulary interesting to pass values that can then be used by portlets.</div>"); + // writer.println("<form action=\"" + resp.createActionURL() + "\" method=\"POST\"><table>"); writer.println("<tr><td>Page parameter name:</td><td><input type=\"text\" name=\"name\" width=\"36\" value=\"\"/></td></tr>");

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12954 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2009-03-06 02:56:26 -0500 (Fri, 06 Mar 2009) New Revision: 12954 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java Log: JBPORTAL-2335: Explicit public parameters don't work Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-03-06 07:50:56 UTC (rev 12953) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-03-06 07:56:26 UTC (rev 12954) @@ -93,6 +93,8 @@ Map<String, String[]> stringMap = ((ParametersStateString)state).getParameters(); Map<String, String[]> parameters = new HashMap<String, String[]>(stringMap); + + parameters.putAll(renderResult.getPublicNavigationalStateUpdates()); if (pns != null) {

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12953 - tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2009-03-06 02:50:56 -0500 (Fri, 06 Mar 2009) New Revision: 12953 Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java Log: JBPORTAL-2335: Explicit public parameters don't work Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-03-05 21:13:02 UTC (rev 12952) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-03-06 07:50:56 UTC (rev 12953) @@ -93,6 +93,8 @@ Map<String, String[]> stringMap = ((ParametersStateString)state).getParameters(); Map<String, String[]> parameters = new HashMap<String, String[]>(stringMap); + + parameters.putAll(renderResult.getPublicNavigationalStateUpdates()); if (pns != null) {

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12952 - in modules/identity/trunk/identity/src: main/java/org/jboss/portal/identity/service and 3 other directories.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2009-03-05 16:13:02 -0500 (Thu, 05 Mar 2009) New Revision: 12952 Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java modules/identity/trunk/identity/src/test/resources/config/db-config.xml modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml Log: see https://jira.jboss.org/jira/browse/JBPORTAL-2283 Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -99,8 +99,12 @@ public static final String SEARCH_SCOPE = "searchScope"; + public static final String ADMIN_ROLES = "adminRoles"; + public static final String ADMIN_USERS = "adminUsers"; + + public Set getValues(String optionGroup, String option); public String getValue(String optionGroup, String option); Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -97,6 +97,13 @@ * @return the roles */ Set findRoles() throws IdentityException; + + /** + * Get all the administrator roles + * + * @return the role names + */ + Set<String> getAdminRoles() throws IdentityException; } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -100,4 +100,11 @@ * @return the number of users */ int getUserCount() throws IdentityException, IllegalArgumentException; + + /** + * Get all the administrator roles + * + * @return the role names + */ + Set<String> getAdminUsers() throws IdentityException; } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -21,6 +21,9 @@ */ package org.jboss.portal.identity.service; +import java.util.Set; + +import org.jboss.portal.identity.IdentityConfiguration; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityException; @@ -60,5 +63,15 @@ RoleUpdatedEvent event = new RoleUpdatedEvent(roleId, roleName, displayName); getIdentityEventBroadcaster().fireEvent(event); } + + public Set<String> getAdminRoles() throws IdentityException + { + Set<String> adminRoles = (Set<String>)getIdentityConfiguration().getOptions(IdentityConfiguration.GROUP_COMMON).get(IdentityConfiguration.ADMIN_ROLES); + if (adminRoles == null) + { + throw new IdentityException("Configuration option missing: " + IdentityConfiguration.ADMIN_ROLES); + } + return adminRoles; + } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -21,6 +21,9 @@ */ package org.jboss.portal.identity.service; +import java.util.Set; + +import org.jboss.portal.identity.IdentityConfiguration; import org.jboss.portal.identity.UserModule; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityException; @@ -52,5 +55,15 @@ IdentityEvent event = new UserDestroyedEvent(userId, userName); getIdentityEventBroadcaster().fireEvent(event); } + + public Set<String> getAdminUsers() throws IdentityException + { + Set<String> adminUsers = (Set<String>)getIdentityConfiguration().getOptions(IdentityConfiguration.GROUP_COMMON).get(IdentityConfiguration.ADMIN_USERS); + if (adminUsers == null) + { + throw new IdentityException("Configuration option missing: " + IdentityConfiguration.ADMIN_USERS); + } + return adminUsers; + } } Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java =================================================================== --- modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -21,6 +21,7 @@ */ package org.jboss.portal.test.identity.db; +import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.ProfileMap; import org.jboss.portal.identity.User; import org.jboss.portal.identity.db.HibernateUserImpl; @@ -188,4 +189,30 @@ { genericTest.testStaticProperty(); } + + public void testGetAdminUsers() throws Exception + { + try + { + getUserModule().getAdminUsers(); + } + catch (IdentityException e) + { + fail(); + } + + } + + public void testGetAdminRoles() throws Exception + { + try + { + getRoleModule().getAdminRoles(); + } + catch (IdentityException e) + { + fail(); + } + + } } Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -203,4 +203,17 @@ } + + public void testGetAdminRoles() throws Exception + { + try + { + getRoleModule().getAdminRoles(); + } + catch (IdentityException e) + { + fail(); + } + + } } Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-03-05 21:13:02 UTC (rev 12952) @@ -1,6 +1,7 @@ package org.jboss.portal.test.identity.ldap; //import org.jboss.portal.identity.IdentityServiceControllerImpl; +import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.User; import org.jboss.portal.identity.Role; import org.jboss.portal.identity.NoSuchUserException; @@ -145,4 +146,17 @@ assertTrue(roleNames.contains("Echo")); } + + public void testGetAdminUsers() throws Exception + { + try + { + getUserModule().getAdminUsers(); + } + catch (IdentityException e) + { + fail(); + } + + } } Modified: modules/identity/trunk/identity/src/test/resources/config/db-config.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/db-config.xml 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/test/resources/config/db-config.xml 2009-03-05 21:13:02 UTC (rev 12952) @@ -65,5 +65,5 @@ <config/> </module> </modules> - <options/> + </identity-configuration> Modified: modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml 2009-03-05 16:56:55 UTC (rev 12951) +++ modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml 2009-03-05 21:13:02 UTC (rev 12952) @@ -335,6 +335,14 @@ <name>defaultAdminRole</name> <value>Admin</value> </option> + <option> + <name>adminUsers</name> + <value>admin</value> + </option> + <option> + <name>adminRoles</name> + <value>Admin</value> + </option> </option-group> <option-group> <group-name>userCreateAttibutes</group-name>

17 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r12951 - in branches/JBoss_Portal_Branch_2_7/core/src: resources/portal-server-war and 1 other directory.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2009-03-05 11:56:55 -0500 (Thu, 05 Mar 2009) New Revision: 12951 Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp Log: JBPORTAL-2227 - setTimeout is evil Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js 2009-03-05 16:30:09 UTC (rev 12950) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/login.js 2009-03-05 16:56:55 UTC (rev 12951) @@ -32,6 +32,15 @@ //namespace login functions and variables var isModal = true; + /** + * Delay for a number of milliseconds + */ + function sleep(delay) + { + var start = new Date().getTime(); + while (new Date().getTime() < start + delay); + } + return{ /** * Gets the current display status of the login box (modal or page) sets global variable and @@ -59,7 +68,7 @@ } catch(e) { - //swallow + //swallow } //give the cancel button back button functionality (hackish) but there is no other way //to get returning page @@ -99,17 +108,20 @@ * @name validate * @return {void} */ - validate : function() { + validate : function(delay) { try { - - if (document.getElementById('j_username').value.length < 1 || document.getElementById('j_password').value.length < 1){ - document.getElementById('login-submit').disabled = true; - document.getElementById('login-submit').className = 'login-button disabled-button'; - }else{ - document.getElementById('login-submit').disabled = false; - document.getElementById('login-submit').className = 'login-button'; - } + //delay for cached browser credentials + if (delay != undefined) { + sleep(delay); + } + if (document.getElementById('j_username').value.length < 1 || document.getElementById('j_password').value.length < 1) { + document.getElementById('login-submit').disabled = true; + document.getElementById('login-submit').className = 'login-button disabled-button'; + } else { + document.getElementById('login-submit').disabled = false; + document.getElementById('login-submit').className = 'login-button'; + } } catch (e) { @@ -119,7 +131,7 @@ highlight : function(id) { var el = document.getElementById(id); - if ( el.className != 'highlight' ) { + if (el.className != 'highlight') { el.className = 'highlight'; } else { Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-03-05 16:30:09 UTC (rev 12950) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-03-05 16:56:55 UTC (rev 12951) @@ -39,7 +39,7 @@ <link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/> </head> -<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();setTimeout('JBossPortal.login.validate()',10);"> +<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();JBossPortal.login.validate(10);"> <div class="login-container">

17 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits March 2009