[portal-commits] JBoss Portal SVN: r10337 - branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet and 23 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-03-19 17:46:37 -0400 (Wed, 19 Mar 2008) New Revision: 10337 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/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/metadata/TestRenderSetMetaData.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/render/RendererContext.java branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPRequestContext.java modules/common/trunk/.classpath modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ContentInfo.java modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MarkupInfo.java modules/portlet/trunk/.classpath Log: Use new MediaType 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-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,8 +23,8 @@ package org.jboss.portal.core.admin.ui; import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.IteratorStatus; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.core.impl.model.content.ContentProviderRegistryService; import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; @@ -170,7 +170,7 @@ public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - return portlet.getInfo().getCapabilities().getModes("text/html"); + return portlet.getInfo().getCapabilities().getModes(MediaType.TEXT_HTML); } }); portletDecorator.setProperty("windowStates", new AbstractPropertyDecorator(Set.class) @@ -178,7 +178,7 @@ public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - return portlet.getInfo().getCapabilities().getWindowStates("text/html"); + return portlet.getInfo().getCapabilities().getWindowStates(MediaType.TEXT_HTML); } }); portletDecorator.setProperty("locales", new AbstractPropertyDecorator(Set.class) @@ -392,7 +392,7 @@ for (Iterator i = renderSets.iterator(); i.hasNext();) { ServerRegistrationID renderSetId = (ServerRegistrationID)i.next(); - PortalRenderSet renderSet = layoutService.getRenderSet(renderSetId, MediaType.HTML); + PortalRenderSet renderSet = layoutService.getRenderSet(renderSetId, MediaType.TEXT_HTML); if (renderSet != null) { names.put(renderSet.getName(), renderSet.getName()); Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -26,9 +26,9 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.EmptyAttributeResolver; import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.text.FastURLEncoder; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.Portlet; @@ -155,7 +155,7 @@ StateString navigationalState, StateString interactionState) throws PortletInvokerException { - PortletInvocationContext portletInvocationContext = new JSFPortletInvocationContext(clientRequest, clientResponse, new MarkupInfo(MediaType.HTML, "UTF-8"), navigationalState, this); + PortletInvocationContext portletInvocationContext = new JSFPortletInvocationContext(clientRequest, clientResponse, new MarkupInfo(MediaType.TEXT_HTML, "UTF-8"), navigationalState, this); // PortletInvocation action = new ActionInvocation(portletInvocationContext); @@ -171,7 +171,7 @@ ParameterMap navState) throws PortletInvokerException { - PortletInvocationContext portletInvocationContext = new JSFPortletInvocationContext(clientRequest, clientResponse, new MarkupInfo(MediaType.HTML, "UTF-8"), null, this); + PortletInvocationContext portletInvocationContext = new JSFPortletInvocationContext(clientRequest, clientResponse, new MarkupInfo(MediaType.TEXT_HTML, "UTF-8"), null, this); // PortletInvocation render = new RenderInvocation(portletInvocationContext); Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -24,7 +24,7 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.portlet.container.PortletContainerInvoker; +import org.jboss.portal.portlet.container.ContainerPortletInvoker; import org.jboss.portal.portlet.deployment.jboss.info.SessionInfo; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.PortletInterceptor; @@ -42,7 +42,7 @@ { protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); PortletInfo portletInfo = container.getInfo(); SessionInfo sessionInfo = portletInfo.getAttachment(SessionInfo.class); Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -26,7 +26,7 @@ import org.jboss.portal.common.io.IOTools; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.portlet.container.PortletContainerInvoker; +import org.jboss.portal.portlet.container.ContainerPortletInvoker; import org.jboss.portal.portlet.container.managed.LifeCycleStatus; import org.jboss.portal.portlet.container.managed.ManagedObject; import org.jboss.portal.portlet.container.managed.ManagedObjectEvent; @@ -230,11 +230,11 @@ // if (status == LifeCycleStatus.STARTED) { - ((PortletContainerInvoker)portletContainerInvoker).addPortletContainer(portletContainer); + ((ContainerPortletInvoker)portletContainerInvoker).addPortletContainer(portletContainer); } else { - ((PortletContainerInvoker)portletContainerInvoker).removePortletContainer(portletContainer); + ((ContainerPortletInvoker)portletContainerInvoker).removePortletContainer(portletContainer); } } } Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,9 +23,9 @@ package org.jboss.portal.server.aspects.server; import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.ContentInfo; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.server.ServerException; import org.jboss.portal.server.ServerInterceptor; import org.jboss.portal.server.ServerInvocation; @@ -60,7 +60,7 @@ } // Configure the stream info - ContentInfo info = new MarkupInfo(MediaType.HTML, "UTF-8"); + ContentInfo info = new MarkupInfo(MediaType.TEXT_HTML, "UTF-8"); ServerResponse resp = invocation.getResponse(); resp.setContentInfo(info); Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -25,9 +25,9 @@ import org.apache.log4j.Logger; import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.IteratorStatus; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.test.framework.driver.DriverCommand; import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.TestDriverException; @@ -150,7 +150,7 @@ servletContainerFactory = (ServletContainerFactory)MBeanProxy.get(ServletContainerContext.class, new ObjectName("portal:service=ServletContainerFactory"), mbeanServer); layoutService = (LayoutService)MBeanProxy.get(LayoutService.class, new ObjectName("portal:service=LayoutService"), mbeanServer); themeService = (ThemeService)MBeanProxy.get(ThemeService.class, new ObjectName("portal:service=ThemeService"), mbeanServer); - renderSet = layoutService.getRenderSet("testRenderer", MediaType.HTML); + renderSet = layoutService.getRenderSet("testRenderer", MediaType.TEXT_HTML); layout = layoutService.getLayout("generic", true); theme = themeService.getTheme("testTheme", true); @@ -249,7 +249,7 @@ private void handleAsync(RequestContext requestContext) throws RenderException, IOException { - MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "UTF-8"); + MarkupInfo markupInfo = new MarkupInfo(MediaType.TEXT_HTML, "UTF-8"); ServletContextDispatcher dispatcher = new ServletContextDispatcher(requestContext.request, requestContext.response, servletContainerFactory.getServletContainer()); ThemeContext themeContext = new ThemeContext(theme, themeService); @@ -290,7 +290,7 @@ { requestContext.response.setContentType("text/html"); - MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "UTF-8"); + MarkupInfo markupInfo = new MarkupInfo(MediaType.TEXT_HTML, "UTF-8"); ServletContextDispatcher dispatcher = new ServletContextDispatcher(requestContext.request, requestContext.response, servletContainerFactory.getServletContainer()); ThemeContext themeContext = new ThemeContext(theme, themeService); Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestLayoutServiceImpl.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,9 +23,10 @@ package org.jboss.portal.test.theme.tmp; import junit.framework.TestCase; + +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.CLResourceLoader; import org.jboss.portal.common.util.LoaderResource; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.theme.LayoutException; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.PortalRenderSet; @@ -170,16 +171,16 @@ public void testCreateRenderSets() { - PortalRenderSet renderSet = layoutService.getRenderSet("divRenderer", MediaType.HTML); + PortalRenderSet renderSet = layoutService.getRenderSet("divRenderer", MediaType.TEXT_HTML); assertEquals(renderSet.getName(), "divRenderer"); - renderSet = layoutService.getRenderSet("emptyRenderer", MediaType.HTML); + renderSet = layoutService.getRenderSet("emptyRenderer", MediaType.TEXT_HTML); assertEquals(renderSet.getName(), "emptyRenderer"); } public void testGetRenderSetInfos() throws Exception { - PortalRenderSet renderSet = layoutService.getRenderSet("divRenderer", MediaType.HTML); + PortalRenderSet renderSet = layoutService.getRenderSet("divRenderer", MediaType.TEXT_HTML); assertEquals(renderSet.getName(), "divRenderer"); assertTrue(renderSet.isAjaxEnabled()); assertEquals(renderSet.getDecorationRenderer().getClass(), new DynaDecorationRenderer(new DivDecorationRenderer()).getClass()); @@ -187,7 +188,7 @@ assertEquals(renderSet.getRegionRenderer().getClass(), new DynaRegionRenderer(new DivRegionRenderer()).getClass()); assertEquals(renderSet.getWindowRenderer().getClass(), new DynaWindowRenderer(new DivWindowRenderer()).getClass()); - renderSet = layoutService.getRenderSet("emptyRenderer", MediaType.HTML); + renderSet = layoutService.getRenderSet("emptyRenderer", MediaType.TEXT_HTML); assertEquals(renderSet.getName(), "emptyRenderer"); assertFalse(renderSet.isAjaxEnabled()); assertEquals(renderSet.getDecorationRenderer().getClass(), new EmptyDecorationRenderer().getClass()); @@ -198,9 +199,9 @@ public void testRemoveRenderSets() throws LayoutException { - assertNotNull(layoutService.getRenderSet("divRenderer", MediaType.HTML)); + assertNotNull(layoutService.getRenderSet("divRenderer", MediaType.TEXT_HTML)); ServerRegistrationID id = ServerRegistrationID.createPortalLayoutID(runtimeContext.getAppId(), "divRenderer"); layoutService.removeRenderSets(id.getName(0)); - assertNull(layoutService.getRenderSet("divRenderer", MediaType.HTML)); + assertNull(layoutService.getRenderSet("divRenderer", MediaType.TEXT_HTML)); } } Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/metadata/TestRenderSetMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/metadata/TestRenderSetMetaData.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/metadata/TestRenderSetMetaData.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,7 +23,10 @@ package org.jboss.portal.test.theme.tmp.metadata; import junit.framework.TestCase; -import org.jboss.portal.common.util.MediaType; + +import org.jboss.portal.common.net.media.MediaType; +import org.jboss.portal.common.net.media.SubtypeDef; +import org.jboss.portal.common.net.media.TypeDef; import org.jboss.portal.theme.deployment.jboss.RenderSetMetaDataFactory; import org.jboss.portal.theme.metadata.RenderSetMetaData; import org.jboss.portal.theme.metadata.RendererSetMetaData; @@ -102,7 +105,7 @@ assertNotNull(renderSetMD.getRendererSet()); assertTrue(renderSetMD.getRendererSet().size() == 1); RendererSetMetaData rendererSetMD = (RendererSetMetaData)renderSetMD.getRendererSet().get(0); - assertEquals(MediaType.HTML, rendererSetMD.getContentType()); + assertEquals(MediaType.TEXT_HTML, rendererSetMD.getMediaType()); assertEquals("DivPortletRenderer", rendererSetMD.getPortletRenderer()); renderSetMD = (RenderSetMetaData)setList.get(1); @@ -111,11 +114,11 @@ assertTrue(renderSetMD.getRendererSet().size() == 2); rendererSetMD = (RendererSetMetaData)renderSetMD.getRendererSet().get(0); - assertEquals(MediaType.HTML, rendererSetMD.getContentType()); + assertEquals(MediaType.TEXT_HTML, rendererSetMD.getMediaType()); assertEquals("EmptyPortletRendererHTML", rendererSetMD.getPortletRenderer()); rendererSetMD = (RendererSetMetaData)renderSetMD.getRendererSet().get(1); - assertEquals(MediaType.XHTML, rendererSetMD.getContentType()); + assertEquals(MediaType.TEXT_HTML, rendererSetMD.getMediaType()); assertEquals("EmptyDecorationRendererXHTML", rendererSetMD.getDecorationRenderer()); } catch (Exception e) Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -22,10 +22,11 @@ package org.jboss.portal.test.theme.tmp.render; import junit.framework.TestCase; + +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.CLResourceLoader; import org.jboss.portal.common.util.LoaderResource; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.server.ServerRequest; import org.jboss.portal.test.theme.tmp.TestHelper; import org.jboss.portal.theme.LayoutService; @@ -106,7 +107,7 @@ RenderSetMetaData renderSetMD = (RenderSetMetaData)i.next(); layoutService.addRenderSet(runtimeContext, renderSetMD); } - renderSet = layoutService.getRenderSet("divRenderer", MediaType.HTML); + renderSet = layoutService.getRenderSet("divRenderer", MediaType.TEXT_HTML); res = new CLResourceLoader().getResource("xml/portal-themes.xml"); unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); @@ -132,7 +133,7 @@ portalProps.put(ThemeConstants.PORTAL_PROP_RENDERSET, renderSet.getName()); // - MarkupInfo streamInfo = new MarkupInfo(MediaType.HTML, "utf-8"); + MarkupInfo streamInfo = new MarkupInfo(MediaType.TEXT_HTML, "utf-8"); ServerRequest serverRequest = TestHelper.createServerRequest(); // pageresult obj Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,8 +23,8 @@ package org.jboss.portal.theme; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.ContentInfo; -import org.jboss.portal.common.util.MediaType; import java.util.Collection; Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/PortalRenderSet.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.theme; -import org.jboss.portal.common.util.MediaType; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.theme.impl.render.dynamic.DynaDecorationRenderer; import org.jboss.portal.theme.impl.render.dynamic.DynaPortletRenderer; import org.jboss.portal.theme.impl.render.dynamic.DynaRegionRenderer; @@ -49,7 +49,7 @@ private final WindowRenderer windowRenderer; private final PortletRenderer portletRenderer; private final DecorationRenderer decorationRenderer; - private final MediaType contentType; + private final MediaType mediaType; private final String appID; private final String name; private final ServerRegistrationID registrationId; @@ -83,7 +83,7 @@ this.name = renderSetName; this.appID = runtimeContext.getAppId(); this.registrationId = ServerRegistrationID.createID(ServerRegistrationID.TYPE_RENDERSET, new String[]{appID, name}); - this.contentType = rendererSetMD.getContentType(); + this.mediaType = rendererSetMD.getMediaType(); this.ajaxEnabled = rendererSetMD.isAjaxEnabled(); if (ajaxEnabled) // wrap the current renderer with the ajax delegator one. @@ -110,7 +110,7 @@ /** @see PortalRenderSet#getMediaType */ public MediaType getMediaType() { - return contentType; + return mediaType; } /** Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.theme.deployment.jboss; -import org.jboss.portal.common.util.MediaType; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.theme.metadata.RenderSetMetaData; import org.jboss.portal.theme.metadata.RendererSetMetaData; import org.jboss.xb.binding.ObjectModelFactory; @@ -72,7 +72,7 @@ { RendererSetMetaData rendererSet = new RendererSetMetaData(); String contentType = attrs.getValue("content-type"); - rendererSet.setContentType(MediaType.parseMimeType(contentType)); + rendererSet.setMediaType(MediaType.create(contentType)); return rendererSet; } return null; Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,8 +23,8 @@ package org.jboss.portal.theme.impl; import org.jboss.logging.Logger; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.ContentInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.theme.LayoutException; import org.jboss.portal.theme.LayoutInfo; @@ -477,7 +477,7 @@ { throw new IllegalArgumentException("No null arguments allowed [" + info + "] [" + renderSetName + "] [" + streamInfo + "]"); } - MediaType contentType = streamInfo.getContentType(); - return getRenderSet(renderSetName, contentType); + MediaType mediaType = streamInfo.getMediaType(); + return getRenderSet(renderSetName, mediaType); } } Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/RendererFactoryImpl.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -120,7 +120,7 @@ // if (renderSetName != null) { - PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getContentType()); + PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getMediaType()); // if (renderSet != null) @@ -160,7 +160,7 @@ // if (renderSetName != null) { - PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getContentType()); + PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getMediaType()); // if (renderSet != null) @@ -201,7 +201,7 @@ // if (renderSetName != null) { - PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getContentType()); + PortalRenderSet renderSet = layoutServiceInfo.getRenderSet(renderSetName, rendererContext.getMediaType()); // if (renderSet != null) Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.theme.metadata; -import org.jboss.portal.common.util.MediaType; +import org.jboss.portal.common.net.media.MediaType; /** * Meta data describing a render set. <p/> exmaple of a render set descriptor: <p/> <portal-renderSet> <renderSet @@ -42,21 +42,21 @@ */ public class RendererSetMetaData { - private MediaType contentType; + private MediaType mediaType; private String regionRenderer; private String windowRenderer; private String decorationRenderer; private String portletRenderer; private boolean ajaxEnabled; - public MediaType getContentType() + public MediaType getMediaType() { - return contentType; + return mediaType; } - public void setContentType(MediaType contentType) + public void setMediaType(MediaType mediaType) { - this.contentType = contentType; + this.mediaType = mediaType; } public String getRegionRenderer() Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/render/RendererContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/render/RendererContext.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/render/RendererContext.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.theme.render; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.theme.render.renderer.DecorationRenderer; import org.jboss.portal.theme.render.renderer.DecorationRendererContext; import org.jboss.portal.theme.render.renderer.PageRenderer; @@ -121,9 +121,9 @@ return markupInfo; } - public MediaType getContentType() + public MediaType getMediaType() { - return markupInfo.getContentType(); + return markupInfo.getMediaType(); } public String getCharset() Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -30,11 +30,13 @@ import java.io.Serializable; +import org.jboss.portal.common.net.media.MediaType; + public class MarkupContext implements Serializable { protected java.lang.Boolean useCachedMarkup; - protected java.lang.String mimeType; + protected String mediaType; protected java.lang.String markupString; protected byte[] markupBinary; protected java.lang.String locale; @@ -47,10 +49,10 @@ { } - public MarkupContext(java.lang.Boolean useCachedMarkup, java.lang.String mimeType, java.lang.String markupString, byte[] markupBinary, java.lang.String locale, java.lang.Boolean requiresUrlRewriting, org.jboss.portal.wsrp.core.CacheControl cacheControl, java.lang.String preferredTitle, org.jboss.portal.wsrp.core.Extension[] extensions) + public MarkupContext(java.lang.Boolean useCachedMarkup, String mediaType, java.lang.String markupString, byte[] markupBinary, java.lang.String locale, java.lang.Boolean requiresUrlRewriting, org.jboss.portal.wsrp.core.CacheControl cacheControl, java.lang.String preferredTitle, org.jboss.portal.wsrp.core.Extension[] extensions) { this.useCachedMarkup = useCachedMarkup; - this.mimeType = mimeType; + this.mediaType = mediaType; this.markupString = markupString; this.markupBinary = markupBinary; this.locale = locale; @@ -70,14 +72,14 @@ this.useCachedMarkup = useCachedMarkup; } - public java.lang.String getMimeType() + public String getMediaType() { - return mimeType; + return mediaType; } - public void setMimeType(java.lang.String mimeType) + public void setMimeType(String mediaType) { - this.mimeType = mimeType; + this.mediaType = mediaType; } public java.lang.String getMarkupString() Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -30,10 +30,12 @@ import java.io.Serializable; +import org.jboss.portal.common.net.media.MediaType; + public class MarkupType implements Serializable { - protected java.lang.String mimeType; + protected MediaType mediaType; protected java.lang.String[] modes; protected java.lang.String[] windowStates; protected java.lang.String[] locales; @@ -43,23 +45,23 @@ { } - public MarkupType(java.lang.String mimeType, java.lang.String[] modes, java.lang.String[] windowStates, java.lang.String[] locales, org.jboss.portal.wsrp.core.Extension[] extensions) + public MarkupType(MediaType mediaType, java.lang.String[] modes, java.lang.String[] windowStates, java.lang.String[] locales, org.jboss.portal.wsrp.core.Extension[] extensions) { - this.mimeType = mimeType; + this.mediaType = mediaType; this.modes = modes; this.windowStates = windowStates; this.locales = locales; this.extensions = extensions; } - public java.lang.String getMimeType() + public MediaType getMediaType() { - return mimeType; + return mediaType; } - public void setMimeType(java.lang.String mimeType) + public void setMediaType(MediaType mediaType) { - this.mimeType = mimeType; + this.mediaType = mediaType; } public java.lang.String[] getModes() Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.WSRPUtils; import org.jboss.portal.wsrp.core.AccessDeniedFault; @@ -87,7 +88,7 @@ WSRPUtils.getJSR168WindowStateFromWSRPName(markupParams.getWindowState()), markupParams.getNavigationalState(), getMarkup); - MarkupContext markupContext = WSRPTypeFactory.createMarkupContext("text/html", markupString); + MarkupContext markupContext = WSRPTypeFactory.createMarkupContext(MediaType.TEXT_HTML.getValue(), markupString); markupContext.setRequiresUrlRewriting(Boolean.TRUE); MarkupResponse markupResponse = WSRPTypeFactory.createMarkupResponse(markupContext); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,6 +23,7 @@ package org.jboss.portal.test.wsrp.framework; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.test.wsrp.framework.support.ServiceObjectFactory; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.core.LocalizedString; @@ -59,7 +60,7 @@ { PortletDescription portletDesc = new PortletDescription(); portletDesc.setPortletHandle(portletHandle); - portletDesc.setMarkupTypes(new MarkupType[]{new MarkupType("text/html", new String[]{WSRPConstants.VIEW_MODE}, + portletDesc.setMarkupTypes(new MarkupType[]{new MarkupType(MediaType.TEXT_HTML, new String[]{WSRPConstants.VIEW_MODE}, new String[]{WSRPConstants.NORMAL_WINDOW_STATE}, WSRPConstants.DEFAULT_LOCALES, null)}); String suffixString = suffix == null ? "" : suffix; Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -24,8 +24,8 @@ package org.jboss.portal.test.wsrp.framework.support; import org.jboss.portal.common.invocation.resolver.RequestAttributeResolver; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.StateString; @@ -56,7 +56,7 @@ public TestPortletInvocationContext() { - super(new MarkupInfo(MediaType.HTML, WSRPConstants.DEFAULT_CHARACTER_SET)); + super(new MarkupInfo(MediaType.TEXT_HTML, WSRPConstants.DEFAULT_CHARACTER_SET)); ClassLoader classLoader = getClass().getClassLoader(); HttpSession session = (HttpSession)Proxy.newProxyInstance(classLoader, new Class[]{HttpSession.class}, Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -600,7 +600,7 @@ // Markup context MarkupContext markupContext = response.getMarkupContext(); ExtendedAssert.assertNotNull(markupContext); - ExtendedAssert.assertEquals("text/html", markupContext.getMimeType()); + ExtendedAssert.assertEquals("text/html", markupContext.getMediaType()); ExtendedAssert.assertEquals("title", markupContext.getPreferredTitle()); ExtendedAssert.assertTrue(markupContext.getRequiresUrlRewriting().booleanValue()); ExtendedAssert.assertEquals(markupString, markupContext.getMarkupString()); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -24,6 +24,7 @@ package org.jboss.portal.test.wsrp.v1.producer; import org.jboss.portal.common.junit.ExtendedAssert; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.registration.RegistrationException; import org.jboss.portal.registration.RegistrationManager; import org.jboss.portal.registration.policies.DefaultRegistrationPolicy; @@ -125,7 +126,7 @@ MarkupType[] markupTypes = desc.getMarkupTypes(); ExtendedAssert.assertEquals(1, markupTypes.length); MarkupType markupType = markupTypes[0]; - assertEquals(new MarkupType("text/html", new String[]{WSRPConstants.VIEW_MODE}, + assertEquals(new MarkupType(MediaType.TEXT_HTML, new String[]{WSRPConstants.VIEW_MODE}, new String[]{WSRPConstants.NORMAL_WINDOW_STATE, WSRPConstants.MAXIMIZED_WINDOW_STATE, WSRPConstants.MINIMIZED_WINDOW_STATE}, new String[]{"en"}, null), markupType); } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.ActionURL; @@ -454,14 +455,14 @@ * * @return */ - public static MarkupContext createMarkupContext(String mimeType, String markupString) + public static MarkupContext createMarkupContext(String mediaType, String markupString) { - ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(mimeType, "MIME type", "MarkupContext"); + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(mediaType, "Media type", "MarkupContext"); if (markupString == null) { throw new IllegalArgumentException("MarkupContext requires either a non-null markup string or binary markup."); } - return new MarkupContext(Boolean.FALSE, mimeType, markupString, null, null, Boolean.FALSE, null, null, null); + return new MarkupContext(Boolean.FALSE, mediaType, markupString, null, null, Boolean.FALSE, null, null, null); } /** @@ -476,14 +477,14 @@ * response message. * @return a new MarkupContext */ - public static MarkupContext createMarkupContext(String mimeType, byte[] markupBinary) + public static MarkupContext createMarkupContext(String mediaType, byte[] markupBinary) { - ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(mimeType, "MIME type", "MarkupContext"); + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(mediaType, "MIME type", "MarkupContext"); if (markupBinary == null || markupBinary.length == 0) { throw new IllegalArgumentException("MarkupContext requires either a non-null markup string or binary markup."); } - return new MarkupContext(Boolean.FALSE, mimeType, null, markupBinary, null, Boolean.FALSE, null, null, null); + return new MarkupContext(Boolean.FALSE, mediaType, null, markupBinary, null, Boolean.FALSE, null, null, null); } /** Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -118,7 +118,7 @@ // todo: need to deal with binary } - String mimeType = markupContext.getMimeType(); + String mimeType = markupContext.getMediaType(); if (mimeType == null || mimeType.length() == 0) { return new ErrorResponse(new IllegalArgumentException("No MIME type was provided for portlet content.")); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -111,7 +111,7 @@ markupParams = WSRPTypeFactory.createMarkupParams(securityContext.isSecure(), WSRPUtils.convertLocalesToRFC3066LanguageTagArray(userContext.getLocales()), - new String[]{streamInfo.getContentType().toString()}, mode, windowState); + new String[]{streamInfo.getMediaType().toString()}, mode, windowState); String userAgent = WSRPConsumerImpl.getHttpRequest(invocation).getHeader(USER_AGENT); markupParams.setClientData(WSRPTypeFactory.createClientData(userAgent)); StateString navigationalState = invocation.getNavigationalState(); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.portlet.info.CacheInfo; import org.jboss.portal.portlet.info.CapabilitiesInfo; @@ -105,7 +106,7 @@ groupId = other.groupId; // should be duplicate group id? WSRPCapabilitiesInfo otherCapabilities = (WSRPCapabilitiesInfo)other.getCapabilities(); - capabilities = new WSRPCapabilitiesInfo(new HashMap(otherCapabilities.mimeTypes), + capabilities = new WSRPCapabilitiesInfo(new HashMap(otherCapabilities.mediaTypes), new HashSet(otherCapabilities.modes), new HashSet(otherCapabilities.windowStates), new HashSet(otherCapabilities.locales)); @@ -272,20 +273,20 @@ private void createCapabilitiesInfo(PortletDescription portletDescription) { final MarkupType[] markupTypes = portletDescription.getMarkupTypes(); - final Map mimeTypes = new HashMap(markupTypes.length); + final Map<MediaType, MediaTypeInfo> mediaTypes = new HashMap<MediaType, MediaTypeInfo>(markupTypes.length); capabilities = new WSRPCapabilitiesInfo(); for (MarkupType markupType : markupTypes) { - String mimeType = markupType.getMimeType(); - MIMETypeInfo mimeTypeInfo = new MIMETypeInfo(markupType); - mimeTypes.put(mimeType, mimeTypeInfo); - capabilities.addModes(mimeTypeInfo.modes); - capabilities.addWindowStates(mimeTypeInfo.windowStates); - capabilities.addLocales(mimeTypeInfo.locales); + MediaType mediaType = markupType.getMediaType(); + MediaTypeInfo mediaTypeInfo = new MediaTypeInfo(markupType); + mediaTypes.put(mediaType, mediaTypeInfo); + capabilities.addModes(mediaTypeInfo.modes); + capabilities.addWindowStates(mediaTypeInfo.windowStates); + capabilities.addLocales(mediaTypeInfo.locales); } - capabilities.setMimeTypes(mimeTypes); + capabilities.setMediaTypes(mediaTypes); } private void createMetaInfo(PortletDescription portletDescription) @@ -337,11 +338,11 @@ return null; } - class MIMETypeInfo + class MediaTypeInfo { - public MIMETypeInfo(MarkupType markupType) + public MediaTypeInfo(MarkupType markupType) { - mimeType = markupType.getMimeType(); + mimeType = markupType.getMediaType(); String[] modeNames = markupType.getModes(); modes = new HashSet(modeNames.length); @@ -374,7 +375,7 @@ } } - String mimeType; + MediaType mimeType; Set modes; Set windowStates; Set locales; @@ -432,7 +433,7 @@ private class WSRPCapabilitiesInfo implements CapabilitiesInfo { - private Map mimeTypes; + private Map mediaTypes; private Set modes; private Set windowStates; private Set locales; @@ -441,22 +442,22 @@ { } - private void setMimeTypes(Map mimeTypes) + private void setMediaTypes(Map mediaTypes) { - this.mimeTypes = mimeTypes; + this.mediaTypes = mediaTypes; } - public WSRPCapabilitiesInfo(Map mimeTypes, Set modes, Set windowStates, Set locales) + public WSRPCapabilitiesInfo(Map mediaTypes, Set modes, Set windowStates, Set locales) { - this.mimeTypes = mimeTypes; + this.mediaTypes = mediaTypes; this.modes = modes; this.windowStates = windowStates; this.locales = locales; } - public Set getMimeTypes() + public Set getMediaTypes() { - return mimeTypes.keySet(); + return mediaTypes.keySet(); } public Set getAllModes() @@ -464,9 +465,9 @@ return modes; } - public Set getModes(String mimeType) + public Set getModes(MediaType mediaType) { - MIMETypeInfo mimeTypeInfo = (MIMETypeInfo)mimeTypes.get(mimeType); + MediaTypeInfo mimeTypeInfo = (MediaTypeInfo)mediaTypes.get(mediaType); if (mimeTypeInfo == null) { return Collections.EMPTY_SET; @@ -480,9 +481,9 @@ return windowStates; } - public Set getWindowStates(String mimeType) + public Set getWindowStates(MediaType mediaType) { - MIMETypeInfo mimeTypeInfo = (MIMETypeInfo)mimeTypes.get(mimeType); + MediaTypeInfo mimeTypeInfo = (MediaTypeInfo)mediaTypes.get(mediaType); if (mimeTypeInfo == null) { return Collections.EMPTY_SET; @@ -496,9 +497,9 @@ return locales; } - public Set getLocales(String mimeType) + public Set getLocales(MediaType mediaType) { - MIMETypeInfo mimeTypeInfo = (MIMETypeInfo)mimeTypes.get(mimeType); + MediaTypeInfo mimeTypeInfo = (MediaTypeInfo)mediaTypes.get(mediaType); if (mimeTypeInfo == null) { return Collections.EMPTY_SET; Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.wsrp.WSRPUtils; import org.jboss.portal.wsrp.core.MarkupType; @@ -57,14 +58,14 @@ this.portlet = portlet; } - public String getMimeTypeWithCharset() + public String getMediaTypeWithCharset() { - return getMimeType() + CHARSET_SEPARATOR + getCharacterSet(); + return getMediaType() + CHARSET_SEPARATOR + getCharacterSet(); } - public String getMimeType() + public String getMediaType() { - return markupType.getMimeType(); + return markupType.getMediaType().getValue(); } public String getLocale() Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -130,11 +130,11 @@ MarkupContext markupContext; if (markupString != null) { - markupContext = WSRPTypeFactory.createMarkupContext(markupRequest.getMimeType(), markupString); + markupContext = WSRPTypeFactory.createMarkupContext(markupRequest.getMediaType(), markupString); } else { - markupContext = WSRPTypeFactory.createMarkupContext(markupRequest.getMimeTypeWithCharset(), markupBinary); + markupContext = WSRPTypeFactory.createMarkupContext(markupRequest.getMediaTypeWithCharset(), markupBinary); } markupContext.setLocale(markupRequest.getLocale()); markupContext.setRequiresUrlRewriting(Boolean.TRUE); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -25,8 +25,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.OpaqueStateString; import org.jboss.portal.portlet.Portlet; @@ -197,7 +197,7 @@ String desiredMIMEType = desiredMIMETypes[i]; for (int j = 0; j < markupTypes.length; j++) { - if (desiredMIMEType.equalsIgnoreCase(markupTypes[j].getMimeType())) + if (desiredMIMEType.equals(markupTypes[j].getMediaType())) { markupType = markupTypes[j]; break; @@ -404,9 +404,9 @@ MarkupInfo markupInfo; try { - markupInfo = new MarkupInfo(MediaType.parseMimeType(markupRequest.getMimeType()), markupRequest.getCharacterSet()); + markupInfo = new MarkupInfo(MediaType.create(markupRequest.getMediaType()), markupRequest.getCharacterSet()); } - catch (MimeTypeParseException e) + catch (IllegalArgumentException e) { throw WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.UNSUPPORTED_MIME_TYPE, e.getLocalizedMessage(), e); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -23,6 +23,7 @@ package org.jboss.portal.wsrp.producer; +import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -193,12 +194,12 @@ log.debug("Constructing portlet description for: " + id); CapabilitiesInfo capInfo = info.getCapabilities(); - Collection allMimeTypes = capInfo.getMimeTypes(); - MarkupType[] markupTypes = new MarkupType[allMimeTypes.size()]; - Iterator mimeTypes = allMimeTypes.iterator(); - for (int i = 0; mimeTypes.hasNext(); i++) + Collection<MediaType> allMediaTypes = capInfo.getMediaTypes(); + MarkupType[] markupTypes = new MarkupType[allMediaTypes.size()]; + Iterator<MediaType> mediaTypes = allMediaTypes.iterator(); + for (int i = 0; mediaTypes.hasNext(); i++) { - String mimeType = (String)mimeTypes.next(); + MediaType mimeType = (MediaType)mediaTypes.next(); markupTypes[i] = new MarkupType( mimeType, getModeNamesFrom(capInfo.getModes(mimeType)), Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPRequestContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPRequestContext.java 2008-03-19 19:16:51 UTC (rev 10336) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPRequestContext.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -248,7 +248,7 @@ } else { - return new WSRPSimpleRequestContext(markupRequest.getCharacterSet(), markupRequest.getMimeType(), formParams); + return new WSRPSimpleRequestContext(markupRequest.getCharacterSet(), markupRequest.getMediaType(), formParams); } } Modified: modules/common/trunk/.classpath =================================================================== --- modules/common/trunk/.classpath 2008-03-19 19:16:51 UTC (rev 10336) +++ modules/common/trunk/.classpath 2008-03-19 21:46:37 UTC (rev 10337) @@ -3,6 +3,7 @@ <classpathentry kind="src" path="mc/src/main/java"/> <classpathentry kind="src" path="portal/src/main/java"/> <classpathentry kind="src" path="common/src/main/java"/> + <classpathentry kind="src" path="common/src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="output" path="bin"/> Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ContentInfo.java =================================================================== --- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ContentInfo.java 2008-03-19 19:16:51 UTC (rev 10336) +++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ContentInfo.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -34,19 +34,19 @@ { /** The content type. */ - private final MediaType contentType; + private final MediaType mediaType; - public ContentInfo(MediaType contentType) + public ContentInfo(MediaType mediaType) { - if (contentType == null) + if (mediaType == null) { - throw new IllegalArgumentException("Content type cannot be null"); + throw new IllegalArgumentException("Media type cannot be null"); } - this.contentType = contentType; + this.mediaType = mediaType; } - public MediaType getContentType() + public MediaType getMediaType() { - return contentType; + return mediaType; } } Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MarkupInfo.java =================================================================== --- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MarkupInfo.java 2008-03-19 19:16:51 UTC (rev 10336) +++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MarkupInfo.java 2008-03-19 21:46:37 UTC (rev 10337) @@ -36,9 +36,9 @@ /** The charset. */ private final String charset; - public MarkupInfo(MediaType contentType, String charset) + public MarkupInfo(MediaType mediaType, String charset) { - super(contentType); + super(mediaType); // if (charset == null) Modified: modules/portlet/trunk/.classpath =================================================================== --- modules/portlet/trunk/.classpath 2008-03-19 19:16:51 UTC (rev 10336) +++ modules/portlet/trunk/.classpath 2008-03-19 21:46:37 UTC (rev 10337) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="src" path="portlet/src/main/java"/> <classpathentry kind="src" path="bridge/src/main/java"/> <classpathentry kind="src" path="controller/src/main/java"/> @@ -11,5 +10,6 @@ <classpathentry kind="src" path="portlet/src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/home/theute/Java/jdk1.5.0_08/lib/tools.jar"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="output" path="bin"/> </classpath>