Author: julien(a)jboss.com Date: 2007-11-15 11:58:54 -0500 (Thu, 15 Nov 2007) New Revision: 8952 Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletController.java Log: udpate portlet container trunk to changes in common/web Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -45,7 +45,6 @@ /** Creates an empty parameter set. */ public PortletParameters() { - super(new HashMap()); } /** @@ -58,11 +57,8 @@ * @throws ClassCastException if the map contains a key that is not a string or a value that is not a string * array */ - public PortletParameters(Map parameterMap) throws NullPointerException, ClassCastException, IllegalArgumentException + public PortletParameters(Map<String,String[]> parameterMap) throws NullPointerException, ClassCastException, IllegalArgumentException { - super(new HashMap()); - - // if (parameterMap == null) { throw new IllegalArgumentException("No null map accepted"); @@ -84,47 +80,35 @@ * @throws ClassCastException if the map contains a key that is not a string or a value that is not a string * array */ - public void append(Map params) throws ClassCastException, NullPointerException, IllegalArgumentException + public void append(Map<String, String[]> params) throws ClassCastException, NullPointerException, IllegalArgumentException { - String[] appendedNames = new String[params.size()]; - String[][] appendedValues = new String[params.size()][]; + // Clone + params = new HashMap<String, String[]>(params); - // Unwrap all first and validate so we have the atomic behavior guarantee - int index = 0; - for (Iterator entries = params.entrySet().iterator(); entries.hasNext();) + // + for (Map.Entry<String, String[]> entry : params.entrySet()) { - Map.Entry entry = (Map.Entry)entries.next(); - appendedNames[index] = (String)unwrapKey(entry.getKey()); - appendedValues[index++] = (String[])unwrapValue(entry.getValue()); - } + String[] existingValue = get(entry.getKey()); - // Merge or use appended values - Map delegate = getDelegate(true); - while (--index >= 0) - { - String appendedName = appendedNames[index]; - String[] appendedValue = appendedValues[index]; - - // - String[] value = (String[])delegate.get(appendedName); - if (value != null) + // Perform the appending operation if the entry exist + if (existingValue != null) { - String[] tmp = new String[value.length + appendedValue.length]; - System.arraycopy(value, 0, tmp, 0, value.length); - System.arraycopy(appendedValue, 0, tmp, value.length, appendedValue.length); - appendedValue = tmp; + String[] appendedValue = entry.getValue(); + String[] newValue = new String[existingValue.length + appendedValue.length]; + System.arraycopy(existingValue, 0, newValue, 0, existingValue.length); + System.arraycopy(appendedValue, 0, newValue, existingValue.length, appendedValue.length); + entry.setValue(newValue); } - - // - delegate.put(appendedName, appendedValue); } + + // + putAll(params); } public String toString() { StringBuffer buffer = new StringBuffer("Parameters["); - Map delegate = getDelegate(false); - for (Iterator i = delegate.entrySet().iterator(); i.hasNext();) + for (Iterator i = entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); String name = (String)entry.getKey(); @@ -147,7 +131,7 @@ * Safely wrap the map as a portlet parameters object. If the map is already a portlet parameter object, just return * that object otherwise return a wrapper around the map. */ - public static PortletParameters wrap(Map map) + public static PortletParameters wrap(Map<String, String[]> map) { if (map instanceof PortletParameters) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -25,7 +25,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.Mode; import org.jboss.portal.portlet.spi.PortalContext; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import java.util.Set; import java.util.Map; @@ -39,10 +39,10 @@ { /** . */ - private static final Set ALL_WINDOW_STATES = Collections.unmodifiableSet(new CollectionBuilder().add(WindowState.MAXIMIZED).add(WindowState.MINIMIZED).add(WindowState.NORMAL).toHashSet()); + private static final Set ALL_WINDOW_STATES = Collections.unmodifiableSet(Tools.toSet(WindowState.MAXIMIZED, WindowState.MINIMIZED, WindowState.NORMAL)); /** . */ - private static final Set ALL_MODES = Collections.unmodifiableSet(new CollectionBuilder().add(Mode.EDIT).add(Mode.HELP).add(Mode.VIEW).toHashSet()); + private static final Set ALL_MODES = Collections.unmodifiableSet(Tools.toSet(Mode.EDIT, Mode.HELP, Mode.VIEW)); /** . */ private final Set windowStates; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -32,64 +32,26 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public abstract class AbstractPropertyMap extends TypedMap implements PropertyMap +public class AbstractPropertyMap<IK, IV> extends TypedMap<String, Value, IK, IV> implements PropertyMap { - protected AbstractPropertyMap(MapAccessor accessor) + public AbstractPropertyMap(MapAccessor<IK, IV> mapAccessor, Converter<String, IK> keyConverter, Converter<Value, IV> valueConverter) { - super(accessor); + super(mapAccessor, keyConverter, valueConverter); } - protected AbstractPropertyMap(Map delegate) + public AbstractPropertyMap(Map<IK, IV> map, Converter<String, IK> keyConverter, Converter<Value, IV> valueConverter) { - super(delegate); + super(map, keyConverter, valueConverter); } - /** - * Only accept non null string objects. - * - * @throws ClassCastException if the value is not an instance of string - */ - protected void assertKeyValidity(Object value) - { - if (value instanceof String == false) - { - throw new ClassCastException("Key must be a String"); - } - } - - /** - * Only check are made to the value. The only valid values accepted are non null instance of - * <code>org.jboss.portal.common.value.Value</code>. - * - * @throws NullPointerException if the value is null - * @throws ClassCastException if the value type is not an instance of <code>org.jboss.portal.common.value.Value</code> - */ - protected Object getInternalValue(Object value) - { - if (value == null) - { - throw new NullPointerException("Value must not be null"); - } - if (value instanceof Value == false) - { - throw new ClassCastException("Value must be a Value"); - } - return value; - } - - protected Object getExternalValue(Object value) - { - return value; - } - public Value getProperty(String key) throws IllegalArgumentException { if (key == null) { throw new IllegalArgumentException("No null key accepted"); } - return (Value)get(key); + return get(key); } public void setProperty(String key, Value value) throws IllegalArgumentException Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -30,7 +30,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public interface PropertyMap extends Map +public interface PropertyMap extends Map<String, Value> { /** * Return the value for the given key or null if it does not exist. Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; +import org.jboss.portal.common.value.Value; + import java.util.HashMap; import java.util.Map; import java.io.Serializable; @@ -30,22 +32,54 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public class SimplePropertyMap extends AbstractPropertyMap +public class SimplePropertyMap extends AbstractPropertyMap<String, Value> { + private static final Converter<String, String> KEY_CONVERTER = new Converter<String, String>() + { + protected String getInternal(String s) throws IllegalArgumentException, ClassCastException + { + return s; + } + protected String getExternal(String s) + { + return s; + } + protected boolean equals(String s, String s1) + { + return s.equals(s1); + } + }; + + private static Converter<Value, Value> VALUE_CONVERTER = new Converter<Value, Value>() + { + protected Value getInternal(Value value) throws IllegalArgumentException, ClassCastException + { + return value; + } + protected Value getExternal(Value value) + { + return value; + } + protected boolean equals(Value value, Value value1) + { + return value.equals(value1); + } + }; + public SimplePropertyMap() { - this(new HashMap()); + this(new HashMap<String, Value>()); } public SimplePropertyMap(int size) { - this(new HashMap(size)); + this(new HashMap<String, Value>(size)); } public SimplePropertyMap(PropertyMap that) { - this(new HashMap()); + this(new HashMap<String, Value>()); // if (that == null) @@ -57,8 +91,8 @@ putAll(that); } - public SimplePropertyMap(Map map) + public SimplePropertyMap(Map<String, Value> map) { - super(map); + super(map, KEY_CONVERTER, VALUE_CONVERTER); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.TransportGuarantee; import org.jboss.portal.portlet.info.SecurityInfo; @@ -45,7 +45,7 @@ public SecurityInfoSupport() { - this(new CollectionBuilder().add(TransportGuarantee.NONE).toHashSet()); + this(Tools.toSet(TransportGuarantee.NONE)); } public boolean containsTransportGuarantee(TransportGuarantee transportGuarantee) Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -25,10 +25,9 @@ import org.jboss.portal.unit.JoinPoint; import org.jboss.portal.unit.PortletTestContext; import org.jboss.portal.unit.PortletTestCase; -import org.jboss.portal.unit.PortletTestContext; import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletActionTestAction; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; @@ -111,7 +110,7 @@ calls.add("2_render"); // - Set expected = new CollectionBuilder().add("0").add("2_action").add("2_render").toHashSet(); + Set expected = Tools.toSet("0", "2_action", "2_render"); assertEquals(expected, calls); // End test Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -25,10 +25,9 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.JoinPoint; import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.PortletTestContext; import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletActionTestAction; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; @@ -186,7 +185,7 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException { - Set expected = new CollectionBuilder().add("0").add("2_action").add("2_render").add("3").add("5_action").add("5_render").toHashSet(); + Set expected = Tools.toSet("0", "2_action", "2_render", "3", "5_action", "5_render"); assertEquals(expected, calls); // Refresh Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -25,10 +25,9 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.JoinPoint; import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.PortletTestContext; import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletActionTestAction; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; @@ -103,7 +102,7 @@ calls.add("2_render"); // - Set expected = new CollectionBuilder().add("0").add("1").add("2_action").add("2_render").toHashSet(); + Set expected = Tools.toSet("0", "1", "2_action", "2_render"); assertEquals(expected, calls); // End test Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -26,7 +26,7 @@ import org.jboss.portal.unit.PortletTestContext; import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP2; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.unit.annotations.TestCase; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; @@ -58,7 +58,7 @@ assertNotNull(prd); ServletFilter.ids.clear(); prd.include(request, response); - assertEquals(new CollectionBuilder().add("INCLUDE_URL_PATTERN_FILTER").add("INCLUDE_NAMED_FILTER").toHashSet(), ServletFilter.ids); + assertEquals(Tools.toSet("INCLUDE_URL_PATTERN_FILTER", "INCLUDE_NAMED_FILTER"), ServletFilter.ids); // prd = request.getPortletSession().getPortletContext().getNamedDispatcher("NoopServlet"); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -27,7 +27,7 @@ import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP10; import org.jboss.portal.test.portlet.framework.UTP11; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.unit.annotations.TestCase; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.FailureResponse; @@ -216,7 +216,7 @@ calls.add("7"); // - Set expected = new CollectionBuilder().add("0").add("3").add("4").add("7").toHashSet(); + Set expected = Tools.toSet("0", "3", "4", "7"); assertEquals(expected, calls); // Refresh Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -25,11 +25,9 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.JoinPoint; import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.PortletTestContext; import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletActionTestAction; -import org.jboss.portal.common.util.CollectionBuilder; -import org.jboss.portal.unit.annotations.TestCase; +import org.jboss.portal.common.util.Tools; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.FailureResponse; import org.jboss.unit.driver.response.EndTestResponse; @@ -198,7 +196,7 @@ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException { // - Set expected = new CollectionBuilder().add("0").add("1").add("2").add("5").add("6_render").add("6_action").toHashSet(); + Set expected = Tools.toSet("0", "1", "2", "5", "6_render", "6_action"); assertEquals(expected, calls); // Refresh Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.value.StringValue; import org.jboss.portal.common.value.Value; @@ -630,7 +630,7 @@ ValueMapAssert.assertEquals(expectedProps, props); // - props = getProperties(popCtx, new CollectionBuilder().add("abc").add("mno").toHashSet()); + props = getProperties(popCtx, Tools.toSet("abc", "mno")); expectedProps = new SimplePropertyMap(); expectedProps.setProperty("abc", new StringValue("def")); ValueMapAssert.assertEquals(expectedProps, props); @@ -664,7 +664,7 @@ ValueMapAssert.assertEquals(expectedProps, props); // - props = getProperties(ccpCtx, new CollectionBuilder().add("abc").add("mno").add("yz").toHashSet()); + props = getProperties(ccpCtx, Tools.toSet("abc", "mno", "yz")); expectedProps = new SimplePropertyMap(); expectedProps.setProperty("abc", new StringValue("_def")); expectedProps.setProperty("mno", new StringValue("pqr")); Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -32,7 +32,7 @@ import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; import org.jboss.portal.portlet.metadata.JBossPortletMetaData; import org.jboss.portal.web.WebApp; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.NotYetImplemented; import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; @@ -105,10 +105,7 @@ String portletContainerId = "PortletContainer[" + webApp.getContextPath() + "," + portletMetaData.getName() + "]"; AbstractBeanMetaData bmd = new AbstractBeanMetaData(portletContainerId, PortletContainerImpl.class.getName()); AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData(); - ctormd.setParameters(new CollectionBuilder(). - add(new AbstractParameterMetaData(PortletMetaData.class.getName(), portletMetaData)). - add(new AbstractParameterMetaData(JBossPortletMetaData.class.getName(), (Object)null)). - toArrayList()); + ctormd.setParameters(Tools.toList((ParameterMetaData)new AbstractParameterMetaData(PortletMetaData.class.getName(), portletMetaData), new AbstractParameterMetaData(JBossPortletMetaData.class.getName(), (Object)null))); bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop")); @@ -121,7 +118,7 @@ applicationinstallmd.setBean(id); applicationinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); applicationinstallmd.setMethodName("addContainer"); - bmd.setInstalls(new CollectionBuilder().add(deployerinstallmd).add(applicationinstallmd).toArrayList()); + bmd.setInstalls(Tools.toList((InstallMetaData)deployerinstallmd, applicationinstallmd)); AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData(); deployeruninstallmd.setBean("PortletApplicationDeployer"); deployeruninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); @@ -130,7 +127,7 @@ applicationuninstallmd.setBean(id); applicationuninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); applicationuninstallmd.setMethodName("removeContainer"); - bmd.setUninstalls(new CollectionBuilder().add(deployeruninstallmd).add(applicationuninstallmd).toArrayList()); + bmd.setUninstalls(Tools.toList((InstallMetaData)deployeruninstallmd, applicationuninstallmd)); try { KernelControllerContext portletContainerControllerContext = kernel.getController().install(bmd); @@ -145,13 +142,12 @@ // AbstractBeanMetaData bmd = new AbstractBeanMetaData(id, PortletApplicationImpl.class.getName()); AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData(); - ctormd.setParameters(new CollectionBuilder(). - add(new AbstractParameterMetaData(PortletApplicationMetaData.class.getName(), metaData)). - add(new AbstractParameterMetaData(JBossApplicationMetaData.class.getName(), (Object)null)). - add(new AbstractParameterMetaData(PortletApplicationContext.class.getName(), this)). - add(new AbstractParameterMetaData(PortletAPIFactory.class.getName(), new AbstractDependencyValueMetaData("PortletAPIFactory"))). - add(new AbstractParameterMetaData(PortletInfoFactory.class.getName(), new AbstractDependencyValueMetaData("PortletInfoFactory"))). - toArrayList()); + ctormd.setParameters(Tools.toList( + (ParameterMetaData)new AbstractParameterMetaData(PortletApplicationMetaData.class.getName(), metaData), + new AbstractParameterMetaData(JBossApplicationMetaData.class.getName(), (Object)null), + new AbstractParameterMetaData(PortletApplicationContext.class.getName(), this), + new AbstractParameterMetaData(PortletAPIFactory.class.getName(), new AbstractDependencyValueMetaData("PortletAPIFactory")), + new AbstractParameterMetaData(PortletInfoFactory.class.getName(), new AbstractDependencyValueMetaData("PortletInfoFactory")))); bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop")); Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-11-15 16:35:04 UTC (rev 8951) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-11-15 16:58:54 UTC (rev 8952) @@ -165,7 +165,7 @@ portletNS, MARKUP_INFO, PortletParametersStateString.create(request.queryParameters), - new PortletParameters(request.bodyParameters)); + request.bodyParameters != null ? new PortletParameters(request.bodyParameters) : null); ActionInvocation action = new ActionInvocation(actionContext); //