Author: chris.laprun(a)jboss.com Date: 2010-07-31 10:28:22 -0400 (Sat, 31 Jul 2010) New Revision: 3731 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupHandler.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupInterface.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementHandler.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementInterface.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationInterface.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionInterface.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java Log: - GTNWSRP-8: Added missing exceptions and methods. - Simplified code when ReturnAny is involved since we don't currently deal with it. - Make several methods return List<Extension> instead of ReturnAny. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupHandler.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupHandler.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -23,7 +23,6 @@ package org.gatein.wsrp.producer; -import org.gatein.common.NotYetImplemented; import org.gatein.pc.api.PortletInvokerException; import org.gatein.pc.api.invocation.response.ContentResponse; import org.gatein.pc.api.invocation.response.ErrorResponse; @@ -36,6 +35,7 @@ import org.gatein.wsrp.spec.v2.WSRP2ExceptionFactory; import org.oasis.wsrp.v2.AccessDenied; import org.oasis.wsrp.v2.BlockingInteractionResponse; +import org.oasis.wsrp.v2.Extension; import org.oasis.wsrp.v2.GetMarkup; import org.oasis.wsrp.v2.GetResource; import org.oasis.wsrp.v2.HandleEvents; @@ -58,7 +58,6 @@ import org.oasis.wsrp.v2.ReleaseSessions; import org.oasis.wsrp.v2.ResourceResponse; import org.oasis.wsrp.v2.ResourceSuspended; -import org.oasis.wsrp.v2.ReturnAny; import org.oasis.wsrp.v2.UnsupportedLocale; import org.oasis.wsrp.v2.UnsupportedMimeType; import org.oasis.wsrp.v2.UnsupportedMode; @@ -66,6 +65,8 @@ import javax.portlet.PortletModeException; import javax.portlet.WindowStateException; +import java.util.Collections; +import java.util.List; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -86,7 +87,10 @@ // Markup implementation ******************************************************************************************** - public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, UnsupportedMimeType + public MarkupResponse getMarkup(GetMarkup getMarkup) + throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, ResourceSuspended, + UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(getMarkup, GET_MARKUP); @@ -110,15 +114,15 @@ return (MarkupResponse)requestProcessor.processResponse(response); } - public ResourceResponse getResource(GetResource getResource) throws AccessDenied, InconsistentParameters, - InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, InvalidUserCategory, MissingParameters, - ModifyRegistrationRequired, OperationFailed, ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, - UnsupportedMode, UnsupportedWindowState + public ResourceResponse getResource(GetResource getResource) + throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, + ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(getResource, GET_RESOURCE); - + ResourceRequestProcessor requestProcessor = new ResourceRequestProcessor(producer, getResource); - + String handle = requestProcessor.getPortletContext().getPortletHandle(); PortletInvocationResponse response; try @@ -131,13 +135,16 @@ { throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Could not access portlet resource '" + handle + "'", e); } - + checkForError(response); - - return (ResourceResponse)requestProcessor.processResponse(response); + + return requestProcessor.processResponse(response); } - public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, InvalidHandle, InvalidCookie + public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) + throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, PortletStateChangeRequired, + ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(performBlockingInteraction, PBI); final InteractionParams interactionParams = performBlockingInteraction.getInteractionParams(); @@ -167,14 +174,18 @@ return (BlockingInteractionResponse)requestProcessor.processResponse(response); } - public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied + public List<Extension> releaseSessions(ReleaseSessions releaseSessions) + throws AccessDenied, InvalidRegistration, MissingParameters, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended { // our producer never sends session ids so a Consumer trying to release sessions is an error condition throwOperationFaultOnSessionOperation(); return null; } - public ReturnAny initCookie(InitCookie initCookie) throws AccessDenied, OperationFailed, InvalidRegistration + public List<Extension> initCookie(InitCookie initCookie) + throws AccessDenied, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, + ResourceSuspended { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(initCookie, "InitCookie"); producer.getRegistrationOrFailIfInvalid(initCookie.getRegistrationContext()); @@ -184,13 +195,14 @@ String sessionId = ServletAccess.getRequest().getSession().getId(); log.debug("Got init cookie operation, created a session with id " + sessionId); - return new ReturnAny(); + return Collections.emptyList(); } - public HandleEventsResponse handleEvents(HandleEvents handleEvents) throws AccessDenied, InconsistentParameters, - InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, InvalidUserCategory, MissingParameters, - ModifyRegistrationRequired, OperationFailed, OperationNotSupported, PortletStateChangeRequired, ResourceSuspended, - UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState + public HandleEventsResponse handleEvents(HandleEvents handleEvents) + throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, + PortletStateChangeRequired, ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, + UnsupportedWindowState { EventRequestProcessor requestProcessor = new EventRequestProcessor(producer, handleEvents); Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupInterface.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupInterface.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/MarkupInterface.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -25,6 +25,7 @@ import org.oasis.wsrp.v2.AccessDenied; import org.oasis.wsrp.v2.BlockingInteractionResponse; +import org.oasis.wsrp.v2.Extension; import org.oasis.wsrp.v2.GetMarkup; import org.oasis.wsrp.v2.GetResource; import org.oasis.wsrp.v2.HandleEvents; @@ -46,12 +47,13 @@ import org.oasis.wsrp.v2.ReleaseSessions; import org.oasis.wsrp.v2.ResourceResponse; import org.oasis.wsrp.v2.ResourceSuspended; -import org.oasis.wsrp.v2.ReturnAny; import org.oasis.wsrp.v2.UnsupportedLocale; import org.oasis.wsrp.v2.UnsupportedMimeType; import org.oasis.wsrp.v2.UnsupportedMode; import org.oasis.wsrp.v2.UnsupportedWindowState; +import java.util.List; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -59,23 +61,15 @@ public interface MarkupInterface { MarkupResponse getMarkup(GetMarkup getMarkup) - throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, - InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, - OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, - UnsupportedMimeType; + throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, ResourceSuspended, + UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState; BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) - throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, - UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, - InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, - InvalidHandle, InvalidCookie; + throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, PortletStateChangeRequired, + ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState; - ReturnAny releaseSessions(ReleaseSessions releaseSessions) - throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied; - - ReturnAny initCookie(InitCookie initCookie) - throws AccessDenied, OperationFailed, InvalidRegistration; - HandleEventsResponse handleEvents(HandleEvents handleEvents) throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, @@ -84,6 +78,14 @@ ResourceResponse getResource(GetResource getResource) throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, - InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, ResourceSuspended, - UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState; + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, + ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState; + + List<Extension> releaseSessions(ReleaseSessions releaseSessions) + throws AccessDenied, InvalidRegistration, MissingParameters, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended; + + List<Extension> initCookie(InitCookie initCookie) + throws AccessDenied, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, + ResourceSuspended; } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementHandler.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementHandler.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -25,6 +25,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import org.gatein.common.NotYetImplemented; import org.gatein.common.i18n.LocalizedString; import org.gatein.pc.api.InvalidPortletIdException; import org.gatein.pc.api.NoSuchPortletException; @@ -45,18 +46,32 @@ import org.gatein.wsrp.spec.v2.WSRP2ExceptionFactory; import org.oasis.wsrp.v2.AccessDenied; import org.oasis.wsrp.v2.ClonePortlet; +import org.oasis.wsrp.v2.CopyPortlets; +import org.oasis.wsrp.v2.CopyPortletsResponse; import org.oasis.wsrp.v2.DestroyPortlets; import org.oasis.wsrp.v2.DestroyPortletsResponse; +import org.oasis.wsrp.v2.ExportByValueNotSupported; +import org.oasis.wsrp.v2.ExportNoLongerValid; +import org.oasis.wsrp.v2.ExportPortlets; +import org.oasis.wsrp.v2.ExportPortletsResponse; +import org.oasis.wsrp.v2.Extension; import org.oasis.wsrp.v2.FailedPortlets; import org.oasis.wsrp.v2.GetPortletDescription; import org.oasis.wsrp.v2.GetPortletProperties; import org.oasis.wsrp.v2.GetPortletPropertyDescription; +import org.oasis.wsrp.v2.GetPortletsLifetime; +import org.oasis.wsrp.v2.GetPortletsLifetimeResponse; +import org.oasis.wsrp.v2.ImportPortlets; +import org.oasis.wsrp.v2.ImportPortletsResponse; import org.oasis.wsrp.v2.InconsistentParameters; import org.oasis.wsrp.v2.InvalidHandle; import org.oasis.wsrp.v2.InvalidRegistration; import org.oasis.wsrp.v2.InvalidUserCategory; +import org.oasis.wsrp.v2.Lifetime; import org.oasis.wsrp.v2.MissingParameters; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.PortletContext; import org.oasis.wsrp.v2.PortletDescription; import org.oasis.wsrp.v2.PortletDescriptionResponse; @@ -64,8 +79,13 @@ import org.oasis.wsrp.v2.Property; import org.oasis.wsrp.v2.PropertyDescription; import org.oasis.wsrp.v2.PropertyList; +import org.oasis.wsrp.v2.ReleaseExport; import org.oasis.wsrp.v2.ResetProperty; +import org.oasis.wsrp.v2.ResourceSuspended; +import org.oasis.wsrp.v2.SetExportLifetime; import org.oasis.wsrp.v2.SetPortletProperties; +import org.oasis.wsrp.v2.SetPortletsLifetime; +import org.oasis.wsrp.v2.SetPortletsLifetimeResponse; import org.oasis.wsrp.v2.UserContext; import java.util.ArrayList; @@ -93,8 +113,8 @@ } public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) - throws AccessDenied, InvalidHandle, InvalidUserCategory, InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(getPortletDescription, GET_PORTLET_DESCRIPTION); Registration registration = producer.getRegistrationOrFailIfInvalid(getPortletDescription.getRegistrationContext()); @@ -111,8 +131,8 @@ } public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) - throws MissingParameters, InconsistentParameters, InvalidUserCategory, InvalidRegistration, AccessDenied, - InvalidHandle, OperationFailed + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(getPortletPropertyDescription, GET_PORTLET_PROPERTY_DESCRIPTION); @@ -156,8 +176,9 @@ return WSRPTypeFactory.createPortletPropertyDescriptionResponse(descs); } - public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategory, AccessDenied, OperationFailed, - InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters + public PortletContext clonePortlet(ClonePortlet clonePortlet) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(clonePortlet, "ClonePortlet"); @@ -194,8 +215,9 @@ } } - public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed + public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) + throws InconsistentParameters, InvalidRegistration, MissingParameters, ModifyRegistrationRequired, + OperationFailed, OperationNotSupported, ResourceSuspended { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(destroyPortlets, "DestroyPortlets"); @@ -249,9 +271,58 @@ } } - public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailed, - InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration + public GetPortletsLifetimeResponse getPortletsLifetime(GetPortletsLifetime getPortletsLifetime) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, + OperationFailed, OperationNotSupported, ResourceSuspended { + throw WSRP2ExceptionFactory.throwWSException(OperationNotSupported.class, "Lifetime operations are not currently supported.", null); + } + + public SetPortletsLifetimeResponse setPortletsLifetime(SetPortletsLifetime setPortletsLifetime) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, + OperationFailed, OperationNotSupported, ResourceSuspended + { + throw WSRP2ExceptionFactory.throwWSException(OperationNotSupported.class, "Lifetime operations are not currently supported.", null); + } + + public CopyPortletsResponse copyPortlets(CopyPortlets copyPortlets) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + throw new NotYetImplemented(); + } + + public ExportPortletsResponse exportPortlets(ExportPortlets exportPortlets) + throws AccessDenied, ExportByValueNotSupported, InconsistentParameters, InvalidHandle, InvalidRegistration, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, + ResourceSuspended + { + throw new NotYetImplemented(); + } + + public ImportPortletsResponse importPortlets(ImportPortlets importPortlets) + throws AccessDenied, ExportNoLongerValid, InconsistentParameters, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + throw new NotYetImplemented(); + } + + public List<Extension> releaseExport(ReleaseExport releaseExport) + { + throw new NotYetImplemented(); + } + + public Lifetime setExportLifetime(SetExportLifetime setExportLifetime) + throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended + { + throw new NotYetImplemented(); + } + + public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(setPortletProperties, "SetPortletProperties"); PortletContext portletContext = setPortletProperties.getPortletContext(); @@ -332,8 +403,9 @@ return portletContext; } - public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandle, - MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory + public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(getPortletProperties, GET_PORTLET_PROPERTIES); Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementInterface.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementInterface.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/PortletManagementInterface.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -25,46 +25,98 @@ import org.oasis.wsrp.v2.AccessDenied; import org.oasis.wsrp.v2.ClonePortlet; +import org.oasis.wsrp.v2.CopyPortlets; +import org.oasis.wsrp.v2.CopyPortletsResponse; import org.oasis.wsrp.v2.DestroyPortlets; import org.oasis.wsrp.v2.DestroyPortletsResponse; +import org.oasis.wsrp.v2.ExportByValueNotSupported; +import org.oasis.wsrp.v2.ExportNoLongerValid; +import org.oasis.wsrp.v2.ExportPortlets; +import org.oasis.wsrp.v2.ExportPortletsResponse; +import org.oasis.wsrp.v2.Extension; import org.oasis.wsrp.v2.GetPortletDescription; import org.oasis.wsrp.v2.GetPortletProperties; import org.oasis.wsrp.v2.GetPortletPropertyDescription; +import org.oasis.wsrp.v2.GetPortletsLifetime; +import org.oasis.wsrp.v2.GetPortletsLifetimeResponse; +import org.oasis.wsrp.v2.ImportPortlets; +import org.oasis.wsrp.v2.ImportPortletsResponse; import org.oasis.wsrp.v2.InconsistentParameters; import org.oasis.wsrp.v2.InvalidHandle; import org.oasis.wsrp.v2.InvalidRegistration; import org.oasis.wsrp.v2.InvalidUserCategory; +import org.oasis.wsrp.v2.Lifetime; import org.oasis.wsrp.v2.MissingParameters; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.PortletContext; import org.oasis.wsrp.v2.PortletDescriptionResponse; import org.oasis.wsrp.v2.PortletPropertyDescriptionResponse; import org.oasis.wsrp.v2.PropertyList; +import org.oasis.wsrp.v2.ReleaseExport; +import org.oasis.wsrp.v2.ResourceSuspended; +import org.oasis.wsrp.v2.SetExportLifetime; import org.oasis.wsrp.v2.SetPortletProperties; +import org.oasis.wsrp.v2.SetPortletsLifetime; +import org.oasis.wsrp.v2.SetPortletsLifetimeResponse; +import java.util.List; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ public interface PortletManagementInterface { - PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) - throws AccessDenied, InvalidHandle, InvalidUserCategory, InconsistentParameters, MissingParameters, - InvalidRegistration, OperationFailed; + public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended; - PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategory, AccessDenied, - OperationFailed, InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters; + public PortletContext clonePortlet(ClonePortlet clonePortlet) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended; - DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed; + public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) + throws InconsistentParameters, InvalidRegistration, MissingParameters, ModifyRegistrationRequired, + OperationFailed, OperationNotSupported, ResourceSuspended; - PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailed, - InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration; + public GetPortletsLifetimeResponse getPortletsLifetime(GetPortletsLifetime getPortletsLifetime) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, + OperationFailed, OperationNotSupported, ResourceSuspended; - PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandle, - MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory; + public SetPortletsLifetimeResponse setPortletsLifetime(SetPortletsLifetime setPortletsLifetime) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, + OperationFailed, OperationNotSupported, ResourceSuspended; - PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) - throws MissingParameters, InconsistentParameters, InvalidUserCategory, InvalidRegistration, AccessDenied, - InvalidHandle, OperationFailed; + public CopyPortletsResponse copyPortlets(CopyPortlets copyPortlets) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended; + + public ExportPortletsResponse exportPortlets(ExportPortlets exportPortlets) + throws AccessDenied, ExportByValueNotSupported, InconsistentParameters, InvalidHandle, InvalidRegistration, + InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, + ResourceSuspended; + + public ImportPortletsResponse importPortlets(ImportPortlets importPortlets) + throws AccessDenied, ExportNoLongerValid, InconsistentParameters, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended; + + public List<Extension> releaseExport(ReleaseExport releaseExport); + + public Lifetime setExportLifetime(SetExportLifetime setExportLifetime) + throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended; + + public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended; + + public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended; + + public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) + throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, + MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended; } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -37,15 +37,23 @@ import org.gatein.wsrp.WSRPUtils; import org.gatein.wsrp.producer.config.ProducerRegistrationRequirements; import org.gatein.wsrp.spec.v2.WSRP2ExceptionFactory; +import org.oasis.wsrp.v2.AccessDenied; +import org.oasis.wsrp.v2.Extension; +import org.oasis.wsrp.v2.GetRegistrationLifetime; +import org.oasis.wsrp.v2.InvalidHandle; import org.oasis.wsrp.v2.InvalidRegistration; +import org.oasis.wsrp.v2.Lifetime; import org.oasis.wsrp.v2.MissingParameters; import org.oasis.wsrp.v2.ModifyRegistration; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.Property; import org.oasis.wsrp.v2.RegistrationContext; import org.oasis.wsrp.v2.RegistrationData; import org.oasis.wsrp.v2.RegistrationState; -import org.oasis.wsrp.v2.ReturnAny; +import org.oasis.wsrp.v2.ResourceSuspended; +import org.oasis.wsrp.v2.SetRegistrationLifetime; import javax.xml.namespace.QName; import java.util.ArrayList; @@ -67,7 +75,8 @@ super(producer); } - public RegistrationContext register(RegistrationData registrationData) throws MissingParameters, OperationFailed + public RegistrationContext register(RegistrationData registrationData) + throws MissingParameters, OperationFailed, OperationNotSupported { ProducerRegistrationRequirements registrationRequirements = producer.getProducerRegistrationRequirements(); if (registrationRequirements.isRegistrationRequired()) @@ -142,7 +151,8 @@ producer.getRegistrationManager().getPersistenceManager().saveChangesTo(consumer); } - public ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration + public List<Extension> deregister(RegistrationContext deregister) + throws InvalidRegistration, OperationFailed, OperationNotSupported, ResourceSuspended { if (producer.getProducerRegistrationRequirements().isRegistrationRequired()) { @@ -172,14 +182,14 @@ throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, msg, e); } - return new ReturnAny(); + return Collections.emptyList(); } throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Deregistration shouldn't be attempted if registration is not required", null); } - public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParameters, - OperationFailed, InvalidRegistration + public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) + throws InvalidRegistration, MissingParameters, OperationFailed, OperationNotSupported, ResourceSuspended { if (producer.getProducerRegistrationRequirements().isRegistrationRequired()) { @@ -236,6 +246,20 @@ throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Modifying a registration shouldn't be attempted if registration is not required", null); } + public Lifetime getRegistrationLifetime(GetRegistrationLifetime getRegistrationLifetime) + throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended + { + throw WSRP2ExceptionFactory.throwWSException(OperationNotSupported.class, "Lifetime operations are not currently supported.", null); + } + + public Lifetime setRegistrationLifetime(SetRegistrationLifetime setRegistrationLifetime) + throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended + { + throw WSRP2ExceptionFactory.throwWSException(OperationNotSupported.class, "Lifetime operations are not currently supported.", null); + } + /** * @param reg * @param throwExceptionIfInvalid Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationInterface.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationInterface.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationInterface.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -23,25 +23,45 @@ package org.gatein.wsrp.producer; +import org.oasis.wsrp.v2.AccessDenied; +import org.oasis.wsrp.v2.Extension; +import org.oasis.wsrp.v2.GetRegistrationLifetime; +import org.oasis.wsrp.v2.InvalidHandle; import org.oasis.wsrp.v2.InvalidRegistration; +import org.oasis.wsrp.v2.Lifetime; import org.oasis.wsrp.v2.MissingParameters; import org.oasis.wsrp.v2.ModifyRegistration; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.RegistrationContext; import org.oasis.wsrp.v2.RegistrationData; import org.oasis.wsrp.v2.RegistrationState; -import org.oasis.wsrp.v2.ReturnAny; +import org.oasis.wsrp.v2.ResourceSuspended; +import org.oasis.wsrp.v2.SetRegistrationLifetime; +import java.util.List; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ public interface RegistrationInterface { - RegistrationContext register(RegistrationData register) throws MissingParameters, OperationFailed; + RegistrationContext register(RegistrationData register) + throws MissingParameters, OperationFailed, OperationNotSupported; - ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration; + List<Extension> deregister(RegistrationContext deregister) + throws InvalidRegistration, OperationFailed, OperationNotSupported, ResourceSuspended; - RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParameters, - OperationFailed, InvalidRegistration; + RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) + throws InvalidRegistration, MissingParameters, OperationFailed, OperationNotSupported, ResourceSuspended; + + public Lifetime getRegistrationLifetime(GetRegistrationLifetime getRegistrationLifetime) + throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended; + + public Lifetime setRegistrationLifetime(SetRegistrationLifetime setRegistrationLifetime) + throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, + OperationNotSupported, ResourceSuspended; } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -52,11 +52,13 @@ import org.oasis.wsrp.v2.InvalidRegistration; import org.oasis.wsrp.v2.MarkupType; import org.oasis.wsrp.v2.ModelDescription; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; import org.oasis.wsrp.v2.ParameterDescription; import org.oasis.wsrp.v2.PortletContext; import org.oasis.wsrp.v2.PortletDescription; import org.oasis.wsrp.v2.RegistrationContext; +import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.ServiceDescription; import javax.xml.namespace.QName; @@ -86,7 +88,8 @@ serviceDescription = new ServiceDescriptionInfo(producer); } - public ServiceDescription getServiceDescription(GetServiceDescription gs) throws InvalidRegistration, OperationFailed + public ServiceDescription getServiceDescription(GetServiceDescription gs) + throws InvalidRegistration, ModifyRegistrationRequired, OperationFailed, ResourceSuspended { WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(gs, "GetServiceDescription"); Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionInterface.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionInterface.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionInterface.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -25,7 +25,9 @@ import org.oasis.wsrp.v2.GetServiceDescription; import org.oasis.wsrp.v2.InvalidRegistration; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.ServiceDescription; /** @@ -34,5 +36,6 @@ */ public interface ServiceDescriptionInterface { - ServiceDescription getServiceDescription(GetServiceDescription gs) throws InvalidRegistration, OperationFailed; + ServiceDescription getServiceDescription(GetServiceDescription gs) + throws InvalidRegistration, ModifyRegistrationRequired, OperationFailed, ResourceSuspended; } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -41,16 +41,28 @@ import org.oasis.wsrp.v2.BlockingInteractionResponse; import org.oasis.wsrp.v2.ClonePortlet; import org.oasis.wsrp.v2.CookieProtocol; +import org.oasis.wsrp.v2.CopyPortlets; +import org.oasis.wsrp.v2.CopyPortletsResponse; import org.oasis.wsrp.v2.DestroyPortlets; import org.oasis.wsrp.v2.DestroyPortletsResponse; +import org.oasis.wsrp.v2.ExportByValueNotSupported; +import org.oasis.wsrp.v2.ExportNoLongerValid; +import org.oasis.wsrp.v2.ExportPortlets; +import org.oasis.wsrp.v2.ExportPortletsResponse; +import org.oasis.wsrp.v2.Extension; import org.oasis.wsrp.v2.GetMarkup; import org.oasis.wsrp.v2.GetPortletDescription; import org.oasis.wsrp.v2.GetPortletProperties; import org.oasis.wsrp.v2.GetPortletPropertyDescription; +import org.oasis.wsrp.v2.GetPortletsLifetime; +import org.oasis.wsrp.v2.GetPortletsLifetimeResponse; +import org.oasis.wsrp.v2.GetRegistrationLifetime; import org.oasis.wsrp.v2.GetResource; import org.oasis.wsrp.v2.GetServiceDescription; import org.oasis.wsrp.v2.HandleEvents; import org.oasis.wsrp.v2.HandleEventsResponse; +import org.oasis.wsrp.v2.ImportPortlets; +import org.oasis.wsrp.v2.ImportPortletsResponse; import org.oasis.wsrp.v2.InconsistentParameters; import org.oasis.wsrp.v2.InitCookie; import org.oasis.wsrp.v2.InvalidCookie; @@ -58,6 +70,7 @@ import org.oasis.wsrp.v2.InvalidRegistration; import org.oasis.wsrp.v2.InvalidSession; import org.oasis.wsrp.v2.InvalidUserCategory; +import org.oasis.wsrp.v2.Lifetime; import org.oasis.wsrp.v2.MarkupResponse; import org.oasis.wsrp.v2.MissingParameters; import org.oasis.wsrp.v2.ModifyRegistration; @@ -74,12 +87,16 @@ import org.oasis.wsrp.v2.RegistrationContext; import org.oasis.wsrp.v2.RegistrationData; import org.oasis.wsrp.v2.RegistrationState; +import org.oasis.wsrp.v2.ReleaseExport; import org.oasis.wsrp.v2.ReleaseSessions; import org.oasis.wsrp.v2.ResourceResponse; import org.oasis.wsrp.v2.ResourceSuspended; -import org.oasis.wsrp.v2.ReturnAny; import org.oasis.wsrp.v2.ServiceDescription; +import org.oasis.wsrp.v2.SetExportLifetime; import org.oasis.wsrp.v2.SetPortletProperties; +import org.oasis.wsrp.v2.SetPortletsLifetime; +import org.oasis.wsrp.v2.SetPortletsLifetimeResponse; +import org.oasis.wsrp.v2.SetRegistrationLifetime; import org.oasis.wsrp.v2.UnsupportedLocale; import org.oasis.wsrp.v2.UnsupportedMimeType; import org.oasis.wsrp.v2.UnsupportedMode; @@ -159,150 +176,151 @@ // ServiceDescription implementation ******************************************************************************** public ServiceDescription getServiceDescription(GetServiceDescription gs) - throws InvalidRegistration, OperationFailed + throws InvalidRegistration, OperationFailed, ResourceSuspended, ModifyRegistrationRequired { - log.debug("getServiceDescription invoked"); - ServiceDescription sd = serviceDescriptionHandler.getServiceDescription(gs); - log.debug("end getServiceDescription"); - return sd; + return serviceDescriptionHandler.getServiceDescription(gs); } // MarkupService implementation ************************************************************************************* - public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, UnsupportedMimeType + public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, UnsupportedMimeType, ResourceSuspended, ModifyRegistrationRequired { - log.debug("getMarkup invoked"); - MarkupResponse response = markupHandler.getMarkup(getMarkup); - log.debug("end getMarkup"); - return response; + return markupHandler.getMarkup(getMarkup); } - public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, InvalidHandle, InvalidCookie + public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, InvalidHandle, InvalidCookie, ResourceSuspended, ModifyRegistrationRequired { - log.debug("performBlockingInteraction invoked"); - BlockingInteractionResponse interactionResponse = markupHandler.performBlockingInteraction(performBlockingInteraction); - log.debug("end performBlockingInteraction"); - return interactionResponse; + return markupHandler.performBlockingInteraction(performBlockingInteraction); } - public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied + public List<Extension> releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied, ResourceSuspended, OperationNotSupported, ModifyRegistrationRequired { - log.debug("releaseSessions invoked"); - ReturnAny returnAny = markupHandler.releaseSessions(releaseSessions); - log.debug("end releaseSessions"); - return returnAny; + return markupHandler.releaseSessions(releaseSessions); } - public ReturnAny initCookie(InitCookie initCookie) throws AccessDenied, OperationFailed, InvalidRegistration + public List<Extension> initCookie(InitCookie initCookie) throws AccessDenied, OperationFailed, InvalidRegistration, ResourceSuspended, OperationNotSupported, ModifyRegistrationRequired { - log.debug("initCookie invoked"); - ReturnAny returnAny = markupHandler.initCookie(initCookie); - log.debug("end initCookie"); - return returnAny; + return markupHandler.initCookie(initCookie); } public HandleEventsResponse handleEvents(HandleEvents handleEvents) throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, PortletStateChangeRequired, ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState { - log.debug("handleEvents invoked"); - HandleEventsResponse response = markupHandler.handleEvents(handleEvents); - log.debug("end handleEvents"); - return response; + return markupHandler.handleEvents(handleEvents); } - public ResourceResponse getResource(GetResource getResource) throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState + public ResourceResponse getResource(GetResource getResource) throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState, OperationNotSupported { - log.debug("getResource invoked"); - ResourceResponse response = markupHandler.getResource(getResource); - log.debug("end getResource"); - return response; + return markupHandler.getResource(getResource); } // Registration implementation ************************************************************************************** - public RegistrationContext register(RegistrationData register) throws MissingParameters, OperationFailed + public RegistrationContext register(RegistrationData register) throws MissingParameters, OperationFailed, OperationNotSupported { - log.debug("register invoked"); - RegistrationContext registrationContext = registrationHandler.register(register); - log.debug("end register"); - return registrationContext; + return registrationHandler.register(register); } - public ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration + public List<Extension> deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration, ResourceSuspended, OperationNotSupported { - log.debug("deregister invoked"); - ReturnAny returnAny = registrationHandler.deregister(deregister); - log.debug("end deregister"); - return returnAny; + return registrationHandler.deregister(deregister); } public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParameters, - OperationFailed, InvalidRegistration + OperationFailed, InvalidRegistration, ResourceSuspended, OperationNotSupported { - log.debug("modifyRegistration invoked"); - RegistrationState registrationState = registrationHandler.modifyRegistration(modifyRegistration); - log.debug("end modifyRegistration"); - return registrationState; + return registrationHandler.modifyRegistration(modifyRegistration); } -// PortletManagement implementation ********************************************************************************* + public Lifetime getRegistrationLifetime(GetRegistrationLifetime getRegistrationLifetime) throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return registrationHandler.getRegistrationLifetime(getRegistrationLifetime); + } + public Lifetime setRegistrationLifetime(SetRegistrationLifetime setRegistrationLifetime) throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return registrationHandler.setRegistrationLifetime(setRegistrationLifetime); + } + + // PortletManagement implementation ********************************************************************************* + public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) throws AccessDenied, InvalidHandle, InvalidUserCategory, InconsistentParameters, MissingParameters, - InvalidRegistration, OperationFailed + InvalidRegistration, OperationFailed, ResourceSuspended, OperationNotSupported, ModifyRegistrationRequired { - log.debug("getPortletDescription invoked"); - PortletDescriptionResponse description = portletManagementHandler.getPortletDescription(getPortletDescription); - log.debug("end getPortletDescription"); - return description; + return portletManagementHandler.getPortletDescription(getPortletDescription); } public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategory, AccessDenied, - OperationFailed, InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters + OperationFailed, InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters, + ResourceSuspended, OperationNotSupported, ModifyRegistrationRequired { - log.debug("clonePortlet invoked"); - PortletContext portletContext = portletManagementHandler.clonePortlet(clonePortlet); - log.debug("end clonePortlet"); - return portletContext; + return portletManagementHandler.clonePortlet(clonePortlet); } public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed + MissingParameters, InvalidRegistration, OperationFailed, ResourceSuspended, OperationNotSupported, + ModifyRegistrationRequired { - log.debug("destroyPortlets invoked"); - DestroyPortletsResponse destroyPortletsResponse = portletManagementHandler.destroyPortlets(destroyPortlets); - log.debug("end destroyPortlets"); - return destroyPortletsResponse; + return portletManagementHandler.destroyPortlets(destroyPortlets); } public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailed, - InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration + InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration, + ResourceSuspended, OperationNotSupported, ModifyRegistrationRequired { - log.debug("setPortletProperties invoked"); - PortletContext portletContext = portletManagementHandler.setPortletProperties(setPortletProperties); - log.debug("end setPortletProperties"); - return portletContext; + return portletManagementHandler.setPortletProperties(setPortletProperties); } public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandle, - MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory + MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory, + ResourceSuspended, OperationNotSupported, ModifyRegistrationRequired { - log.debug("getPortletProperties invoked"); - PropertyList list = portletManagementHandler.getPortletProperties(getPortletProperties); - log.debug("end getPortletProperties"); - return list; + return portletManagementHandler.getPortletProperties(getPortletProperties); } public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) throws MissingParameters, InconsistentParameters, InvalidUserCategory, InvalidRegistration, AccessDenied, - InvalidHandle, OperationFailed + InvalidHandle, OperationFailed, ResourceSuspended, OperationNotSupported, ModifyRegistrationRequired { - log.debug("getPortletPropertyDescription invoked"); - PortletPropertyDescriptionResponse descriptionResponse = portletManagementHandler.getPortletPropertyDescription(getPortletPropertyDescription); - log.debug("end getPortletPropertyDescription"); - return descriptionResponse; + return portletManagementHandler.getPortletPropertyDescription(getPortletPropertyDescription); } + public GetPortletsLifetimeResponse getPortletsLifetime(GetPortletsLifetime getPortletsLifetime) throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return portletManagementHandler.getPortletsLifetime(getPortletsLifetime); + } + + public SetPortletsLifetimeResponse setPortletsLifetime(SetPortletsLifetime setPortletsLifetime) throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return portletManagementHandler.setPortletsLifetime(setPortletsLifetime); + } + + public CopyPortletsResponse copyPortlets(CopyPortlets copyPortlets) throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return portletManagementHandler.copyPortlets(copyPortlets); + } + + public ExportPortletsResponse exportPortlets(ExportPortlets exportPortlets) throws AccessDenied, ExportByValueNotSupported, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return portletManagementHandler.exportPortlets(exportPortlets); + } + + public ImportPortletsResponse importPortlets(ImportPortlets importPortlets) throws AccessDenied, ExportNoLongerValid, InconsistentParameters, InvalidRegistration, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return portletManagementHandler.importPortlets(importPortlets); + } + + public List<Extension> releaseExport(ReleaseExport releaseExport) + { + return portletManagementHandler.releaseExport(releaseExport); + } + + public Lifetime setExportLifetime(SetExportLifetime setExportLifetime) throws AccessDenied, InvalidHandle, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended + { + return portletManagementHandler.setExportLifetime(setExportLifetime); + } + private ProducerConfiguration getProducerConfiguration() { return configurationService.getConfiguration(); Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -23,7 +23,6 @@ package org.gatein.wsrp.producer.v1; -import org.gatein.common.NotYetImplemented; import org.gatein.pc.api.PortletInvoker; import org.gatein.registration.RegistrationManager; import org.gatein.wsrp.producer.ProducerHolder; @@ -32,6 +31,7 @@ import org.gatein.wsrp.producer.v2.WSRP2Producer; import org.gatein.wsrp.spec.v1.V1ToV2Converter; import org.gatein.wsrp.spec.v1.V2ToV1Converter; +import org.gatein.wsrp.spec.v1.WSRP1ExceptionFactory; import org.oasis.wsrp.v1.V1AccessDenied; import org.oasis.wsrp.v1.V1BlockingInteractionResponse; import org.oasis.wsrp.v1.V1ClonePortlet; @@ -81,7 +81,9 @@ import org.oasis.wsrp.v2.InvalidUserCategory; import org.oasis.wsrp.v2.MarkupResponse; import org.oasis.wsrp.v2.MissingParameters; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.PortletContext; import org.oasis.wsrp.v2.PortletDescriptionResponse; import org.oasis.wsrp.v2.PortletPropertyDescriptionResponse; @@ -89,7 +91,7 @@ import org.oasis.wsrp.v2.PropertyList; import org.oasis.wsrp.v2.RegistrationContext; import org.oasis.wsrp.v2.RegistrationState; -import org.oasis.wsrp.v2.ReturnAny; +import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.ServiceDescription; import org.oasis.wsrp.v2.UnsupportedLocale; import org.oasis.wsrp.v2.UnsupportedMimeType; @@ -182,6 +184,14 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } } @@ -200,14 +210,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1ReturnAny deregister(V1RegistrationContext deregister) throws V1OperationFailed, V1InvalidRegistration { try { - ReturnAny returnAny = producer.deregister(V1ToV2Converter.toV2RegistrationContext(deregister)); - return V2ToV1Converter.toV1ReturnAny(returnAny); + producer.deregister(V1ToV2Converter.toV2RegistrationContext(deregister)); + return null; } catch (InvalidRegistration invalidRegistration) { @@ -217,6 +231,14 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1RegistrationState modifyRegistration(V1ModifyRegistration modifyRegistration) throws V1MissingParameters, V1OperationFailed, V1InvalidRegistration @@ -238,6 +260,14 @@ { throw V2ToV1Converter.toV1Exception(V1MissingParameters.class, invalidRegistration); } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } @@ -276,6 +306,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } @@ -338,6 +380,14 @@ { throw V2ToV1Converter.toV1Exception(V1InvalidRegistration.class, invalidRegistration); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } } public V1PortletContext clonePortlet(V1ClonePortlet clonePortlet) throws V1InvalidUserCategory, V1AccessDenied, V1OperationFailed, V1InvalidHandle, V1InvalidRegistration, V1InconsistentParameters, V1MissingParameters @@ -375,6 +425,18 @@ { throw V2ToV1Converter.toV1Exception(V1MissingParameters.class, missingParameters); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1BlockingInteractionResponse performBlockingInteraction(V1PerformBlockingInteraction performBlockingInteraction) throws V1InvalidSession, V1UnsupportedMode, V1UnsupportedMimeType, V1OperationFailed, V1UnsupportedWindowState, V1UnsupportedLocale, V1AccessDenied, V1PortletStateChangeRequired, V1InvalidRegistration, V1MissingParameters, V1InvalidUserCategory, V1InconsistentParameters, V1InvalidHandle, V1InvalidCookie @@ -440,6 +502,14 @@ { throw V2ToV1Converter.toV1Exception(V1InvalidCookie.class, invalidCookie); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } } public V1DestroyPortletsResponse destroyPortlets(V1DestroyPortlets destroyPortlets) throws V1InconsistentParameters, V1MissingParameters, V1InvalidRegistration, V1OperationFailed @@ -465,6 +535,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1PortletContext setPortletProperties(V1SetPortletProperties setPortletProperties) throws V1OperationFailed, V1InvalidHandle, V1MissingParameters, V1InconsistentParameters, V1InvalidUserCategory, V1AccessDenied, V1InvalidRegistration @@ -502,14 +584,26 @@ { throw V2ToV1Converter.toV1Exception(V1InvalidRegistration.class, invalidRegistration); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1ReturnAny releaseSessions(V1ReleaseSessions releaseSessions) throws V1InvalidRegistration, V1OperationFailed, V1MissingParameters, V1AccessDenied { try { - ReturnAny returnAny = producer.releaseSessions(V1ToV2Converter.toV2ReleaseSessions(releaseSessions)); - return V2ToV1Converter.toV1ReturnAny(returnAny); + producer.releaseSessions(V1ToV2Converter.toV2ReleaseSessions(releaseSessions)); + return null; } catch (InvalidRegistration invalidRegistration) { @@ -527,6 +621,18 @@ { throw V2ToV1Converter.toV1Exception(V1AccessDenied.class, accessDenied); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1PropertyList getPortletProperties(V1GetPortletProperties getPortletProperties) throws V1InvalidHandle, V1MissingParameters, V1InvalidRegistration, V1AccessDenied, V1OperationFailed, V1InconsistentParameters, V1InvalidUserCategory @@ -564,14 +670,26 @@ { throw V2ToV1Converter.toV1Exception(V1InvalidUserCategory.class, invalidUserCategory); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1ReturnAny initCookie(V1InitCookie initCookie) throws V1AccessDenied, V1OperationFailed, V1InvalidRegistration { try { - ReturnAny returnAny = producer.initCookie(V1ToV2Converter.toV2InitCookie(initCookie)); - return V2ToV1Converter.toV1ReturnAny(returnAny); + producer.initCookie(V1ToV2Converter.toV2InitCookie(initCookie)); + return null; } catch (AccessDenied accessDenied) { @@ -585,6 +703,18 @@ { throw V2ToV1Converter.toV1Exception(V1InvalidRegistration.class, invalidRegistration); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public V1PortletPropertyDescriptionResponse getPortletPropertyDescription(V1GetPortletPropertyDescription getPortletPropertyDescription) throws V1MissingParameters, V1InconsistentParameters, V1InvalidUserCategory, V1InvalidRegistration, V1AccessDenied, V1InvalidHandle, V1OperationFailed @@ -622,5 +752,17 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } } Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -28,6 +28,7 @@ import org.gatein.wsrp.endpoints.WSRPBaseEndpoint; import org.gatein.wsrp.spec.v1.V1ToV2Converter; import org.gatein.wsrp.spec.v1.V2ToV1Converter; +import org.gatein.wsrp.spec.v1.WSRP1ExceptionFactory; import org.oasis.wsrp.v1.V1AccessDenied; import org.oasis.wsrp.v1.V1Extension; import org.oasis.wsrp.v1.V1InconsistentParameters; @@ -55,6 +56,7 @@ import org.oasis.wsrp.v1.WSRPV1MarkupPortType; import org.oasis.wsrp.v2.AccessDenied; import org.oasis.wsrp.v2.BlockingInteractionResponse; +import org.oasis.wsrp.v2.Extension; import org.oasis.wsrp.v2.GetMarkup; import org.oasis.wsrp.v2.InconsistentParameters; import org.oasis.wsrp.v2.InitCookie; @@ -65,11 +67,13 @@ import org.oasis.wsrp.v2.InvalidUserCategory; import org.oasis.wsrp.v2.MarkupResponse; import org.oasis.wsrp.v2.MissingParameters; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.PerformBlockingInteraction; import org.oasis.wsrp.v2.PortletStateChangeRequired; import org.oasis.wsrp.v2.ReleaseSessions; -import org.oasis.wsrp.v2.ReturnAny; +import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.UnsupportedLocale; import org.oasis.wsrp.v2.UnsupportedMimeType; import org.oasis.wsrp.v2.UnsupportedMode; @@ -185,6 +189,14 @@ { throw V2ToV1Converter.toV1Exception(V1InconsistentParameters.class, inconsistentParameters); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } updateResponse.value = V2ToV1Converter.toV1UpdateResponse(interactionResponse.getUpdateResponse()); redirectURL.value = interactionResponse.getRedirectURL(); @@ -203,10 +215,10 @@ sessionIDs ); - ReturnAny returnAny; + List<Extension> extensions; try { - returnAny = producer.releaseSessions(releaseSessions); + extensions = producer.releaseSessions(releaseSessions); } catch (InvalidRegistration invalidRegistration) { @@ -224,8 +236,20 @@ { throw V2ToV1Converter.toV1Exception(V1AccessDenied.class, accessDenied); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } - return Lists.transform(returnAny.getExtensions(), V2ToV1Converter.EXTENSION); + return Lists.transform(extensions, V2ToV1Converter.EXTENSION); } public void getMarkup( @@ -308,6 +332,14 @@ { throw V2ToV1Converter.toV1Exception(V1UnsupportedMimeType.class, unsupportedMimeType); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } markupContext.value = V2ToV1Converter.toV1MarkupContext(response.getMarkupContext()); sessionContext.value = V2ToV1Converter.toV1SessionContext(response.getSessionContext()); @@ -322,10 +354,10 @@ InitCookie initCookie = WSRPTypeFactory.createInitCookie(V1ToV2Converter.toV2RegistrationContext(registrationContext)); - ReturnAny returnAny; + List<Extension> extensions; try { - returnAny = producer.initCookie(initCookie); + extensions = producer.initCookie(initCookie); } catch (AccessDenied accessDenied) { @@ -339,7 +371,19 @@ { throw V2ToV1Converter.toV1Exception(V1InvalidRegistration.class, invalidRegistration); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } - return Lists.transform(returnAny.getExtensions(), V2ToV1Converter.EXTENSION); + return Lists.transform(extensions, V2ToV1Converter.EXTENSION); } } Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -29,6 +29,7 @@ import org.gatein.wsrp.endpoints.WSRPBaseEndpoint; import org.gatein.wsrp.spec.v1.V1ToV2Converter; import org.gatein.wsrp.spec.v1.V2ToV1Converter; +import org.gatein.wsrp.spec.v1.WSRP1ExceptionFactory; import org.oasis.wsrp.v1.V1AccessDenied; import org.oasis.wsrp.v1.V1DestroyFailed; import org.oasis.wsrp.v1.V1Extension; @@ -60,11 +61,14 @@ import org.oasis.wsrp.v2.InvalidRegistration; import org.oasis.wsrp.v2.InvalidUserCategory; import org.oasis.wsrp.v2.MissingParameters; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.PortletContext; import org.oasis.wsrp.v2.PortletDescriptionResponse; import org.oasis.wsrp.v2.PortletPropertyDescriptionResponse; import org.oasis.wsrp.v2.PropertyList; +import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.SetPortletProperties; import javax.jws.HandlerChain; @@ -141,6 +145,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public void setPortletProperties( @@ -194,6 +210,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public void clonePortlet( @@ -246,6 +274,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public void getPortletDescription( @@ -304,6 +344,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public void getPortletProperties( @@ -359,6 +411,18 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public void destroyPortlets( @@ -394,5 +458,17 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } } Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -29,6 +29,7 @@ import org.gatein.wsrp.endpoints.WSRPBaseEndpoint; import org.gatein.wsrp.spec.v1.V1ToV2Converter; import org.gatein.wsrp.spec.v1.V2ToV1Converter; +import org.gatein.wsrp.spec.v1.WSRP1ExceptionFactory; import org.oasis.wsrp.v1.V1Extension; import org.oasis.wsrp.v1.V1InvalidRegistration; import org.oasis.wsrp.v1.V1MissingParameters; @@ -41,9 +42,11 @@ import org.oasis.wsrp.v2.MissingParameters; import org.oasis.wsrp.v2.ModifyRegistration; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.OperationNotSupported; import org.oasis.wsrp.v2.RegistrationContext; import org.oasis.wsrp.v2.RegistrationData; import org.oasis.wsrp.v2.RegistrationState; +import org.oasis.wsrp.v2.ResourceSuspended; import javax.jws.HandlerChain; import javax.jws.WebParam; @@ -120,6 +123,10 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public void deregister( @@ -142,6 +149,14 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } public void modifyRegistration( @@ -179,5 +194,13 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } + catch (OperationNotSupported operationNotSupported) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Not supported", operationNotSupported); + } } } Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -28,6 +28,7 @@ import org.gatein.wsrp.endpoints.WSRPBaseEndpoint; import org.gatein.wsrp.spec.v1.V1ToV2Converter; import org.gatein.wsrp.spec.v1.V2ToV1Converter; +import org.gatein.wsrp.spec.v1.WSRP1ExceptionFactory; import org.oasis.wsrp.v1.V1CookieProtocol; import org.oasis.wsrp.v1.V1Extension; import org.oasis.wsrp.v1.V1InvalidRegistration; @@ -40,7 +41,9 @@ import org.oasis.wsrp.v1.WSRPV1ServiceDescriptionPortType; import org.oasis.wsrp.v2.GetServiceDescription; import org.oasis.wsrp.v2.InvalidRegistration; +import org.oasis.wsrp.v2.ModifyRegistrationRequired; import org.oasis.wsrp.v2.OperationFailed; +import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.ServiceDescription; import javax.jws.HandlerChain; @@ -96,6 +99,14 @@ { throw V2ToV1Converter.toV1Exception(V1OperationFailed.class, operationFailed); } + catch (ModifyRegistrationRequired modifyRegistrationRequired) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Need to call modifyRegistration", modifyRegistrationRequired); + } + catch (ResourceSuspended resourceSuspended) + { + throw WSRP1ExceptionFactory.createWSException(V1OperationFailed.class, "Resource suspended", resourceSuspended); + } requiresRegistration.value = description.isRequiresRegistration(); offeredPortlets.value = WSRPUtils.transform(description.getOfferedPortlets(), V2ToV1Converter.PORTLETDESCRIPTION); Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java 2010-07-30 10:41:09 UTC (rev 3730) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java 2010-07-31 14:28:22 UTC (rev 3731) @@ -23,7 +23,6 @@ package org.gatein.wsrp.endpoints.v2; -import org.gatein.common.NotYetImplemented; import org.gatein.wsrp.WSRPTypeFactory; import org.gatein.wsrp.endpoints.WSRPBaseEndpoint; import org.oasis.wsrp.v2.AccessDenied; @@ -59,7 +58,6 @@ import org.oasis.wsrp.v2.ResourceParams; import org.oasis.wsrp.v2.ResourceResponse; import org.oasis.wsrp.v2.ResourceSuspended; -import org.oasis.wsrp.v2.ReturnAny; import org.oasis.wsrp.v2.RuntimeContext; import org.oasis.wsrp.v2.SessionContext; import org.oasis.wsrp.v2.UnsupportedLocale; @@ -133,9 +131,7 @@ releaseSessions.setRegistrationContext(registrationContext); releaseSessions.getSessionIDs().addAll(sessionIDs); - ReturnAny returnAny = producer.releaseSessions(releaseSessions); - - return returnAny.getExtensions(); + return producer.releaseSessions(releaseSessions); } public List<Extension> initCookie( @@ -148,9 +144,7 @@ InitCookie initCookie = new InitCookie(); initCookie.setRegistrationContext(registrationContext); - ReturnAny returnAny = producer.initCookie(initCookie); - - return returnAny.getExtensions(); + return producer.initCookie(initCookie); } public void getMarkup(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") RegistrationContext registrationContext, @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") PortletContext portletContext, @WebParam(name = "runtimeContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") RuntimeContext runtimeContext, @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") UserContext userContext, @WebParam(name = "markupParams", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") MarkupParams markupParams, @WebParam(name = "markupContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types", mode = WebParam.Mode.OUT) Holder<MarkupContext> markupContext, @WebParam(name = "sessionContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types", mode = WebParam.Mode.OUT) Holder<SessionContext> sessionContext, @WebParam(name = "extensions", targetNamespace = "urn:oasi! s:names:tc:wsrp:v2:types", mode = WebParam.Mode.OUT) Holder<List<Extension>> extensions) throws AccessDenied, InconsistentParameters, InvalidCookie, InvalidHandle, InvalidRegistration, InvalidSession, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, ResourceSuspended, UnsupportedLocale, UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState @@ -191,9 +185,9 @@ getResource.setResourceParams(resourceParams); getResource.setRuntimeContext(runtimeContext); getResource.setUserContext(userContext); - + ResourceResponse response = producer.getResource(getResource); - + resourceContext.value = response.getResourceContext(); sessionContext.value = response.getSessionContext(); portletContext.value = response.getPortletContext();