Author: chris.laprun(a)jboss.com Date: 2007-02-21 12:52:02 -0500 (Wed, 21 Feb 2007) New Revision: 6364 Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/UserContextConverterTestCase.java trunk/wsrp/src/main/org/jboss/portal/wsrp/UserContextConverter.java Log: - Removed unused constant. - Changed @since as this will be backported to 2.4 branch. Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java 2007-02-21 15:31:49 UTC (rev 6363) +++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java 2007-02-21 17:52:02 UTC (rev 6364) @@ -50,12 +50,14 @@ import org.jboss.portal.portlet.invocation.response.SecurityErrorResponse; import org.jboss.portal.portlet.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.metadata.JBossPortletMetaData; +import org.jboss.portal.portlet.state.producer.PortletStateChangeRequiredException; import javax.portlet.Portlet; import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.PortletSecurityException; import javax.portlet.PreferencesValidator; +import javax.portlet.ReadOnlyException; import javax.portlet.UnavailableException; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -362,7 +364,7 @@ public String toString() { - return "PortletContainer[name=" + getId() + ",+application=" + application.getId() + "]"; + return "PortletContainer[name=" + getId() + ",+application=" + application.getId() + "]"; } /** Initialize the portlet. */ @@ -432,6 +434,10 @@ // return new ErrorResponse(e); } + catch (ReadOnlyException e) + { + throw new PortletStateChangeRequiredException(e.getLocalizedMessage()); + } catch (Exception e) { log.error("The portlet threw an exception", e); Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/UserContextConverterTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/UserContextConverterTestCase.java 2007-02-21 15:31:49 UTC (rev 6363) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/UserContextConverterTestCase.java 2007-02-21 17:52:02 UTC (rev 6364) @@ -33,7 +33,7 @@ * * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ - * @since 2.6 + * @since 2.4 */ public class UserContextConverterTestCase extends TestCase { Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/UserContextConverter.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/UserContextConverter.java 2007-02-21 15:31:49 UTC (rev 6363) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/UserContextConverter.java 2007-02-21 17:52:02 UTC (rev 6364) @@ -51,8 +51,6 @@ */ public class UserContextConverter { - public static final String XSD_DATETIME_FORMAT = "yyy-MM-dd'T'HH:mm:ss.SSSZ"; - public static UserContext createPortalUserContextFrom(org.jboss.portal.wsrp.core.UserContext userContext, String[] desiredLocales, String preferredLocale) {