Author: thomas.heute(a)jboss.com Date: 2008-03-19 21:09:01 -0400 (Wed, 19 Mar 2008) New Revision: 10344 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java modules/portlet/trunk/releaseLibs.sh Log: Align with portlet libs (Damn svn plugin for eclipse which 'forgets' some files) Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java 2008-03-20 00:12:37 UTC (rev 10343) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -24,7 +24,7 @@ package org.jboss.portal.core.aspects.portlet; 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.info.PortletInfo; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; @@ -46,7 +46,7 @@ */ protected PortletInfo getPortletInfo(PortletInvocation invocation) { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); return container.getInfo(); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2008-03-20 00:12:37 UTC (rev 10343) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -74,7 +74,7 @@ { // Compute correct content type response header // String contentType = rendererContext.getContentType() + "; charset=" + rendererContext.getCharset(); - String contentType = markupInfo.getContentType() + "; charset=" + markupInfo.getCharset(); + String contentType = markupInfo.getMediaType() + "; charset=" + markupInfo.getCharset(); // Set charset and content type on the response dispatcher.getResponse().setContentType(contentType); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2008-03-20 00:12:37 UTC (rev 10343) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -442,7 +442,6 @@ return TestCloneBeforeWrite.this.execute(this); } }); - internalPortlet.addPreference("_abc", new StringValue("_def")); String popId = getSinglePOP().getContext().getId(); // Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-03-20 00:12:37 UTC (rev 10343) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-03-20 01:09:01 UTC (rev 10344) @@ -813,7 +813,7 @@ </mbean> <!-- The portlet container invoker --> - <mbean code="org.jboss.portal.portlet.container.PortletContainerInvoker" + <mbean code="org.jboss.portal.portlet.container.ContainerPortletInvoker" name="portal:service=PortletInvoker,type=Container" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-03-20 00:12:37 UTC (rev 10343) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -124,7 +124,7 @@ return supportedLocales; } - public Set<MediaType> getMimeTypes() + public Set<MediaType> getMediaTypes() { return supportedModes.getMediaTypes(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-03-20 00:12:37 UTC (rev 10343) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -365,7 +365,7 @@ public String getResponseContentType() { - return invocation.getContext().getMarkupInfo().getContentType().getValue(); + return invocation.getContext().getMarkupInfo().getMediaType().getValue(); } public Enumeration<String> getResponseContentTypes() @@ -584,7 +584,7 @@ // Add all the modes Set<Mode> modes = new HashSet<Mode>(); - for (ModeInfo modeInfo : capabilities.getModes(si.getContentType())) + for (ModeInfo modeInfo : capabilities.getModes(si.getMediaType())) { modes.add(modeInfo.getMode()); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-03-20 00:12:37 UTC (rev 10343) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -37,11 +37,11 @@ public interface CapabilitiesInfo { /** - * Retrieves all the MIME types supported by the associated Portlet. + * Retrieves all the Media types supported by the associated Portlet. * - * @return a Set of String representation of supported MIME types + * @return a Set of String representation of supported Media types */ - Set<MediaType> getMimeTypes(); + Set<MediaType> getMediaTypes(); /** * Retrieves all the portlet modes supported by the associated Portlet. @@ -51,12 +51,12 @@ Set<ModeInfo> getAllModes(); /** - * Retrieves the portlet modes supported by the associated Portlet for the specified MIME type. + * Retrieves the portlet modes supported by the associated Portlet for the specified Media type. * - * @param mimeType the mime type - * @return a Set of {@link ModeInfo} reprensenting the supported portlet modes for the specified MIME type + * @param mediaType the media type + * @return a Set of {@link ModeInfo} reprensenting the supported portlet modes for the specified Media type */ - Set<ModeInfo> getModes(MediaType mimeType); + Set<ModeInfo> getModes(MediaType mediaType); /** * Retrieves all the window states supported by the associated Portlet. Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-03-20 00:12:37 UTC (rev 10343) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -42,7 +42,7 @@ { /** . */ - private Set<MediaType> mimeTypes; + private Set<MediaType> mediaTypes; /** . */ private Set<ModeInfo> modes; @@ -55,8 +55,8 @@ public CapabilitiesInfoSupport() { - mimeTypes = new HashSet<MediaType>(); - mimeTypes.add(MediaType.TEXT_HTML); + mediaTypes = new HashSet<MediaType>(); + mediaTypes.add(MediaType.TEXT_HTML); // this.modes = new HashSet<ModeInfo>(); @@ -75,9 +75,9 @@ locales.add(Locale.ENGLISH); } - public Set<MediaType> getMimeTypes() + public Set<MediaType> getMediaTypes() { - return mimeTypes; + return mediaTypes; } public Set<ModeInfo> getAllModes() @@ -87,7 +87,7 @@ public Set<ModeInfo> getModes(MediaType mimeType) { - if (mimeTypes.contains(mimeType)) + if (mediaTypes.contains(mimeType)) { return modes; } @@ -101,7 +101,7 @@ public Set<WindowStateInfo> getWindowStates(MediaType mimeType) { - if (mimeTypes.contains(mimeType)) + if (mediaTypes.contains(mimeType)) { return windowStates; } @@ -115,7 +115,7 @@ public Set<Locale> getLocales(MediaType mimeType) { - if (mimeTypes.contains(mimeType)) + if (mediaTypes.contains(mimeType)) { return locales; } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2008-03-20 00:12:37 UTC (rev 10343) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2008-03-20 01:09:01 UTC (rev 10344) @@ -64,7 +64,7 @@ assertTrue(allLocales.contains(Locale.ENGLISH)); //check mime types - Set<MediaType> types = capInfo.getMimeTypes(); + Set<MediaType> types = capInfo.getMediaTypes(); String[] mt = new String[types.size()]; int count = 0; for (Iterator i = types.iterator(); i.hasNext();) Modified: modules/portlet/trunk/releaseLibs.sh =================================================================== --- modules/portlet/trunk/releaseLibs.sh 2008-03-20 00:12:37 UTC (rev 10343) +++ modules/portlet/trunk/releaseLibs.sh 2008-03-20 01:09:01 UTC (rev 10344) @@ -1,5 +1,5 @@ -repos=$HOME/Dev/portal-modules-respo/portlet/trunk-SNAPSHOT/lib -thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/portlet/lib +repos=/home/theute/Portal/repo/jboss-portal/modules/portlet/trunk-SNAPSHOT/lib +thirdparty=/home/theute/Portal/workspace_2.7/thirdparty/jboss-portal/modules/portlet/lib/ echo "Copies current version of portlet libraries either to local repository copy or Portal thirdparty to test or release purpose" echo "Usage: '$0' to release to Portal thirdparty, '$0 repos' to release to repository local copy" @@ -26,4 +26,4 @@ cp federation/target/portlet-federation-2.0.0-SNAPSHOT.jar $loc/portal-portlet-federation-lib.jar cp jsr168api/target/portlet-jsr168api-2.0.0-SNAPSHOT.jar $loc/portal-portlet-jsr168api-lib.jar cp management/target/portlet-management-2.0.0-SNAPSHOT.jar $loc/portal-portlet-management-lib.jar -cp portlet/target/portlet-portlet-2.0.0-SNAPSHOT.jar $loc/portal-portlet-lib.jar \ No newline at end of file +cp portlet/target/portlet-portlet-2.0.0-SNAPSHOT.jar $loc/portal-portlet-lib.jar