Author: thomas.heute(a)jboss.com Date: 2008-03-26 17:25:30 -0400 (Wed, 26 Mar 2008) New Revision: 10380 Removed: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PortletInfoTest.java Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/InvalidStateIdException.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/NoSuchStateException.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConversionException.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStateChangeRequiredException.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java Log: JBPORTAL-1959: Migrate isRemotable to a WSRPInfo attachment Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java 2008-03-26 21:11:35 UTC (rev 10379) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -58,14 +58,14 @@ public PortletSupport() { - this(new ContainerPortletInfo(null, new ContainerPreferencesInfo(null), null, null, null, null, null, null, null, null, null)); + this(new ContainerPortletInfo(null, new ContainerPreferencesInfo(null), null, null, null, null, null, null, null, null)); } public PortletSupport(String displayName) { ContainerMetaInfo cmi = new ContainerMetaInfo(); cmi.addMetaValue(ContainerMetaInfo.DISPLAY_NAME, new LocalizedString(displayName, Locale.ENGLISH)); - this.info = new ContainerPortletInfo(null, new ContainerPreferencesInfo(null), cmi, null, null, null, null, null, null, null, null); + this.info = new ContainerPortletInfo(null, new ContainerPreferencesInfo(null), cmi, null, null, null, null, null, null, null); this.valid = true; } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-03-26 21:11:35 UTC (rev 10379) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -34,6 +34,7 @@ import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.core.portlet.info.PortletIconInfo; import org.jboss.portal.core.portlet.info.PortletInfoInfo; +import org.jboss.portal.core.portlet.info.WSRPInfo; import org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet; import org.jboss.portal.faces.el.DelegatingPropertyResolver; import org.jboss.portal.faces.el.decorator.AbstractBeanDecorator; @@ -162,7 +163,14 @@ { Portlet portlet = (Portlet)bean; PortletInfo info = portlet.getInfo(); - return info.isRemotable(); + if (info.getAttachment(WSRPInfo.class) != null) + { + return info.getAttachment(WSRPInfo.class).isRemotable(); + } + else + { + return Boolean.FALSE; + } } }); portletDecorator.setProperty("modes", new AbstractPropertyDecorator(Set.class) Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-03-26 21:11:35 UTC (rev 10379) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -24,6 +24,7 @@ package org.jboss.portal.wsrp.producer; import org.jboss.logging.Logger; +import org.jboss.portal.core.portlet.info.WSRPInfo; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -499,13 +500,17 @@ private boolean isRemotable(Portlet portlet) { PortletInfo portletInfo = portlet.getInfo(); - Boolean remotable = portletInfo.isRemotable(); - log.debug("Portlet " + portlet.getContext() + " remotable: " + remotable); - if (remotable != null) + WSRPInfo wsrpInfo = portletInfo.getAttachment(WSRPInfo.class); + if (wsrpInfo != null) { - return remotable.booleanValue(); + Boolean remotable = wsrpInfo.isRemotable(); + log.debug("Portlet " + portlet.getContext() + " remotable: " + remotable); + if (remotable != null) + { + return remotable.booleanValue(); + } } - else if (isRemotableByDefault() != null) + if (isRemotableByDefault() != null) { return isRemotableByDefault().booleanValue(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -630,7 +630,6 @@ portletMD.getPortletClass(), context.getApplicationName(), Collections.unmodifiableMap(initParameters), - null, context.getBundleManager(portletMD) ); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -75,9 +75,6 @@ private final Map<String, String> initParameters; /** . */ - private final Boolean remotable; - - /** . */ private final ResourceBundleManager bundleManager; /** . */ @@ -99,7 +96,6 @@ String className, String applicationName, Map<String, String> initParameters, - Boolean remotable, ResourceBundleManager bundleManager) { this.attachments = new HashMap<Class, Object>(); @@ -115,7 +111,6 @@ this.applicationName = applicationName; this.className = className; this.initParameters = initParameters; - this.remotable = remotable; this.bundleManager = bundleManager; this.options = Collections.emptyMap(); } @@ -150,7 +145,6 @@ this.applicationName = applicationName; this.className = className; this.initParameters = initParameters; - this.remotable = remotable; this.bundleManager = bundleManager; this.options = options; } @@ -250,11 +244,6 @@ return cache; } - public Boolean isRemotable() - { - return remotable; - } - public ContainerEventingInfo getEventing() { return events; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -57,13 +57,14 @@ this(request, NO_COOKIES); } + @SuppressWarnings("unchecked") public AbstractClientContext(HttpServletRequest request, List<Cookie> additionalCookies) { MultiValuedPropertyMap<String> headers = new SimpleMultiValuedPropertyMap<String>(); - for (Enumeration e = request.getHeaderNames();e.hasMoreElements();) + for (Enumeration<String> e = request.getHeaderNames();e.hasMoreElements();) { String headerName = (String)e.nextElement(); - for (Enumeration f = request.getHeaders(headerName);f.hasMoreElements();) + for (Enumeration<String> f = request.getHeaders(headerName);f.hasMoreElements();) { String headerValue = (String)f.nextElement(); headers.addValue(headerName, headerValue); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -104,6 +104,7 @@ /** * Returns the client request locales or an empty list if no request was provided. */ + @SuppressWarnings("unchecked") public List<Locale> getLocales() { if (clientRequest == null) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -23,6 +23,7 @@ package org.jboss.portal.portlet.impl.state; import org.jboss.portal.common.value.StringValue; +import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.StateConversionException; @@ -74,9 +75,9 @@ dos.writeUTF(state.getPortletId()); PropertyMap map = state.getProperties(); dos.writeInt(map.size()); - for (Iterator i = map.entrySet().iterator(); i.hasNext();) + for (Iterator<Map.Entry<String, Value>> i = map.entrySet().iterator(); i.hasNext();) { - Map.Entry entry = (Map.Entry)i.next(); + Map.Entry<String, Value> entry = (Map.Entry<String, Value>)i.next(); String key = (String)entry.getKey(); StringValue value = (StringValue)entry.getValue(); String[] strings = (String[])value.asObjectArray(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -83,17 +83,6 @@ CacheInfo getCache(); /** - * Determines whether the described portlet can be accessed remotely (such as via WSRP) or not. Clients of this - * method should be prepare to handle a <code>null</code> return value expressing the fact that the remotable status - * hasn't been explicitely set. - * - * @return <code>Boolean.TRUE</code> if the described portlet can be accessed remotely, <code>Boolean.FALSE</code> if - * the described portlet cannot be accessed remotely, <code>null</code> if the value hasn't been specified - * explicitely for the associated portlet. - */ - Boolean isRemotable(); - - /** * Return the eventing information. * * @return the eventing information Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -22,12 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.invocation.response; -import org.jboss.portal.portlet.cache.CacheControl; -import org.jboss.portal.Mode; - -import java.util.Set; import java.util.Map; +import org.jboss.portal.portlet.cache.CacheControl; + /** * Data produced. * Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -22,18 +22,14 @@ ******************************************************************************/ package org.jboss.portal.portlet.spi; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; +import java.io.IOException; +import java.io.Writer; + import org.jboss.portal.common.invocation.InvocationContext; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.URLFormat; -import java.io.IOException; -import java.io.Writer; - /** * Contract that defines what input/services the caller of a portlet container must provide. * Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -106,11 +106,11 @@ } } - public Set getKeys() + public Set<String> getKeys() { if (prefs == null) { - return Collections.EMPTY_SET; + return Collections.emptySet(); } return prefs.keySet(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/InvalidStateIdException.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/InvalidStateIdException.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/InvalidStateIdException.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -26,6 +26,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5776 $ */ +@SuppressWarnings("serial") public class InvalidStateIdException extends Exception { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/NoSuchStateException.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/NoSuchStateException.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/NoSuchStateException.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -26,6 +26,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5776 $ */ +@SuppressWarnings("serial") public class NoSuchStateException extends Exception { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.Map; -import java.io.Serializable; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConversionException.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConversionException.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConversionException.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -26,6 +26,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5776 $ */ +@SuppressWarnings("serial") public class StateConversionException extends Exception { public StateConversionException() Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.state.consumer; import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.common.FixMe; import org.jboss.portal.portlet.InvalidPortletIdException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -284,7 +283,7 @@ return failures; } - public PropertyMap getProperties(PortletContext portletContext, Set keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException { ConsumerContext consumerContext = getConsumerContext(portletContext); return producer.getProperties(consumerContext.producerPortletContext, keys); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -32,6 +32,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5873 $ */ +@SuppressWarnings("serial") public class PortletState implements Serializable { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStateChangeRequiredException.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStateChangeRequiredException.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStateChangeRequiredException.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -30,6 +30,7 @@ * @version $Revision: 5776 $ * @since 2.6 */ +@SuppressWarnings("serial") public class PortletStateChangeRequiredException extends InvocationException { public PortletStateChangeRequiredException(String message) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -460,7 +460,7 @@ return result; } - public PropertyMap getProperties(PortletContext portletContext, Set keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException { if (keys == null) { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -34,7 +34,6 @@ private String name; private String applicationName; - private Boolean remotable; private PreferencesInfoSupport preferencesSupport = new PreferencesInfoSupport(); private SecurityInfoSupport securitySupport = new SecurityInfoSupport(); private CacheInfoSupport cacheSupport = new CacheInfoSupport(); @@ -87,16 +86,6 @@ return cacheSupport; } - public Boolean isRemotable() - { - return remotable; - } - - public void setRemotable(Boolean remotable) - { - this.remotable = remotable; - } - public EventingInfoSupport getEventing() { return eventsSupport; Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PortletInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2008-03-26 21:11:35 UTC (rev 10379) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2008-03-26 21:25:30 UTC (rev 10380) @@ -1,64 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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.test.portlet.info; - -import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; -import org.jboss.portal.portlet.info.PortletInfo; - -import static org.jboss.unit.api.Assert.*; - -/** - * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 6720 $ - */ -public class PortletInfoTest extends AbstractInfoTest -{ - - public PortletInfoTest() - { - super("PortletInfoTest"); - } - - public void execute() - { - //This asserts only .isRemotable() as rest is checked in other tests - ManagedPortletContainer container = registry.getManagedPortletApplication("/test-info").getManagedPortletContainer("RemotablePortlet1"); - PortletInfo info = container.getInfo(); - assertEquals(Boolean.TRUE, info.isRemotable()); - - //just simple test if we get other infos... - assertNotNull(info.getCache()); - assertNotNull(info.getCapabilities()); - assertNotNull(info.getMeta()); - assertNotNull(info.getPreferences()); - assertNotNull(info.getSecurity()); - - container = registry.getManagedPortletApplication("/test-info").getManagedPortletContainer("RemotablePortlet2"); - info = container.getInfo(); - assertEquals(Boolean.FALSE, info.isRemotable()); - - container = registry.getManagedPortletApplication("/test-info").getManagedPortletContainer("RemotablePortlet3"); - info = container.getInfo(); - assertEquals(Boolean.TRUE, info.isRemotable()); - } -}