Author: thomas.heute(a)jboss.com Date: 2008-03-19 20:12:37 -0400 (Wed, 19 Mar 2008) New Revision: 10343 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/MarkupType.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/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/consumer/RenderHandler.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/RequestProcessor.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java Log: Rollbacked changes on generated sources. 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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupContext.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -30,13 +30,11 @@ import java.io.Serializable; -import org.jboss.portal.common.net.media.MediaType; - public class MarkupContext implements Serializable { protected java.lang.Boolean useCachedMarkup; - protected String mediaType; + protected java.lang.String mimeType; protected java.lang.String markupString; protected byte[] markupBinary; protected java.lang.String locale; @@ -49,10 +47,10 @@ { } - 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) + 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) { this.useCachedMarkup = useCachedMarkup; - this.mediaType = mediaType; + this.mimeType = mimeType; this.markupString = markupString; this.markupBinary = markupBinary; this.locale = locale; @@ -72,14 +70,14 @@ this.useCachedMarkup = useCachedMarkup; } - public String getMediaType() + public java.lang.String getMimeType() { - return mediaType; + return mimeType; } - public void setMimeType(String mediaType) + public void setMimeType(java.lang.String mimeType) { - this.mediaType = mediaType; + this.mimeType = mimeType; } 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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/generated/org/jboss/portal/wsrp/core/MarkupType.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -30,12 +30,10 @@ import java.io.Serializable; -import org.jboss.portal.common.net.media.MediaType; - public class MarkupType implements Serializable { - protected MediaType mediaType; + protected java.lang.String mimeType; protected java.lang.String[] modes; protected java.lang.String[] windowStates; protected java.lang.String[] locales; @@ -45,23 +43,23 @@ { } - public MarkupType(MediaType mediaType, java.lang.String[] modes, java.lang.String[] windowStates, java.lang.String[] locales, org.jboss.portal.wsrp.core.Extension[] extensions) + 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) { - this.mediaType = mediaType; + this.mimeType = mimeType; this.modes = modes; this.windowStates = windowStates; this.locales = locales; this.extensions = extensions; } - public MediaType getMediaType() + public java.lang.String getMimeType() { - return mediaType; + return mimeType; } - public void setMediaType(MediaType mediaType) + public void setMimeType(java.lang.String mimeType) { - this.mediaType = mediaType; + this.mimeType = mimeType; } public java.lang.String[] getModes() 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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -60,7 +60,7 @@ { PortletDescription portletDesc = new PortletDescription(); portletDesc.setPortletHandle(portletHandle); - portletDesc.setMarkupTypes(new MarkupType[]{new MarkupType(MediaType.TEXT_HTML, new String[]{WSRPConstants.VIEW_MODE}, + portletDesc.setMarkupTypes(new MarkupType[]{new MarkupType(MediaType.TEXT_HTML.getValue(), 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/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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -600,7 +600,7 @@ // Markup context MarkupContext markupContext = response.getMarkupContext(); ExtendedAssert.assertNotNull(markupContext); - ExtendedAssert.assertEquals("text/html", markupContext.getMediaType()); + ExtendedAssert.assertEquals("text/html", markupContext.getMimeType()); 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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -126,7 +126,7 @@ MarkupType[] markupTypes = desc.getMarkupTypes(); ExtendedAssert.assertEquals(1, markupTypes.length); MarkupType markupType = markupTypes[0]; - assertEquals(new MarkupType(MediaType.TEXT_HTML, new String[]{WSRPConstants.VIEW_MODE}, + assertEquals(new MarkupType(MediaType.TEXT_HTML.getValue(), 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/consumer/RenderHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2008-03-19 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -118,7 +118,7 @@ // todo: need to deal with binary } - String mimeType = markupContext.getMediaType(); + String mimeType = markupContext.getMimeType(); 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/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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -278,7 +278,7 @@ for (MarkupType markupType : markupTypes) { - MediaType mediaType = markupType.getMediaType(); + MediaType mediaType = MediaType.create(markupType.getMimeType()); MediaTypeInfo mediaTypeInfo = new MediaTypeInfo(markupType); mediaTypes.put(mediaType, mediaTypeInfo); capabilities.addModes(mediaTypeInfo.modes); @@ -342,7 +342,7 @@ { public MediaTypeInfo(MarkupType markupType) { - mimeType = markupType.getMediaType(); + mimeType = MediaType.create(markupType.getMimeType()); String[] modeNames = markupType.getModes(); modes = new HashSet(modeNames.length); 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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -25,7 +25,6 @@ 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; @@ -65,7 +64,7 @@ public String getMediaType() { - return markupType.getMediaType().getValue(); + return markupType.getMimeType(); } public String getLocale() 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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -197,7 +197,7 @@ String desiredMIMEType = desiredMIMETypes[i]; for (int j = 0; j < markupTypes.length; j++) { - if (desiredMIMEType.equals(markupTypes[j].getMediaType())) + if (desiredMIMEType.equals(markupTypes[j].getMimeType())) { markupType = markupTypes[j]; break; 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 23:15:27 UTC (rev 10342) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-03-20 00:12:37 UTC (rev 10343) @@ -201,7 +201,7 @@ { MediaType mimeType = (MediaType)mediaTypes.next(); markupTypes[i] = new MarkupType( - mimeType, + mimeType.getValue(), getModeNamesFrom(capInfo.getModes(mimeType)), getWindowStateNamesFrom(capInfo.getWindowStates(mimeType)), getLocaleNamesFrom(capInfo.getLocales(mimeType)),