[jboss-svn-commits] JBoss Portal SVN: r5689 - in trunk/portlet/src/main/org/jboss/portal: portlet/aspects/portlet portlet/container test/portlet/info
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 20 15:35:06 EST 2006
Author: julien at jboss.com
Date: 2006-11-20 15:34:51 -0500 (Mon, 20 Nov 2006)
New Revision: 5689
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
Log:
- let the PortetContainerInvoker produce a Portlet implementation in front of the PortletContainer
- the portlet container now does not have the notion of an ID unique among all portlet applications as it should not have (it can only now the id=name in the same application)
- leverage the portlet container registry listener to have the PortletContainerInvoker be aware of the container registrations/unregistrations so it can create the appropriate Portlet implementation that it will return
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -71,7 +71,7 @@
// Perhaps this should be done asynchronously as it may lead to a long delay ?
// It could be made parametrizable too, so the deployer can choose what mode is preferable
PortletApplicationImpl pwa = (PortletApplicationImpl)container.getApplication();
- pwa.stop(container.getName());
+ pwa.stop(container.getId());
}
//
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -101,14 +101,14 @@
public void addContainer(PortletContainer container)
{
- portlets.put(container.getName(), container);
+ portlets.put(container.getId(), container);
registry.registerPortlet(container);
}
public void removeContainer(PortletContainer container)
{
registry.unregisterPortlet(container);
- portlets.remove(container.getName());
+ portlets.remove(container.getId());
}
//
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -49,14 +49,6 @@
/** Return a portlet app using its id or null if it does not exist. */
PortletApplication getPortletApplication(String id);
- /** Return a component using its id or null if it does not exist. */
- PortletContainer getPortletContainer(String id);
-
- /**
- * Return an immutable list all the known portlet container in the registry.
- */
- Collection getPortletContainers();
-
void addListener(PortletContainerRegistryListener listener);
void removeListener(PortletContainerRegistryListener listener);
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -41,6 +41,7 @@
{
private Map portletApplications = new HashMap();
+
private Map portlets = new HashMap();
private List listeners = new ArrayList();
@@ -90,8 +91,10 @@
synchronized (this)
{
Map componentsCopy = new HashMap(portlets);
- componentsCopy.put(portlet.getContext().getId(), portlet);
+ componentsCopy.put(new ContainerKey(portlet), portlet);
portlets = componentsCopy;
+
+ //
raiseRegisterPortletContainerEvent(portlet);
}
}
@@ -105,7 +108,7 @@
synchronized (this)
{
Map componentsCopy = new HashMap(portlets);
- componentsCopy.remove(portlet.getContext().getId());
+ componentsCopy.remove(portlet);
portlets = componentsCopy;
raiseUnregisterPortletContainerEvent(portlet);
}
@@ -121,16 +124,6 @@
return (PortletApplication)portletApplications.get(id);
}
- public PortletContainer getPortletContainer(String id)
- {
- return (PortletContainer)portlets.get(id);
- }
-
- public Collection getPortletContainers()
- {
- return Collections.unmodifiableCollection(portlets.values());
- }
-
public void addListener(PortletContainerRegistryListener listener)
{
if (listener == null)
@@ -182,4 +175,37 @@
}
+ private static class ContainerKey
+ {
+ /** . */
+ private final String applicationId;
+
+ /** . */
+ private final String containerId;
+
+ public ContainerKey(PortletContainer container)
+ {
+ this.applicationId = container.getApplication().getId();
+ this.containerId = container.getId();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof ContainerKey)
+ {
+ ContainerKey that = (ContainerKey)obj;
+ return applicationId.equals(that.applicationId) && containerId.equals(containerId);
+ }
+ return false;
+ }
+
+ public int hashCode()
+ {
+ return applicationId.hashCode() & containerId.hashCode();
+ }
+ }
}
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -25,7 +25,6 @@
import org.jboss.logging.Logger;
import org.jboss.portal.common.concurrent.Valve;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
@@ -70,7 +69,7 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class PortletContainer implements org.jboss.portal.portlet.Portlet
+public class PortletContainer
{
/** Logger. */
@@ -115,9 +114,6 @@
/** Return info. */
protected PortletInfo info;
- /** . */
- protected PortletContext portletContext;
-
/**
* The preference validator, this is not exposed as runtime meta data as it is only used by the JSR 168 portlet
* container implementation.
@@ -132,7 +128,6 @@
this.valve = new Valve();
this.log = Logger.getLogger("org.jboss.portal.portlet.container." + metaData.getClassName().replace('.', '_'));
this.started = false;
- this.portletContext = new PortletContext(application.getId() + "." + metaData.getName());
}
public PortletInfo getInfo()
@@ -140,18 +135,8 @@
return info;
}
- public PortletContext getContext()
+ public String getId()
{
- return portletContext;
- }
-
- public boolean isRemote()
- {
- return false;
- }
-
- public String getName()
- {
return metaData.getName();
}
@@ -283,15 +268,15 @@
}
catch (PortletException e)
{
- throw new PortletInitializationException("The portlet " + getName() + " threw a portlet exception during init", e);
+ throw new PortletInitializationException("The portlet " + getId() + " threw a portlet exception during init", e);
}
catch (RuntimeException e)
{
- throw new PortletInitializationException("The portlet " + getName() + " threw a runtime exception during init", e);
+ throw new PortletInitializationException("The portlet " + getId() + " threw a runtime exception during init", e);
}
catch (Error e)
{
- throw new PortletInitializationException("The portlet " + getName() + " threw an error during init", e);
+ throw new PortletInitializationException("The portlet " + getId() + " threw an error during init", e);
}
}
@@ -377,7 +362,7 @@
public String toString()
{
- return "[PortletContainer=" + getContext() + "]";
+ return "PortletContainer[name=" + getId() + ",+application=" + application.getId() + "]";
}
/** Initialize the portlet. */
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -32,17 +32,19 @@
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.PropertyMap;
-import java.util.Collection;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.HashSet;
/**
* An implementation of portlet invoker that makes a call to a portlet container.
@@ -50,7 +52,7 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class PortletContainerInvoker extends AbstractJBossService implements PortletInvoker
+public class PortletContainerInvoker extends AbstractJBossService implements PortletInvoker, PortletContainerRegistryListener
{
/** . */
@@ -60,6 +62,9 @@
private InterceptorStackFactory stackFactory;
/** . */
+ private Map portlets;
+
+ /** . */
private InvocationHandler handler = new InvocationHandler()
{
public Object invoke(Invocation invocation) throws Exception, org.jboss.portal.common.invocation.InvocationException
@@ -99,22 +104,60 @@
this.stackFactory = stackFactory;
}
- public Set getPortlets()
+ public synchronized void registerPortletContainer(PortletContainer portletContainer)
{
- Collection allWebApps = registry.getPortletApplications();
- Set containers = new LinkedHashSet();
- for (Iterator i = allWebApps.iterator(); i.hasNext();)
+ Map portlets = new HashMap(this.portlets);
+ PortletImpl portlet = new PortletImpl(portletContainer);
+ portlets.put(portlet.getContext().getId(), portlet);
+
+ //
+ this.portlets = portlets;
+ }
+
+ public synchronized void unregisterPortletContainer(PortletContainer portletContainer)
+ {
+ Map portlets = new HashMap(this.portlets);
+ PortletImpl portlet = new PortletImpl(portletContainer);
+ portlets.remove(portlet.getContext().getId());
+
+ //
+ this.portlets = portlets;
+ }
+
+ protected synchronized void startService() throws Exception
+ {
+ Map portlets = new HashMap();
+ for (Iterator i = registry.getPortletApplications().iterator();i.hasNext();)
{
PortletApplication portletApplication = (PortletApplication)i.next();
- for (Iterator j = portletApplication.getPortletContainers().iterator(); j.hasNext();)
+ for (Iterator j = portletApplication.getPortletContainers().iterator();j.hasNext();)
{
- PortletContainer container = (PortletContainer)j.next();
- containers.add(container);
+ PortletContainer portletContainer = (PortletContainer)j.next();
+ PortletImpl portlet = new PortletImpl(portletContainer);
+ portlets.put(portlet.getContext().getId(), portlet);
}
}
- return containers;
+
+ //
+ this.portlets = portlets;
+
+ //
+ registry.addListener(this);
}
+ protected synchronized void stopService() throws Exception
+ {
+ registry.removeListener(this);
+
+ //
+ portlets = new HashMap();
+ }
+
+ public Set getPortlets()
+ {
+ return new HashSet(portlets.values());
+ }
+
public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
if (portletContext == null)
@@ -122,12 +165,12 @@
throw new IllegalArgumentException("No null portlet id accepted");
}
String portletId = portletContext.getId();
- PortletContainer container = registry.getPortletContainer(portletId);
- if (container == null)
+ PortletImpl portlet = (PortletImpl)portlets.get(portletId);
+ if (portlet == null)
{
throw new NoSuchPortletException(portletId);
}
- return container;
+ return portlet;
}
public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException, InvocationException
@@ -183,4 +226,40 @@
{
throw new UnsupportedOperationException();
}
+
+ private static class PortletImpl implements Portlet
+ {
+
+ /** . */
+ private final PortletContainer container;
+
+ /** . */
+ private final PortletContext context;
+
+ public PortletImpl(PortletContainer container)
+ {
+ this.container = container;
+ this.context = new PortletContext(container.getApplication().getId() + "." + container.getId());
+ }
+
+ public PortletContext getContext()
+ {
+ return context;
+ }
+
+ public PortletInfo getInfo()
+ {
+ return container.getInfo();
+ }
+
+ public boolean isRemote()
+ {
+ return false;
+ }
+
+ public String toString()
+ {
+ return "Portlet[context=" + context + ",container=" + container + "]";
+ }
+ }
}
\ No newline at end of file
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -1,9 +1,40 @@
+/******************************************************************************
+ * 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.portlet.container;
+/**
+ * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
+ */
public interface PortletContainerRegistryListener {
- void registerPortletContainer(PortletContainer portlet);
+ /**
+ * A portlet container has been registered.
+ */
+ void registerPortletContainer(PortletContainer portletContainer);
- void unregisterPortletContainer(PortletContainer portlet);
+ /**
+ * A portlet container has been unregistered.
+ */
+ void unregisterPortletContainer(PortletContainer portletContainer);
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -45,7 +45,7 @@
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
- PortletContainer container = registry.getPortletContainer("/test-info.CachePortlet");
+ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("CachePortlet");
PortletInfo info = container.getInfo();
CacheInfo cacheInfo = info.getCache();
ExtendedAssert.assertEquals(65, cacheInfo.getExpirationSecs());
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -55,7 +55,7 @@
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
- PortletContainer container = registry.getPortletContainer("/test-info.CapabilitiesPortlet");
+ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("CapabilitiesPortlet");
PortletInfo info = container.getInfo();
CapabilitiesInfo capInfo = info.getCapabilities();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -48,7 +48,7 @@
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
- PortletContainer container = registry.getPortletContainer("/test-info.NoBundlePortlet");
+ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("NoBundlePortlet");
PortletInfo info = container.getInfo();
MetaInfo metaInfo = info.getMeta();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -50,8 +50,8 @@
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
- PortletContainer container1 = registry.getPortletContainer("/test-info.ModePortlet1");
- PortletContainer container2 = registry.getPortletContainer("/test-info.ModePortlet2");
+ PortletContainer container1 = registry.getPortletApplication("/test-info").getPortletContainer("ModePortlet1");
+ PortletContainer container2 = registry.getPortletApplication("/test-info").getPortletContainer("ModePortlet2");
CapabilitiesInfo capaInfo = container1.getInfo().getCapabilities();
//Portlet 1 with VIEW, EDIT, HELP
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -45,7 +45,7 @@
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
//This asserts only .isRemotable() as rest is checked in other tests
- PortletContainer container = (PortletContainer)registry.getPortletContainer("/test-info.RemotablePortlet1");
+ PortletContainer container = (PortletContainer)registry.getPortletApplication("/test-info").getPortletContainer("RemotablePortlet1");
PortletInfo info = container.getInfo();
ExtendedAssert.assertEquals(Boolean.TRUE, info.isRemotable());
@@ -57,11 +57,11 @@
ExtendedAssert.assertNotNull(info.getSecurity());
ExtendedAssert.assertNotNull(info.getSession());
- container = (PortletContainer)registry.getPortletContainer("/test-info.RemotablePortlet2");
+ container = (PortletContainer)registry.getPortletApplication("/test-info").getPortletContainer("RemotablePortlet2");
info = container.getInfo();
ExtendedAssert.assertEquals(Boolean.FALSE, info.isRemotable());
- container = (PortletContainer)registry.getPortletContainer("/test-info.RemotablePortlet3");
+ container = (PortletContainer)registry.getPortletApplication("/test-info").getPortletContainer("RemotablePortlet3");
info = container.getInfo();
ExtendedAssert.assertEquals(Boolean.TRUE, info.isRemotable());
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -50,7 +50,7 @@
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
- PortletContainer container = registry.getPortletContainer("/test-info.PreferenceInfoPortlet");
+ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("PreferenceInfoPortlet");
//
PortletInfo info = container.getInfo();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -48,7 +48,7 @@
{
//This asserts only .isRemotable() as rest is checked in other tests
- PortletContainer container = registry.getPortletContainer("/test-info.SecuredPortlet1");
+ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("SecuredPortlet1");
PortletInfo info = container.getInfo();
SecurityInfo secInfo = info.getSecurity();
@@ -59,7 +59,7 @@
ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE));
- container = registry.getPortletContainer("/test-info.SecuredPortlet2");
+ container = registry.getPortletApplication("/test-info").getPortletContainer("SecuredPortlet2");
info = container.getInfo();
secInfo = info.getSecurity();
@@ -69,7 +69,7 @@
ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE));
- container = registry.getPortletContainer("/test-info.SecuredPortlet3");
+ container = registry.getPortletApplication("/test-info").getPortletContainer("SecuredPortlet3");
info = container.getInfo();
secInfo = info.getSecurity();
ExtendedAssert.assertEquals(2, secInfo.getTransportGuarantees().size());
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2006-11-20 19:27:48 UTC (rev 5688)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2006-11-20 20:34:51 UTC (rev 5689)
@@ -45,7 +45,7 @@
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
- PortletContainer container = registry.getPortletContainer("/test-info.DistributedPortlet1");
+ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("DistributedPortlet1");
PortletInfo info = container.getInfo();
SessionInfo sessionInfo = info.getSession();
ExtendedAssert.assertNotNull(sessionInfo);
@@ -53,7 +53,7 @@
ExtendedAssert.assertEquals(Boolean.TRUE, distributed);
- container = registry.getPortletContainer("/test-info.DistributedPortlet2");
+ container = registry.getPortletApplication("/test-info").getPortletContainer("DistributedPortlet2");
info = container.getInfo();
sessionInfo = info.getSession();
ExtendedAssert.assertNotNull(sessionInfo);
More information about the jboss-svn-commits
mailing list