Author: julien(a)jboss.com Date: 2007-11-14 14:07:53 -0500 (Wed, 14 Nov 2007) New Revision: 8928 Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java Log: fix more SequenceBuilder migration issues Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr 2007-11-14 19:07:53 UTC (rev 8928) @@ -131,7 +131,7 @@ </component> <component name="MavenBuildProjectComponent"> <option name="mavenExecutable" value="" /> - <option name="Settings File" value="" /> + <option name="Settings File" value="/Users/julien/.m2/settings.xml" /> <option name="mavenCommandLineParams" value="" /> <option name="vmOptions" value="" /> <option name="useMavenEmbedder" value="false" /> Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -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((Set)CollectionBuilder.hashSet().add(WindowState.MAXIMIZED).add(WindowState.MINIMIZED).add(WindowState.NORMAL).get()); /** . */ - 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((Set)CollectionBuilder.hashSet().add(Mode.EDIT).add(Mode.HELP).add(Mode.VIEW).get()); /** . */ private final Set windowStates; Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -45,7 +45,7 @@ public SecurityInfoSupport() { - this(new CollectionBuilder().add(TransportGuarantee.NONE).toHashSet()); + this((Set)CollectionBuilder.hashSet().add(TransportGuarantee.NONE).get()); } public boolean containsTransportGuarantee(TransportGuarantee transportGuarantee) Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -154,7 +154,7 @@ calls.add("2_render"); // - Set expected = new CollectionBuilder().add("0").add("1").add("2_action").add("2_render").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("1").add("2_action").add("2_render").get(); assertEquals(expected, calls); // End test @@ -305,7 +305,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 = (Set)CollectionBuilder.hashSet().add("0").add("2_action").add("2_render").add("3").add("5_action").add("5_render").get(); assertEquals(expected, calls); // Refresh @@ -379,7 +379,7 @@ calls.add("2_render"); // - Set expected = new CollectionBuilder().add("0").add("2_action").add("2_render").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("2_action").add("2_render").get(); assertEquals(expected, calls); // End test Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -153,7 +153,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(CollectionBuilder.hashSet().add("INCLUDE_URL_PATTERN_FILTER").add("INCLUDE_NAMED_FILTER").get(), ServletFilter.ids); // prd = request.getPortletSession().getPortletContext().getNamedDispatcher("NoopServlet"); Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -253,7 +253,7 @@ calls.add("7"); // - Set expected = new CollectionBuilder().add("0").add("3").add("4").add("7").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("3").add("4").add("7").get(); assertEquals(expected, calls); // Refresh Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -217,7 +217,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 = (Set)CollectionBuilder.hashSet().add("0").add("1").add("2").add("5").add("6_render").add("6_action").get(); assertEquals(expected, calls); // Refresh Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -606,7 +606,7 @@ ValueMapAssert.assertEquals(expectedProps, props); // - props = getProperties(popCtx, new CollectionBuilder().add("abc").add("mno").toHashSet()); + props = getProperties(popCtx, (Set)CollectionBuilder.linkedList().add("abc").add("mno").get()); expectedProps = new SimplePropertyMap(); expectedProps.setProperty("abc", new StringValue("def")); ValueMapAssert.assertEquals(expectedProps, props); @@ -639,7 +639,7 @@ ValueMapAssert.assertEquals(expectedProps, props); // - props = getProperties(ccpCtx, new CollectionBuilder().add("abc").add("mno").add("yz").toHashSet()); + props = getProperties(ccpCtx, (Set)CollectionBuilder.hashSet().add("abc").add("mno").add("yz").get()); expectedProps = new SimplePropertyMap(); expectedProps.setProperty("abc", new StringValue("_def")); expectedProps.setProperty("mno", new StringValue("pqr")); Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -45,6 +45,7 @@ import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; import org.jboss.beans.metadata.plugins.ThisValueMetaData; +import org.jboss.beans.metadata.spi.ParameterMetaData; import org.apache.log4j.Logger; import javax.servlet.ServletContext; @@ -102,10 +103,10 @@ String portletContainerId = "PortletContainer[" + webApp.getContextPath() + "," + portletMetaData.getName() + "]"; AbstractBeanMetaData bmd = new AbstractBeanMetaData(portletContainerId, PortletContainerImpl.class.getName()); AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData(); - ctormd.setParameters(new CollectionBuilder(). + ctormd.setParameters((List)CollectionBuilder.arrayList(). add(new AbstractParameterMetaData(PortletMetaData.class.getName(), portletMetaData)). add(new AbstractParameterMetaData(JBossPortletMetaData.class.getName(), (Object)null)). - toArrayList()); + get()); bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop")); @@ -118,7 +119,7 @@ applicationinstallmd.setBean(id); applicationinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); applicationinstallmd.setMethodName("addContainer"); - bmd.setInstalls(new CollectionBuilder().add(deployerinstallmd).add(applicationinstallmd).toArrayList()); + bmd.setInstalls((List)CollectionBuilder.arrayList().add(deployerinstallmd).add(applicationinstallmd).get()); AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData(); deployeruninstallmd.setBean("PortletApplicationDeployer"); deployeruninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); @@ -127,7 +128,7 @@ applicationuninstallmd.setBean(id); applicationuninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); applicationuninstallmd.setMethodName("removeContainer"); - bmd.setUninstalls(new CollectionBuilder().add(deployeruninstallmd).add(applicationuninstallmd).toArrayList()); + bmd.setUninstalls((List)CollectionBuilder.arrayList().add(deployeruninstallmd).add(applicationuninstallmd).get()); try { KernelControllerContext portletContainerControllerContext = kernel.getController().install(bmd); @@ -142,13 +143,13 @@ // AbstractBeanMetaData bmd = new AbstractBeanMetaData(id, PortletApplicationImpl.class.getName()); AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData(); - ctormd.setParameters(new CollectionBuilder(). + ctormd.setParameters((List)CollectionBuilder.arrayList(). 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()); + get()); bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop"));